diff --git a/schema/cord-subscriber.yang b/schema/cord-subscriber.yang
index 8f3dae5..7fa098e 100644
--- a/schema/cord-subscriber.yang
+++ b/schema/cord-subscriber.yang
@@ -119,11 +119,11 @@
     node:view "features identity related";
 
     container features {
-      leaf cdn            { node:link "../../services/cdn/enabled"; }
-      leaf uplink-speed   { node:link "../../uplink-speed"; }
-      leaf downlink-speed { node:link "../../downlink-speed"; }
-      leaf uverse         { node:link "../../services/uverse/enabled"; }
-      leaf status         { node:link "../../status"; }
+      node:link cdn            { path "../services/cdn/enabled"; }
+      node:link uplink-speed   { path "../uplink-speed"; }
+      node:link downlink-speed { path "../downlink-speed"; }
+      node:link uverse         { path "../services/uverse/enabled"; }
+      node:link status         { path "../status"; }
       
       action update {
         description "when invoked, updates the features container (PUT)";
@@ -131,8 +131,8 @@
     }
     
     container identity {
-      leaf account-num { node:link "../../service-specific-id"; }
-      leaf name        { node:link "../../name"; }
+      node:link account-num { path "../service-specific-id"; }
+      node:link name        { path "../name"; }
       
       action update {
         description "when invoked, updates the identity container (PUT)";