diff --git a/apps/demo/cord-gui/src/main/resources/org/onosproject/cord/gui/local/bundle-0.json b/apps/demo/cord-gui/src/main/resources/org/onosproject/cord/gui/local/bundle-0.json
index 02adf55..b7df611 100644
--- a/apps/demo/cord-gui/src/main/resources/org/onosproject/cord/gui/local/bundle-0.json
+++ b/apps/demo/cord-gui/src/main/resources/org/onosproject/cord/gui/local/bundle-0.json
@@ -5,14 +5,14 @@
       {
         "id": "internet",
         "name": "Internet",
-        "active": true,
-        "editable": false
+        "desc": "Basic internet connectivity",
+        "params": {}
       },
       {
         "id": "firewall",
         "name": "Firewall",
-        "active": true,
-        "editable": true
+        "desc": "Normal firewall protection",
+        "params": {}
       }
     ]
   }
diff --git a/apps/demo/cord-gui/src/main/resources/org/onosproject/cord/gui/local/bundle-1.json b/apps/demo/cord-gui/src/main/resources/org/onosproject/cord/gui/local/bundle-1.json
index d8809e7..169d269 100644
--- a/apps/demo/cord-gui/src/main/resources/org/onosproject/cord/gui/local/bundle-1.json
+++ b/apps/demo/cord-gui/src/main/resources/org/onosproject/cord/gui/local/bundle-1.json
@@ -5,22 +5,23 @@
       {
         "id": "internet",
         "name": "Internet",
-        "active": true,
-        "editable": false
+        "desc": "Basic internet connectivity",
+        "params": {}
       },
       {
         "id": "firewall",
         "name": "Firewall",
-        "active": true,
-        "editable": true
+        "desc": "Normal firewall protection",
+        "params": {}
       },
       {
-        "id": "url_filter",
+        "id": "url_filtering",
         "name": "Parental Control",
-        "level": "PG",
-        "levels": [ "PG", "PG-13", "R" ],
-        "active": true,
-        "editable": true
+        "desc": "Variable levels of URL filtering",
+        "params": {
+          "level": "PG",
+          "levels": [ "PG", "PG-13", "R" ]
+        }
       }
     ]
   }
diff --git a/apps/demo/cord-gui/src/main/resources/org/onosproject/cord/gui/local/dashboard-0.json b/apps/demo/cord-gui/src/main/resources/org/onosproject/cord/gui/local/dashboard-0.json
index 257c933..9be565f 100644
--- a/apps/demo/cord-gui/src/main/resources/org/onosproject/cord/gui/local/dashboard-0.json
+++ b/apps/demo/cord-gui/src/main/resources/org/onosproject/cord/gui/local/dashboard-0.json
@@ -1,23 +1,9 @@
 {
-  "bundle": {
-    "name": "Basic Bundle",
-    "functions": [
-      {
-        "id": "internet",
-        "name": "Internet",
-        "active": true
-      },
-      {
-        "id": "firewall",
-        "name": "Firewall",
-        "active": true
-      }
-    ]
-  },
+  "bundle": "Basic Bundle",
   "users": [
-    { "id": 1, "name": "Mom", "role": "Admin" },
-    { "id": 2, "name": "Dad", "role": "Admin" },
-    { "id": 3, "name": "Dick", "role": "User" },
-    { "id": 4, "name": "Jane", "role": "User" }
+    { "id": 1, "name": "Mom's MacBook", "mac": "00:11:22:33:44:55" },
+    { "id": 1, "name": "Dad's iPad", "mac": "00:11:22:33:44:66" },
+    { "id": 1, "name": "Dick's laptop", "mac": "00:11:22:33:44:77" },
+    { "id": 1, "name": "Jane's laptop", "mac": "00:11:22:33:44:88" }
   ]
 }
diff --git a/apps/demo/cord-gui/src/main/resources/org/onosproject/cord/gui/local/dashboard-1.json b/apps/demo/cord-gui/src/main/resources/org/onosproject/cord/gui/local/dashboard-1.json
index a3b76a7f..eaf14ff 100644
--- a/apps/demo/cord-gui/src/main/resources/org/onosproject/cord/gui/local/dashboard-1.json
+++ b/apps/demo/cord-gui/src/main/resources/org/onosproject/cord/gui/local/dashboard-1.json
@@ -1,29 +1,9 @@
 {
-  "bundle": {
-    "name": "Family Bundle",
-    "functions": [
-      {
-        "id": "internet",
-        "name": "Internet",
-        "active": true
-      },
-      {
-        "id": "firewall",
-        "name": "Firewall",
-        "active": true
-      },
-      {
-        "id": "url_filter",
-        "name": "Parental Control",
-        "level": "PG",
-        "active": true
-      }
-    ]
-  },
+  "bundle": "Family Bundle",
   "users": [
-    { "id": 1, "name": "Mom", "role": "Admin" },
-    { "id": 2, "name": "Dad", "role": "Admin" },
-    { "id": 3, "name": "Dick", "role": "User" },
-    { "id": 4, "name": "Jane", "role": "User" }
+    { "id": 1, "name": "Mom's MacBook", "mac": "00:11:22:33:44:55" },
+    { "id": 1, "name": "Dad's iPad", "mac": "00:11:22:33:44:66" },
+    { "id": 1, "name": "Dick's laptop", "mac": "00:11:22:33:44:77" },
+    { "id": 1, "name": "Jane's laptop", "mac": "00:11:22:33:44:88" }
   ]
 }
