diff --git a/xos/tosca/custom_types/vsm.m4 b/xos/tosca/custom_types/vsm.m4
index c81705f..2c839a8 100644
--- a/xos/tosca/custom_types/vsm.m4
+++ b/xos/tosca/custom_types/vsm.m4
@@ -15,9 +15,6 @@
         properties:
             xos_base_props
             xos_base_service_props
-            service_message:
-                type: string
-                required: false
             
     tosca.nodes.VSMTenant:
         derived_from: tosca.nodes.Root
diff --git a/xos/tosca/custom_types/vsm.yaml b/xos/tosca/custom_types/vsm.yaml
index 444c659..a9603fb 100644
--- a/xos/tosca/custom_types/vsm.yaml
+++ b/xos/tosca/custom_types/vsm.yaml
@@ -78,9 +78,6 @@
                 type: string
                 required: false
                 description: Version number of Service.
-            service_message:
-                type: string
-                required: false
             
     tosca.nodes.VSMTenant:
         derived_from: tosca.nodes.Root
diff --git a/xos/tosca/resources/vsmservice.py b/xos/tosca/resources/vsmservice.py
index b702029..0fd7d6c 100644
--- a/xos/tosca/resources/vsmservice.py
+++ b/xos/tosca/resources/vsmservice.py
@@ -4,4 +4,4 @@
 class XOSVSMService(XOSService):
 	provides = "tosca.nodes.VSMService"
 	xos_model = VSMService
-	copyin_props = ["view_url", "icon_url", "enabled", "published", "public_key", "private_key_fn", "versionNumber"]
\ No newline at end of file
+	copyin_props = ["view_url", "icon_url", "enabled", "published", "public_key", "private_key_fn", "versionNumber"]
diff --git a/xos/tosca/resources/vsmtenant.py b/xos/tosca/resources/vsmtenant.py
index 56b2472..e932953 100644
--- a/xos/tosca/resources/vsmtenant.py
+++ b/xos/tosca/resources/vsmtenant.py
@@ -4,15 +4,15 @@
 class XOSVSMTenant(XOSResource):
     provides = "tosca.nodes.VSMTenant"
     xos_model = VSMTenant
-    copyin_props = ["tenant_message", "image_name"]  
+    copyin_props = ("tenant_message",) 
     name_field = None  
 
     def get_xos_args(self, throw_exception=True):
         args = super(XOSVSMTenant, self).get_xos_args()
 
-        provider_name = self.get_requirement("tosca.relationships.MemberOfService", throw_exception=throw_exception)
+        provider_name = self.get_requirement("tosca.relationships.TenantOfService", throw_exception=throw_exception)
         if provider_name:
-            args["provider_service"] = self.get_xos_object(VSMService, throw_exception=throw_exception, name=provider_name)
+            args["provider_service"] = self.get_xos_object(Service, throw_exception=throw_exception, name=provider_name)
 
         return args