diff --git a/config-models/aether-4.x/files/aether-4.0.0.tree b/config-models/aether-4.x/files/aether-4.0.0.tree
index 3f42de7..aa70bc5 100644
--- a/config-models/aether-4.x/files/aether-4.0.0.tree
+++ b/config-models/aether-4.x/files/aether-4.0.0.tree
@@ -40,8 +40,9 @@
         +--rw ip-domain?      -> /ipd:ip-domain/ip-domain/id
         +--rw device
         |  +--rw mbr
-        |     +--rw uplink?     at:bitrate
-        |     +--rw downlink?   at:bitrate
+        |  |  +--rw uplink?     at:bitrate
+        |  |  +--rw downlink?   at:bitrate
+        |  +--rw traffic-class?   -> /tc:traffic-class/traffic-class/id
         +--rw site            -> /st:site/site/id
 
 module: onf-enterprise
@@ -118,6 +119,8 @@
         +--rw display-name?   string
         +--rw arp?            at:arp
         +--rw qci?            at:qci
+        +--rw pelr?           at:pelr
+        +--rw pdb?            at:pdb
         +--rw description?    at:description
 
 module: onf-upf
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 788ea6c..36079e0 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
@@ -10,6 +10,7 @@
   import onf-aether-types { prefix at; }
   import onf-ip-domain{ prefix ipd; }
   import onf-site{ prefix st; }
+  import onf-traffic-class{ prefix tc; }
 
   organization "Open Networking Foundation.";
   contact "Scott Baker";
@@ -102,6 +103,13 @@
             description "Per-device mbr downlink data rate in mbps";
           }
         }
+        leaf traffic-class {
+          type leafref {
+            path "/tc:traffic-class/tc:traffic-class/tc:id";
+          }
+          description
+            "Link to traffic class";
+        }
       }
 
       leaf site {
@@ -113,5 +121,5 @@
           "Link to site";
       }
     }
-  } 
+  }
 }
diff --git a/config-models/aether-4.x/files/yang/onf-traffic-class.yang b/config-models/aether-4.x/files/yang/onf-traffic-class.yang
index 8a84ee0..f4f6cdf 100755
--- a/config-models/aether-4.x/files/yang/onf-traffic-class.yang
+++ b/config-models/aether-4.x/files/yang/onf-traffic-class.yang
@@ -49,12 +49,22 @@
       leaf arp {
         type at:arp;
         description "Allocation and Retention Priority. 1 is the highest. 15 is the lowest.";
-      }        
+      }
 
       leaf qci {
         type at:qci;
         description "QOS Class Identifier";
-      }      
+      }
+
+      leaf pelr {
+        type at:pelr;
+        description "PELR exponent";
+      }
+
+      leaf pdb {
+        type at:pdb;
+        description "PDB";
+      }
 
       leaf description {
         type at:description;