diff --git a/apps/demo/cord-gui/src/main/resources/org/onosproject/cord/gui/local/users-0.json b/apps/demo/cord-gui/src/main/resources/org/onosproject/cord/gui/local/users-0.json
index b268efd..68b241c 100644
--- a/apps/demo/cord-gui/src/main/resources/org/onosproject/cord/gui/local/users-0.json
+++ b/apps/demo/cord-gui/src/main/resources/org/onosproject/cord/gui/local/users-0.json
@@ -2,26 +2,26 @@
   "users": [
     {
       "id": 1,
-      "name": "Mom",
-      "role": { "id": "admin", "name": "Admin"},
+      "name": "Mom's MacBook",
+      "mac": "01:02:03:04:05:06",
       "profile": { }
     },
     {
       "id": 2,
-      "name": "Dad",
-      "role": { "id": "admin", "name": "Admin"}
+      "name": "Dad's iPad",
+      "mac": "01:02:03:04:05:77",
       "profile": { }
     },
     {
       "id": 3,
-      "name": "Dick",
-      "role": { "id": "user", "name": "User"}
+      "name": "Dick's laptop",
+      "mac": "01:02:03:04:05:88",
       "profile": { }
     },
     {
       "id": 4,
-      "name": "Jane",
-      "role": { "id": "user", "name": "User"}
+      "name": "Jane's laptop",
+      "mac": "01:02:03:04:05:99",
       "profile": { }
     }
   ]
diff --git a/apps/demo/cord-gui/src/main/resources/org/onosproject/cord/gui/local/users-1.json b/apps/demo/cord-gui/src/main/resources/org/onosproject/cord/gui/local/users-1.json
index 7771f22..d3fb8ce 100644
--- a/apps/demo/cord-gui/src/main/resources/org/onosproject/cord/gui/local/users-1.json
+++ b/apps/demo/cord-gui/src/main/resources/org/onosproject/cord/gui/local/users-1.json
@@ -2,41 +2,40 @@
   "users": [
     {
       "id": 1,
-      "name": "Mom",
-      "role": { "id": "admin", "name": "Admin"},
+      "name": "Mom's MacBook",
+      "mac": "01:02:03:04:05:06",
       "profile": {
-        "url_filter": {
-          "enabled": false
+        "url_filtering": {
+          "level": "R"
         }
       }
     },
     {
       "id": 2,
-      "name": "Dad",
-      "role": { "id": "admin", "name": "Admin"},
+      "name": "Dad's iPad",
+      "mac": "01:02:03:04:05:77",
       "profile": {
-        "url_filter": {
-          "enabled": false
+        "url_filtering": {
+          "level": "R"
         }
       }
     },
     {
       "id": 3,
-      "name": "Dick",
-      "role": { "id": "user", "name": "User"},
+      "name": "Dick's laptop",
+      "mac": "01:02:03:04:05:88",
       "profile": {
-        "url_filter": {
-          "enabled": false
+        "url_filtering": {
+          "level": "PG-13"
         }
       }
     },
     {
       "id": 4,
-      "name": "Jane",
-      "role": { "id": "user", "name": "User"},
+      "name": "Jane's laptop",
+      "mac": "01:02:03:04:05:99",
       "profile": {
-        "url_filter": {
-          "enabled": false,
+        "url_filtering": {
           "level": "PG"
         }
       }
diff --git a/apps/demo/cord-gui/src/main/resources/org/onosproject/cord/gui/xos/subscriber-1-users.json b/apps/demo/cord-gui/src/main/resources/org/onosproject/cord/gui/xos/subscriber-1-users.json
index 3055cf9..93ea5b9 100644
--- a/apps/demo/cord-gui/src/main/resources/org/onosproject/cord/gui/xos/subscriber-1-users.json
+++ b/apps/demo/cord-gui/src/main/resources/org/onosproject/cord/gui/xos/subscriber-1-users.json
@@ -1,24 +1,24 @@
 {
   "users": [
     {
-      "role": "admin",
-      "name": "mom",
-      "id": 1
+      "id": 1,
+      "name": "Mom's MacBook",
+      "mac": "01:02:03:04:05:06"
     },
     {
-      "role": "admin",
-      "name": "dad",
-      "id": 2
+      "id": 2,
+      "name": "Dad's iPad",
+      "mac": "01:02:03:04:05:77"
     },
     {
-      "role": "user",
-      "name": "kid1",
-      "id": 3
+      "id": 3,
+      "name": "Dick's laptop",
+      "mac": "01:02:03:04:05:88"
     },
     {
-      "role": "user",
-      "name": "kid2",
-      "id": 4
+      "id": 4,
+      "name": "Jane's laptop",
+      "mac": "01:02:03:04:05:99"
     }
   ]
 }