diff --git a/xos/synchronizer/model-deps b/xos/synchronizer/model-deps
index e78c641..e183915 100644
--- a/xos/synchronizer/model-deps
+++ b/xos/synchronizer/model-deps
@@ -1,290 +1,668 @@
-{ "XOSBase": [
+{ 
+     
+    
+    "User": [
+        
+        
+        
+        
+        
+         
+        
+        
+        
+        
+        
+        
+        
+        ["ControllerUser", "controllerusers", "user"],
+        
+        
+        ["Site", "site", "users"],
+        ["DashboardView", "dashboards", "user"]
+        
+    ], 
+    
+    "Privilege": [
+        
+        
+        
+        
+        
+         
+        
+        
+        
+        
+        
+        
+        
+        ["ControllerPrivilege", "controllerprivileges", "privilege"]
+        
+        
+        
+    ], 
+    
+    "AddressPool": [
+        
+        
+        
+        
+        
+        ["Service", "service", "addresspools"]
+        
+    ], 
+     
+    
+    "ControllerDashboardView": [
+        
+        
+        
+        
+        
+        ["Controller", "controller", "controllerdashboardviews"],
+        ["DashboardView", "dashboardView", "controllerdashboardviews"]
+        
+    ], 
+    
+    "ControllerImages": [
+        
+        
+        
+        
+        
+        ["Image", "image", "controllerimages"],
+        ["Controller", "controller", "controllerimages"]
+        
+    ], 
+    
+    "ControllerNetwork": [
+        
+        
+        
+        
+        
+        ["Network", "network", "controllernetworks"],
+        ["Controller", "controller", "controllernetworks"]
+        
+    ], 
+    
+    "ControllerRole": [
+        
+        
+        
+        
+        
+        
+    ], 
+    
+    "ControllerSite": [
+        
+        
+        
+        
+        
+        ["Site", "site", "controllersite"],
+        ["Controller", "controller", "controllersite"]
+        
+    ], 
+    
+    "ControllerPrivilege": [
+        
+        
+        
+        
+        
+        ["Controller", "controller", "controllerprivileges"],
+        ["Privilege", "privilege", "controllerprivileges"]
+        
+    ], 
+    
+    "ControllerSitePrivilege": [
+        
+        
+        
+        
+        
+        ["Controller", "controller", "controllersiteprivileges"],
+        ["SitePrivilege", "site_privilege", "controllersiteprivileges"]
+        
+    ], 
+    
+    "ControllerSlice": [
+        
+        
+        
+        
+        
+        ["Controller", "controller", "controllerslices"],
+        ["Slice", "slice", "controllerslices"]
+        
+    ], 
+    
+    "ControllerSlicePrivilege": [
+        
+        
+        
+        
+        
+        ["Controller", "controller", "controllersliceprivileges"],
+        ["SlicePrivilege", "slice_privilege", "controllersliceprivileges"]
+        
+    ], 
+    
+    "ControllerUser": [
+        
+        
+        
+        
+        
+        ["User", "user", "controllerusers"],
+        ["Controller", "controller", "controllersusers"]
+        
+    ], 
+    
+    "DashboardView": [
+        
+        
+        
+        
+        
+         
+        
+        
+        
+        
+        
+        
+        
+        ["ControllerDashboardView", "controllerdashboardviews", "dashboardView"],
+        
+        
+        ["Controller", "controllers", "dashboardviews"],
+        ["Deployment", "deployments", "dashboardviews"]
+        
+    ], 
+    
+    "Deployment": [
+        
+        
+        
+        
+        
+        
+    ], 
+    
+    "DeploymentPrivilege": [
+        
+        
+        
+        
+        
+        ["User", "user", "deploymentprivileges"],
+        ["Deployment", "deployment", "deploymentprivileges"],
+        ["DeploymentRole", "role", "deploymentprivileges"]
+        
+    ], 
+    
+    "DeploymentRole": [
+        
+        
+        
+        
+        
+        
+    ], 
+    
+    "Diag": [
+        
+        
+        
+        
+        
+        
+    ], 
+    
+    "Flavor": [
+        
+        
+        
+        
+        
+        
+    ], 
+    
+    "Image": [
+        
+        
+        
+        
+        
+         
+        
+        
+        
+        
+        
+        
+        
+        ["ControllerImages", "controllerimages", "image"]
+        
+        
+        
+    ], 
+    
+    "ImageDeployments": [
+        
+        
+        
+        
+        
+        ["Image", "image", "imagedeployments"],
+        ["Deployment", "deployment", "imagedeployments"]
+        
+    ], 
+    
+    "Instance": [
+        
+        
+        
+        
+        
+        ["Image", "image", "instances"],
+        ["User", "creator", "instances"],
+        ["Slice", "slice", "instances"],
+        ["Deployment", "deployment", "instance_deployment"],
+        ["Node", "node", "instances"],
+        ["Flavor", "flavor", "instance"],
+        ["Instance", "parent", "instance"]
+        
+    ], 
+    
+    "Network": [
+        
+        
+        
+        
+        
+         
+        
+        
+        
+        
+        
+        
+        
+        ["ControllerNetwork", "controllernetworks", "network"],
+        
+        
+        ["NetworkTemplate", "template", "network"],
+        ["Slice", "owner", "ownedNetworks"],
+        ["Slice", "permitted_slices", "availableNetworks"],
+        ["Slice", "slices", "networks"],
+        ["Instance", "instances", "networks"]
+        
+    ], 
+    
+    "NetworkParameter": [
+        
+        
+        
+        
+        
+        ["NetworkParameterType", "parameter", "networkparameters"]
+        
+    ], 
+    
+    "NetworkParameterType": [
+        
+        
+        
+        
+        
+        
+    ], 
+    
+    "NetworkSlice": [
+        
+        
+        
+        
+        
+        ["Network", "network", "networkslices"],
+        ["Slice", "slice", "networkslices"]
+        
+    ], 
+    
+    "NetworkTemplate": [
+        
+        
+        
+        
+        
+        
+    ], 
+    
+    "Node": [
+        
+        
+        
+        
+        
+        ["SiteDeployment", "site_deployment", "nodes"]
+        
+    ], 
+    
+    "NodeLabel": [
+        
+        
+        
+        
+        
+        ["Node", "node", "nodelabels"]
+        
+    ], 
+    
+    "Port": [
+        
+        
+        
+        
+        
+        ["Network", "network", "links"],
+        ["Instance", "instance", "ports"]
+        
+    ], 
+    
+    "Role": [
+        
+        
+        
+        
+        
+         
+        
+        
+        
+        
+        
+    ], 
+    
+    "Service": [
+        
+        
+        
+        
+        
+        
+    ], 
+    
+    "ServiceAttribute": [
+        
+        
+        
+        
+        
+        ["Service", "service", "serviceattributes"]
+        
+    ], 
+    
+    "ServiceDependency": [
+        
+        
+        
+        
+        
+        ["Service", "provider_service", "provided_dependencies"],
+        ["Service", "subscriber_service", "subscribed_dependencies"]
+        
+    ], 
+    
+    "ServiceMonitoringAgentInfo": [
+        
+        
+        
+        
+        
+        ["Service", "service", "servicemonitoringagents"]
+        
+    ], 
+    
+    "ServicePrivilege": [
+        
+        
+        
+        
+        
+        ["User", "user", "serviceprivileges"],
+        ["Service", "service", "serviceprivileges"],
+        ["ServiceRole", "role", "serviceprivileges"]
+        
+    ], 
+    
+    "ServiceRole": [
+        
+        
+        
+        
+        
         
-    ], "User": [
-        ["ControllerSite", "site", "site"],
+    ], 
+    
+    "Site": [
         
-        ["Site", "site", ""],
-        ["ControllerDashboardView", "dashboards", "dashboard_view"],
         
-        ["DashboardView", "dashboards", ""]
         
-    ], "Privilege": [
         
-    ], "AddressPool": [
         
-        ["Service", "service", ""]
+         
         
-    ], "ControllerDashboardView": [
         
-        ["ControllerDashboardView", "dashboardView", "dashboard_view"],
         
-        ["DashboardView", "dashboardView", ""]
         
-    ], "ControllerImages": [
         
-        ["Image", "image", ""]
         
-    ], "ControllerNetwork": [
-        ["ControllerNetwork", "network", "network"],
         
-        ["Network", "network", ""]
-    ], "ControllerRole": [
+        ["ControllerSite", "controllersite", "site"],
         
-    ], "ControllerSite": [
-        ["ControllerSite", "site", "site"],
         
-        ["Site", "site", ""]
+        ["Deployment", "deployments", "sites"]
         
-    ], "ControllerPrivilege": [
+    ], 
+    
+    "SiteDeployment": [
         
-        ["ControllerPrivilege", "privilege", "privilege"],
         
-        ["Privilege", "privilege", ""]
         
-    ], "ControllerSitePrivilege": [
         
-        ["ControllerSitePrivilege", "site_privilege", "site_privilege"],
         
-        ["SitePrivilege", "site_privilege", ""]
+        ["Site", "site", "sitedeployments"],
+        ["Deployment", "deployment", "sitedeployments"],
+        ["Controller", "controller", "sitedeployments"]
         
-    ], "ControllerSlice": [
+    ], 
+    
+    "SitePrivilege": [
         
-        ["ControllerSlice", "slice", "slice"],
         
-        ["Slice", "slice", ""]
         
-    ], "ControllerSlicePrivilege": [
         
-        ["ControllerSlicePrivilege", "slice_privilege", "slice_privilege"],
         
-        ["SlicePrivilege", "slice_privilege", ""]
+         
         
-    ], "ControllerUser": [
-        ["ControllerUser", "user", "user"],
         
-        ["User", "user", ""]
         
         
-    ], "DashboardView": [
         
         
-        ["Deployment", "deployments", ""]
         
-    ], "Deployment": [
+        ["ControllerSitePrivilege", "controllersiteprivileges", "site_privilege"],
         
-    ], "DeploymentPrivilege": [
-        ["ControllerUser", "user", "user"],
         
-        ["User", "user", ""],
+        ["User", "user", "siteprivileges"],
+        ["Site", "site", "siteprivileges"],
+        ["SiteRole", "role", "siteprivileges"]
         
-        ["Deployment", "deployment", ""],
+    ], 
+    
+    "SiteRole": [
         
-        ["DeploymentRole", "role", ""]
         
-    ], "DeploymentRole": [
         
-    ], "Diag": [
         
-    ], "Flavor": [
         
-    ], "Image": [
         
-    ], "ImageDeployments": [
+    ], 
+    
+    "Slice": [
         
-        ["Image", "image", ""],
         
-        ["Deployment", "deployment", ""]
         
-    ], "Instance": [
         
-        ["Image", "image", ""],
-        ["ControllerUser", "creator", "user"],
         
-        ["User", "creator", ""],
-        ["ControllerSlice", "slice", "slice"],
+         
         
-        ["Slice", "slice", ""],
         
-        ["Deployment", "deployment", ""],
         
-        ["Node", "node", ""],
         
-        ["Flavor", "flavor", ""],
         
-        ["Instance", "parent", ""]
         
-    ], "Network": [
         
-        ["NetworkTemplate", "template", ""],
-        ["ControllerSlice", "owner", "slice"],
+        ["ControllerSlice", "controllerslices", "slice"],
         
-        ["Slice", "owner", ""],
-        ["ControllerSlice", "permitted_slices", "slice"],
         
-        ["Slice", "permitted_slices", ""],
-        ["ControllerSlice", "slices", "slice"],
+        ["Site", "site", "slices"],
+        ["Service", "service", "slices"],
+        ["User", "creator", "slices"],
+        ["Flavor", "default_flavor", "slices"],
+        ["Image", "default_image", "slices"],
+        ["Node", "default_node", "slices"]
         
-        ["Slice", "slices", ""],
+    ], 
+    
+    "SlicePrivilege": [
         
-        ["Instance", "instances", ""]
         
-    ], "NetworkParameter": [
         
-        ["NetworkParameterType", "parameter", ""]
         
-    ], "NetworkParameterType": [
         
-    ], "NetworkSlice": [
-        ["ControllerNetwork", "network", "network"],
+         
         
-        ["Network", "network", ""],
-        ["ControllerSlice", "slice", "slice"],
         
-        ["Slice", "slice", ""]
         
-    ], "NetworkTemplate": [
         
-    ], "Node": [
         
-        ["SiteDeployment", "site_deployment", ""]
         
-    ], "NodeLabel": [
         
-        ["Node", "node", ""]
+        ["ControllerSlicePrivilege", "controllersliceprivileges", "slice_privilege"],
         
-    ], "Port": [
-        ["ControllerNetwork", "network", "network"],
         
-        ["Network", "network", ""],
+        ["User", "user", "sliceprivileges"],
+        ["Slice", "slice", "sliceprivileges"],
+        ["SliceRole", "role", "sliceprivileges"]
         
-        ["Instance", "instance", ""]
+    ], 
+    
+    "SliceRole": [
         
-    ], "Role": [
         
-    ], "Service": [
         
-    ], "ServiceAttribute": [
         
-        ["Service", "service", ""]
         
-    ], "ServiceDependency": [
         
-        ["Service", "provider_service", ""],
+    ], 
+    
+    "Tag": [
         
-        ["Service", "subscriber_service", ""]
         
-    ], "ServiceMonitoringAgentInfo": [
         
-        ["Service", "service", ""]
         
-    ], "ServicePrivilege": [
-        ["ControllerUser", "user", "user"],
         
-        ["User", "user", ""],
+        ["Service", "service", "tags"]
         
-        ["Service", "service", ""],
+    ], 
+    
+    "InterfaceType": [
         
-        ["ServiceRole", "role", ""]
         
-    ], "ServiceRole": [
         
-    ], "Site": [
         
-        ["Deployment", "deployments", ""]
         
-    ], "SiteDeployment": [
-        ["ControllerSite", "site", "site"],
         
-        ["Site", "site", ""],
+    ], 
+    
+    "ServiceInterface": [
         
-        ["Deployment", "deployment", ""]
         
         
-    ], "SitePrivilege": [
-        ["ControllerUser", "user", "user"],
         
-        ["User", "user", ""],
-        ["ControllerSite", "site", "site"],
         
-        ["Site", "site", ""],
+        ["Service", "service", "service_interfaces"],
+        ["InterfaceType", "interface_type", "service_interfaces"]
         
-        ["SiteRole", "role", ""]
+    ], 
+    
+    "ServiceInstance": [
         
-    ], "SiteRole": [
         
-    ], "Slice": [
-        ["ControllerSite", "site", "site"],
         
-        ["Site", "site", ""],
         
-        ["Service", "service", ""],
-        ["ControllerUser", "creator", "user"],
         
-        ["User", "creator", ""],
+        ["Service", "owner", "service_instances"]
         
-        ["Flavor", "default_flavor", ""],
+    ], 
+    
+    "ServiceInstanceLink": [
         
-        ["Image", "default_image", ""],
         
-        ["Node", "default_node", ""]
         
-    ], "SlicePrivilege": [
-        ["ControllerUser", "user", "user"],
         
-        ["User", "user", ""],
-        ["ControllerSlice", "slice", "slice"],
         
-        ["Slice", "slice", ""],
+        ["ServiceInstance", "provider_service_instance", "provided_links"],
+        ["ServiceInterface", "provider_service_interface", "provided_links"],
+        ["ServiceInstance", "subscriber_service_instance", "subscribed_links"],
+        ["Service", "subscriber_service", "subscribed_links"],
+        ["Network", "subscriber_network", "subscribed_links"]
         
-        ["SliceRole", "role", ""]
+    ], 
+    
+    "ServiceInstanceAttribute": [
         
-    ], "SliceRole": [
         
-    ], "Tag": [
         
-        ["Service", "service", ""]
         
-    ], "InterfaceType": [
         
-    ], "ServiceInterface": [
+        ["ServiceInstance", "service_instance", "service_instance_attributes"]
         
-        ["Service", "service", ""],
+    ], 
+    
+    "TenantWithContainer": [
         
-        ["InterfaceType", "interface_type", ""]
         
-    ], "ServiceInstance": [
         
-        ["Service", "owner", ""]
         
-    ], "ServiceInstanceLink": [
         
-        ["ServiceInstance", "provider_service_instance", ""],
+        ["Service", "owner", "service_instances"],
+        ["Instance", "instance", "+"],
+        ["User", "creator", "+"]
         
-        ["ServiceInterface", "provider_service_interface", ""],
+    ], 
+    
+    "XOS": [
         
-        ["ServiceInstance", "subscriber_service_instance", ""],
         
-        ["Service", "subscriber_service", ""],
-        ["ControllerNetwork", "subscriber_network", "network"],
         
-        ["Network", "subscriber_network", ""]
         
-    ], "ServiceInstanceAttribute": [
         
-        ["ServiceInstance", "service_instance", ""]
         
-    ], "TenantWithContainer": [
+    ], 
+    
+    "XOSGuiExtension": [
         
-        ["Service", "owner", ""],
         
-        ["Instance", "instance", ""],
-        ["ControllerUser", "creator", "user"],
         
-        ["User", "creator", ""]
         
-    ], "XOS": [
         
-    ], "XOSGuiExtension": [
         
     ]
 }