diff --git a/xos/synchronizer/model_policies/model_policy_vepcserviceinstance.py b/xos/synchronizer/model_policies/model_policy_vepcserviceinstance.py
index c75fc99..a6e7475 100644
--- a/xos/synchronizer/model_policies/model_policy_vepcserviceinstance.py
+++ b/xos/synchronizer/model_policies/model_policy_vepcserviceinstance.py
@@ -20,15 +20,19 @@
 from multistructlog import create_logger
 
 log = create_logger(Config().get('logging'))
+
 blueprints = Config().get('blueprints')
 
+
 def service_of_service_instance(si):
-    if si.endswith('Tenant'): 
+    if si.endswith('Tenant'):
         return si[:-len('Tenant')] + 'Service'
-    elif si.endswith('ServiceInstance'): 
+    elif si.endswith('ServiceInstance'):
         return si[:-len('ServiceInstance')] + 'Service'
     else:
-        raise Exception('Could not translate service instance into service: %s'%si)
+        raise Exception(
+            'Could not translate service instance into service: %s' % si)
+
 
 class VEPCServiceInstancePolicy(Policy):
     model_name = "VEPCServiceInstance"
@@ -42,6 +46,7 @@
     """TODO: Update the following to not be service-specific
        This code assumes there is only one vendor installed 
     """
+
     def configure_service_instance(self, service_instance):
         if service_instance.leaf_model_name == 'VSPGWUTenant':
             vendor = VSPGWUVendor.objects.first()
@@ -55,63 +60,77 @@
             service_instance.vspgwc_vendor = vendor
 
     def child_service_instance_from_name(self, name):
-        service_instances = self.obj.child_serviceinstances.all() 
+        service_instances = self.obj.child_serviceinstances.all()
         service_instances.extend(self.in_memory_instances)
 
         try:
-            service_instance = next(s for s in service_instances if s.leaf_model_name == name)
+            service_instance = next(
+                s for s in service_instances if s.leaf_model_name == name)
         except StopIteration:
             service_instance = None
 
-        return service_instance 
+        return service_instance
 
     def get_service_for_service_instance(self, si):
         service = service_of_service_instance(si)
         service_class = getattr(Slice().stub, service)
-        service_obj = service_class.objects.first() # There's only one service object
+        service_obj = service_class.objects.first()  # There's only one service object
         return service_obj
 
     def create_service_instance(self, si):
         service = self.get_service_for_service_instance(si)
-	if not service:
-	    raise Exception('No service object for %s'%service)
+        if not service:
+            raise Exception('No service object for %s' % service)
 
-	si_class = getattr(Slice().stub, si)
-	s = si_class(owner = service, name = 'epc-%s-%d'%(si.lower(), self.obj.id))
-	s.master_serviceinstance = self.obj
+        si_class = getattr(Slice().stub, si)
+        s = si_class(owner=service, name='epc-%s-%d' %
+                     (si.lower(), self.obj.id))
+        s.master_serviceinstance = self.obj
 
-	self.configure_service_instance(s)
-	s.save()
+        self.configure_service_instance(s)
+        s.save()
 
         self.in_memory_instances.append(s)
         return s
 
+    def add_networks_to_service_instance(self, instance, networks):
+        for n in networks:
+            net = Network.objects.filter(name=n)[0]
+            one_and_only_slice_hopefully = instance.owner.slices.all()[0]
+            ns_object = NetworkSlice.objects.filter(
+                network=net.id, slice=one_and_only_slice_hopefully.id)
+            if not ns_object:
+                ns_object = NetworkSlice(
+                    network=net, slice=one_and_only_slice_hopefully)
+                ns_object.save()
+
     def create_service_instance_with_networks(self, si_name, networks):
         instance = self.child_service_instance_from_name(si_name)
         if not instance:
             instance = self.create_service_instance(si_name)
 
-        for n in networks:
-            one_and_only_slice_hopefully = instance.owner.slices.all()[0]
-            ns_object = NetworkSlice.objects.filter(network = n, slice = one_and_only_slice_hopefully)
-            if not ns_object:
-                ns_object = NetworkSlice(network = n, slice = one_and_only_slice_hopefully)
-                ns_object.save()
+        self.add_networks_to_service_instance(instance, networks)
 
         return instance
 
     def create_link(self, src_instance, dst_instance):
