diff --git a/xos/tosca/custom_types/xos.yaml b/xos/tosca/custom_types/xos.yaml
index 3a7e133..c59842f 100644
--- a/xos/tosca/custom_types/xos.yaml
+++ b/xos/tosca/custom_types/xos.yaml
@@ -5,6 +5,11 @@
 #    m4 macros do our inheritance
 
 
+# Service
+
+
+# Subscriber
+
 
 
 
@@ -21,12 +26,27 @@
             service:
                 type: tosca.capabilities.xos.Service
         properties:
+            kind:
+                type: string
+                default: generic
             view_url:
                 type: string
                 required: false
             icon_url:
                 type: string
                 required: false
+            enabled:
+                type: boolean
+                default: true
+            published:
+                type: boolean
+                default: true
+            public_key:
+                type: string
+                required: false
+            versionNumber:
+                type: string
+                required: false
 
     tosca.nodes.VCPEService:
         derived_from: tosca.nodes.Root
@@ -36,12 +56,27 @@
             service:
                 type: tosca.capabilities.xos.Service
         properties:
+            kind:
+                type: string
+                default: generic
             view_url:
                 type: string
                 required: false
             icon_url:
                 type: string
                 required: false
+            enabled:
+                type: boolean
+                default: true
+            published:
+                type: boolean
+                default: true
+            public_key:
+                type: string
+                required: false
+            versionNumber:
+                type: string
+                required: false
             backend_network_label:
                 type: string
                 required: false
@@ -54,12 +89,27 @@
             service:
                 type: tosca.capabilities.xos.Service
         properties:
+            kind:
+                type: string
+                default: generic
             view_url:
                 type: string
                 required: false
             icon_url:
                 type: string
                 required: false
+            enabled:
+                type: boolean
+                default: true
+            published:
+                type: boolean
+                default: true
+            public_key:
+                type: string
+                required: false
+            versionNumber:
+                type: string
+                required: false
             vbng_url:
                 type: string
                 required: false
@@ -72,12 +122,85 @@
             service:
                 type: tosca.capabilities.xos.Service
         properties:
+            kind:
+                type: string
+                default: generic
             view_url:
                 type: string
                 required: false
             icon_url:
                 type: string
                 required: false
+            enabled:
+                type: boolean
+                default: true
+            published:
+                type: boolean
+                default: true
+            public_key:
+                type: string
+                required: false
+            versionNumber:
+                type: string
+                required: false
+
+    tosca.nodes.Subscriber:
+        derived_from: tosca.nodes.Root
+        capabilities:
+            subscriber:
+                type: tosca.capabilities.xos.Subscriber
+        properties:
+            kind:
+                type: string
+                default: generic
+            service_specific_id:
+                type: string
+                required: false
+
+    tosca.nodes.CORDSubscriber:
+        derived_from: tosca.nodes.Root
+        capabilities:
+            subscriber:
+                type: tosca.capabilities.xos.Subscriber
+        properties:
+            kind:
+                type: string
+                default: generic
+            service_specific_id:
+                type: string
+                required: false
+            firewall_enable:
+                type: boolean
+                default: false
+            url_filter_enable:
+                type: boolean
+                default: false
+            url_filter_level:
+                type: string
+                default: PG
+            cdn_enable:
+                type: boolean
+                default: true
+
+    tosca.nodes.CORDUser:
+        derived_from: tosca.nodes.Root
+        properties:
+            level:
+                type: string
+                default: PG_13
+            mac:
+                type: string
+                required: true
+
+    tosca.nodes.VOLTTenant:
+        derived_from: tosca.nodes.Root
+        properties:
+            kind:
+                type: string
+                default: generic
+            service_specific_id:
+                type: string
+                required: false
 
     tosca.nodes.User:
         derived_from: tosca.nodes.Root
@@ -224,7 +347,7 @@
                 # In the data model, this is defaulted to false. However, to
                 # preserve Tosca semantics, we default it to true instead.
                 default: true
-          capabilities:
+          capabilities:
             link:
               type: tosca.capabilities.network.Linkable
 
@@ -348,6 +471,9 @@
         derived_from: tosca.relationships.Root
         valid_target_types: [ tosca.capabilities.xos.Network ]
 
+    tosca.relationships.ConnectsToSlice:
+        derived_from: tosca.relationships.Root
+
     #    tosca.relationships.OwnsNetwork:
     #        derived_from: tosca.relationships.Root
     #        valid_target_types: [ tosca.capabilities.xos.Network ]
@@ -372,6 +498,12 @@
         derived_from: tosca.relationships.Root
         valid_target_types: [ tosca.capabiltys.xos.Site ]
 
+    tosca.relationships.SubscriberDevice:
+        derived_from: tosca.relationships.Root
+
+    tosca.relationships.BelongsToSubscriber:
+        derived_from: tosca.relationships.Root
+
     tosca.capabilities.xos.Service:
         derived_from: tosca.capabilities.Root
         description: An XOS Service
@@ -403,3 +535,8 @@
     tosca.capabilities.xos.User:
         derived_from: tosca.capabilities.Root
         description: An XOS user
+
+    tosca.capabilities.xos.Subscriber:
+        derived_from: tosca.capabilities.Root
+        description: An XOS Subscriber
+