diff --git a/yang-models/_3gpp-5gc-nrm-configurable5qiset.yang b/yang-models/_3gpp-5gc-nrm-configurable5qiset.yang
index 2a402a96e132ee0484b07316b3fe07f70c6abfc9..6d3d7a27a913c6a9c5b24603607dad3df5c3f1b3 100755
--- a/yang-models/_3gpp-5gc-nrm-configurable5qiset.yang
+++ b/yang-models/_3gpp-5gc-nrm-configurable5qiset.yang
@@ -37,7 +37,13 @@ module _3gpp-5gc-nrm-configurable5qiset {
     }
   }
 
-  grouping FiveQICharacteristics {
+  grouping FiveQICharacteristicsGrp {
+    description "Represents the FiveQICharacteristics IOC.";
+    reference "3GPP TS 28.541";
+  }
+ 
+  list configurableFiveQIs {
+    key fiveQIValue;
     leaf fiveQIValue {
       type uint32 {
         range 0..255 ;
@@ -92,15 +98,30 @@ module _3gpp-5gc-nrm-configurable5qiset {
       }
       units byte;
     }
-  }
+}
+
+  grouping FiveQiCharacteristicsSubtree {
+    description "Represents the FiveQICharacterics IOC.";
+    list FiveQICharacteristics {
+      key id;
+        uses top3gpp:Top_Grp;
+          container attributes {
+            uses FiveQICharacteristicsGrp;
+        }
+    }  
+}
 
   grouping Configurable5QISetGrp {
     description "Represents the Configurable5QISet IOC.";
     list configurable5QIs {
-      key "fiveQIValue";
-      uses FiveQICharacteristics;
-    }
-  }    
+      key id;
+      uses top3gpp:Top_Grp;
+      container attributes {
+        uses FiveQICharacteristicsGrp;
+      }
+    }  
+}    
+
 
   grouping Configurable5QISetSubtree {
     list Configurable5QISet {
@@ -112,7 +133,7 @@ module _3gpp-5gc-nrm-configurable5qiset {
       container attributes {
         uses Configurable5QISetGrp;
       }
-    }  
+    }
   }
   
   augment "/subnet3gpp:SubNetwork" {
@@ -122,4 +143,4 @@ module _3gpp-5gc-nrm-configurable5qiset {
   augment "/me3gpp:ManagedElement" {
     uses Configurable5QISetSubtree;
   }
-}
\ No newline at end of file
+}
diff --git a/yang-models/_3gpp-5gc-nrm-dynamic5qiset.yang b/yang-models/_3gpp-5gc-nrm-dynamic5qiset.yang
index 9b19f6a328aa0f1ee638a7e390351ad548df3e77..185e46f83117cf401f10191debb35fa7351a44af 100755
--- a/yang-models/_3gpp-5gc-nrm-dynamic5qiset.yang
+++ b/yang-models/_3gpp-5gc-nrm-dynamic5qiset.yang
@@ -21,9 +21,11 @@ module _3gpp-5gc-nrm-dynamic5qiset {
   grouping Dynamic5QISetGrp {
     description "Represents the Dynamic5QISet IOC.";
     list dynamic5QIs {
-      key "fiveQIValue";
-      description "Represents the Dynamic5QISet IOC.";
-      uses Conf5QIs3gpp:FiveQICharacteristics;
+    key id;
+    uses top3gpp:Top_Grp;
+    container attributes {
+      uses Conf5QIs3gpp:FiveQICharacteristicsGrp;
+      }
     }
   }    
 
@@ -47,4 +49,4 @@ module _3gpp-5gc-nrm-dynamic5qiset {
   augment "/me3gpp:ManagedElement" {
     uses Dynamic5QISetSubtree;
   }
-}
\ No newline at end of file
+}