diff --git a/config-models/aether-4.x/files/yang/onf-device-group.yang b/config-models/aether-4.x/files/yang/onf-device-group.yang
index 36079e0..6dca9a3 100755
--- a/config-models/aether-4.x/files/yang/onf-device-group.yang
+++ b/config-models/aether-4.x/files/yang/onf-device-group.yang
@@ -95,12 +95,14 @@
             type at:bitrate;
             units bps;
             description "Per-device mbr uplink data rate in mbps";
+            mandatory true;
           }
 
           leaf downlink {
             type at:bitrate;
             units bps;
             description "Per-device mbr downlink data rate in mbps";
+            mandatory true;
           }
         }
         leaf traffic-class {
@@ -109,6 +111,7 @@
           }
           description
             "Link to traffic class";
+          mandatory true;
         }
       }
 
@@ -116,9 +119,9 @@
         type leafref {
           path "/st:site/st:site/st:id";
         }
-        mandatory true;
         description
           "Link to site";
+        mandatory true;
       }
     }
   }