diff --git a/config-models/aether-2.0.x/files/aether-2.0.0.tree b/config-models/aether-2.0.x/files/aether-2.0.0.tree
index 32b29fc..6648e7e 100644
--- a/config-models/aether-2.0.x/files/aether-2.0.0.tree
+++ b/config-models/aether-2.0.x/files/aether-2.0.0.tree
@@ -1,3 +1,12 @@
+module: onf-connectivity-service
+  +--rw connectivity-services
+     +--rw connectivity-service* [id]
+        +--rw id                    connectivity-service-id
+        +--rw display-name?         string
+        +--rw description?          at:description
+        +--rw core-5g-endpoint?     inet:uri
+        +--rw acc-prometheus-url?   inet:uri
+
 module: onf-enterprise
   +--rw enterprises
      +--rw enterprise* [ent-id]
@@ -44,8 +53,8 @@
         |  +--rw default-behavior    at:behavior
         |  +--rw description?        at:description
         +--rw site* [site-id]
-           +--rw site-id            site-id
-           +--rw display-name?      string
+           +--rw site-id                  site-id
+           +--rw display-name?            string
            +--rw small-cell* [small-cell-id]
            |  +--rw small-cell-id    yg:yang-identifier
            |  +--rw address?         inet:host
@@ -64,7 +73,32 @@
            |  +--rw mnc           at:mnc
            |  +--rw enterprise    at:ent
            |  +--rw format        string
-           +--rw description?       at:description
+           +--rw description?             at:description
+           +--rw device* [dev-id]
+           |  +--rw dev-id          device-id
+           |  +--rw imei?           at:imei
+           |  +--rw description?    at:description
+           |  +--rw display-name?   string
+           |  +--rw sim-card?       -> ../../sim-card/sim-id
+           +--rw priority-traffic-rule* [ptr-id]
+           |  +--rw ptr-id           priority-traffic-rule-id
+           |  +--rw display-name?    string
+           |  +--rw device           -> ../../device/dev-id
+           |  +--rw endpoint         -> ../../../application/endpoint/endpoint-id
+           |  +--rw mbr
+           |  |  +--rw uplink?     at:bitrate
+           |  |  +--rw downlink?   at:bitrate
+           |  +--rw gbr
+           |  |  +--rw uplink?     at:bitrate
+           |  |  +--rw downlink?   at:bitrate
+           |  +--rw traffic-class?   -> ../../../traffic-class/tc-id
+           |  +--rw description?     at:description
+           +--rw sim-card* [sim-id]
+           |  +--rw sim-id          sim-card-id
+           |  +--rw iccid?          at:iccid
+           |  +--rw description?    at:description
+           |  +--rw display-name?   string
+           |  +--rw imsi?           at:imsi
            +--rw upf* [upf-id]
            |  +--rw upf-id             upf-id
            |  +--rw address            inet:host
@@ -97,17 +131,14 @@
            |  +--rw dg-id           device-group-id
            |  +--rw description?    at:description
            |  +--rw display-name?   string
-           |  +--rw imsis* [imsi-id]
-           |  |  +--rw imsi-id            yg:yang-identifier
-           |  |  +--rw imsi-range-from?   uint64
-           |  |  +--rw imsi-range-to?     uint64
-           |  |  +--rw display-name?      string
+           |  +--rw device* [device-id]
+           |  |  +--rw device-id    -> ../../../device/dev-id
+           |  |  +--rw enable?      boolean
            |  +--rw ip-domain?      -> ../../ip-domain/ip-id
-           |  +--rw device
-           |     +--rw mbr
-           |     |  +--rw uplink      at:bitrate
-           |     |  +--rw downlink    at:bitrate
+           |  +--rw mbr
+           |     +--rw uplink           at:bitrate
            |     +--rw traffic-class    -> ../../../../traffic-class/tc-id
+           |     +--rw downlink         at:bitrate
            +--rw ip-domain* [ip-id]
               +--rw ip-id            ip-domain-id
               +--rw display-name?    string
@@ -119,11 +150,3 @@
               +--rw mtu?             at:mtu
               +--rw description?     at:description
 
-module: onf-connectivity-service
-  +--rw connectivity-services
-     +--rw connectivity-service* [id]
-        +--rw id                    connectivity-service-id
-        +--rw display-name?         string
-        +--rw description?          at:description
-        +--rw core-5g-endpoint?     inet:uri
-        +--rw acc-prometheus-url?   inet:uri