diff --git a/xos/tosca/samples/cdn.yaml b/xos/tosca/samples/cdn.yaml
new file mode 100644
index 0000000..782c601
--- /dev/null
+++ b/xos/tosca/samples/cdn.yaml
@@ -0,0 +1,106 @@
+tosca_definitions_version: tosca_simple_yaml_1_0
+
+description: Template for deploying a single server with predefined properties.
+
+imports:
+   - custom_types/xos.yaml
+
+dsl_definitions:
+       large_compute_node: &large_compute_node
+           disk_size: 80 GB
+           mem_size: 8 GB
+           num_cpus: 4
+       small_compute_node: &small_compute_node
+           disk_size: 20 GB
+           mem_size: 2 GB
+           num_cpus: 1
+       hpc_os: &hpc_os
+           architecture: x86_64
+           type: linux
+           distribution: centos
+           version: 5.5
+
+topology_template:
+  node_templates:
+    HyperCache:
+      type: tosca.nodes.CDNService
+      description: Content Delivery Network
+      properties:
+          view_url: /admin/hpc/hpcservice/$id$/
+          icon_url: /static/primarycons_blue/network.png
+
+    mysite:
+      type: tosca.nodes.Site
+
+    mysite_hpc:
+      description: HyperCache Slice
+      type: tosca.nodes.Slice
+      requirements:
+          - cdn_service:
+              node: HyperCache
+              relationship: tosca.relationships.MemberOfService
+          - site:
+              node: mysite
+              relationship: tosca.relationships.MemberOfSite
+
+    mysite_dnsredir:
+      description: HyperCache Slice
+      type: tosca.nodes.Slice
+      requirements:
+          - cdn_service:
+              node: HyperCache
+              relationship: tosca.relationships.MemberOfService
+          - site:
+              node: mysite
+              relationship: tosca.relationships.MemberOfSite
+
+    mysite_dnsdemux:
+      description: HyperCache Slice
+      type: tosca.nodes.Slice
+      requirements:
+          - cdn_service:
+              node: HyperCache
+              relationship: tosca.relationships.MemberOfService
+          - site:
+              node: mysite
+              relationship: tosca.relationships.MemberOfSite
+
+    hpc_server:
+      type: tosca.nodes.Compute
+      capabilities:
+        host:
+          properties: *large_compute_node
+        os:
+          properties: *hpc_os
+      requirements:
+          - slice:
+                node: mysite_hpc
+                relationship: tosca.relationships.MemberOfSlice
+
+    dnsredir_server:
+      type: tosca.nodes.Compute
+      capabilities:
+        host:
+          properties: *small_compute_node
+        os:
+          properties: *hpc_os
+      requirements:
+          - slice:
+                node: mysite_dnsredir
+                relationship: tosca.relationships.MemberOfSlice
+
+    dnsdemux_server:
+      type: tosca.nodes.Compute
+      capabilities:
+        host:
+          properties: *small_compute_node
+        os:
+          properties: *hpc_os
+      requirements:
+          - slice:
+                node: mysite_dnsdemux
+                relationship: tosca.relationships.MemberOfSlice
+          - colocate:
+                node: dnsredir_server
+                relationship: tosca.relationships.SameHost
+
diff --git a/xos/tosca/samples/cord.yaml b/xos/tosca/samples/cord.yaml
index 9a536c5..c5fc81c 100644
--- a/xos/tosca/samples/cord.yaml
+++ b/xos/tosca/samples/cord.yaml
@@ -13,25 +13,28 @@
       requirements:
           - vcpe_tenant:
               node: service_vcpe
-              relationship: tosca.relationships.IsTenantOf
+              relationship: tosca.relationships.TenantOfService
       properties:
           view_url: /admin/cord/voltservice/$id$/
 
     service_vcpe:
-      type: tosca.nodes.VcpeService
+      type: tosca.nodes.VCPEService
       requirements:
           - vbng_tenant:
               node: service_vbng
-              relationship: tosca.relationships.IsTenantOf
+              relationship: tosca.relationships.TenantOfService
       properties:
           view_url: /admin/cord/vcpeservice/$id$/
           backend_network_label: hpc_client
 
     service_vbng:
-      type: tosca.nodes.Service
+      type: tosca.nodes.VBNGService
       properties:
           view_url: /admin/cord/vbngservice/$id$/
-#          vbng_url: http://10.0.3.136:8181/onos/virtualbng/
+          vbng_url: http://10.0.3.136:8181/onos/virtualbng/
+
+    mysite:
+      type: tosca.nodes.Site
 
     mysite_vcpe:
       description: vCPE Controller Slice
@@ -40,5 +43,8 @@
           - vcpe_service:
               node: service_volt
               relationship: tosca.relationships.MemberOfService
+          - site:
+              node: mysite
+              relationship: tosca.relationships.MemberOfSite