-        src_service = self.get_service_for_service_instance(src)
-        dst_service = self.get_service_for_service_instance(dst)
+        src_service = self.get_service_for_service_instance(
+            src_instance.leaf_model_name)
+        dst_service = self.get_service_for_service_instance(
+            dst_instance.leaf_model_name)
 
-        service_dependency = ServiceDependency.objects.filter(provider_service_id = dst_service.id, subscriber_service_id = src_service.id)
+        service_dependency = ServiceDependency.objects.filter(
+            provider_service_id=dst_service.id, subscriber_service_id=src_service.id)
         if not service_dependency:
-            service_dependency = ServiceDependency(provider_service = dst_service, subscriber_service = src_service)
+            service_dependency = ServiceDependency(
+                provider_service=dst_service, subscriber_service=src_service)
             service_dependency.save()
 
-        service_instance_link = ServiceInstanceLink.objects.filter(provider_service_instance_id = dst_instance.id, subscriber_service_instance_id = src_instance.id)
+        service_instance_link = ServiceInstanceLink.objects.filter(
+            provider_service_instance_id=dst_instance.id, subscriber_service_instance_id=src_instance.id)
         if not service_instance_link:
-            service_instance_link = ServiceInstanceLink(provider_service_instance = dst_instance, subscriber_service_instance = src_instance)
+            service_instance_link = ServiceInstanceLink(
+                provider_service_instance=dst_instance, subscriber_service_instance=src_instance)
             service_instance_link.save()
 
     def recursive_create_links(self, blueprint, src):
@@ -120,29 +139,44 @@
             networks = node.get('networks', [])
             instance = self.create_service_instance_with_networks(k, networks)
 
-	    if src:
-		self.create_link(src, instance)
+            if src:
+                self.add_networks_to_service_instance(src, networks)
+                self.create_link(src, instance)
 
             links = node.get('links', [])
-	    self.recursive_create_links(links, instance)
+            self.recursive_create_links(links, instance)
 
     def create_epc_network(self, n):
         network_name = n['name']
         site_name = self.obj.site.name
-        slice_name = '%s_%s'%(site_name, network_name)
+        slice_name = '%s_%s' % (
+            site_name, network_name.replace('_network', ''))
 
-        slice = Slice.objects.get(name=slice_name)
-        if not slice:
-            slice = Slice(name = slice_name, default_isolation = "vm", network = "noauto", site = self.obj.site)
+        slices = Slice.objects.filter(name=slice_name)
+        if not slices:
+            flavor = Flavor.objects.all()[0]
+            image = Image.objects.all()[0]
+            slice = Slice(name=slice_name, default_isolation="vm", network="noauto",
+                          site=self.obj.site, default_flavor=flavor, default_image=image)
             slice.save()
+        else:
+            slice = slices[0]
 
-        net = Network.objects.get(name=network_name)
-        if not net:
-            net = Network(name = network_name, subnet = n['subnet'], permit_all_slices = n.get('permit_all_slices', False), template = n.get('template', 'public'), owner = slice)
+        nets = Network.objects.filter(name=network_name)
+        if not nets:
+            template_name = n.get('template', 'public')
+            templates = NetworkTemplate.objects.filter(name=template_name)
+            if not templates:
+                raise Exception('Template %s not found' % template_name)
+
+            net = Network(name=network_name, subnet=n['subnet'], permit_all_slices=n.get(
+                'permit_all_slices', False), template=templates[0], owner=slice)
             net.save()
-        elif net.subnet != n['subnet']:
-            net.subnet = n['subnet']
-            net.save()
+        else:
+            net = nets[0]
+            if net.subnet != n['subnet']:
+                net.subnet = n['subnet']
+                net.save()
 
         self.network_map[network_name] = net
 
@@ -155,7 +189,8 @@
         # Create service graph based on blueprint
         chosen_blueprint = service_instance.blueprint
         try:
-            blueprint = next(b for b in blueprints if b['name'] == chosen_blueprint)
+            blueprint = next(
+                b for b in blueprints if b['name'] == chosen_blueprint)
         except StopIteration:
             log.error('Chosen blueprint (%s) not found' % chosen_blueprint)
 
@@ -169,4 +204,4 @@
         self.create_networks_and_child_services(service_instance)
 
     def handle_delete(self, service_instance):
-	raise Exception("Not implemented")
+        raise Exception("Not implemented")