diff --git a/xos/xos_client/xosapi/convenience/onosapp.py b/xos/xos_client/xosapi/convenience/onosapp.py
new file mode 100644
index 0000000..4008466
--- /dev/null
+++ b/xos/xos_client/xosapi/convenience/onosapp.py
@@ -0,0 +1,8 @@
+import json
+from xosapi.orm import ORMWrapper, register_convenience_wrapper
+from xosapi.convenience.tenant import ORMWrapperTenant
+
+class ORMWrapperONOSApp(ORMWrapperTenant):
+    pass
+
+register_convenience_wrapper("ONOSApp", ORMWrapperONOSApp)
diff --git a/xos/xos_client/xosapi/convenience/service.py b/xos/xos_client/xosapi/convenience/service.py
new file mode 100644
index 0000000..02d8c4d
--- /dev/null
+++ b/xos/xos_client/xosapi/convenience/service.py
@@ -0,0 +1,12 @@
+import json
+from xosapi.orm import ORMWrapper, register_convenience_wrapper
+
+class ORMWrapperService(ORMWrapper):
+    @property
+    def serviceattribute_dict(self):
+        attrs = {}
+        for attr in self.serviceattributes.all():
+            attrs[attr.name] = attr.value
+        return attrs
+
+register_convenience_wrapper("Service", ORMWrapperService)
diff --git a/xos/xos_client/xosapi/convenience/tenant.py b/xos/xos_client/xosapi/convenience/tenant.py
new file mode 100644
index 0000000..94b55b5
--- /dev/null
+++ b/xos/xos_client/xosapi/convenience/tenant.py
@@ -0,0 +1,12 @@
+import json
+from xosapi.orm import ORMWrapper, register_convenience_wrapper
+
+class ORMWrapperTenant(ORMWrapper):
+    @property
+    def tenantattribute_dict(self):
+        attrs = {}
+        for attr in self.tenantattributes.all():
+            attrs[attr.name] = attr.value
+        return attrs
+
+register_convenience_wrapper("Tenant", ORMWrapperTenant)
diff --git a/xos/xos_client/xosapi/orm.py b/xos/xos_client/xosapi/orm.py
index 8ce0b5c..d8fc84b 100644
--- a/xos/xos_client/xosapi/orm.py
+++ b/xos/xos_client/xosapi/orm.py
@@ -436,4 +436,7 @@
 import convenience.vsgtenant
 import convenience.vroutertenant
 import convenience.vrouterapp
+import convenience.service
+import convenience.tenant
+import convenience.onosapp