diff --git a/client/tomcatconf/components.xml.in b/client/tomcatconf/components.xml.in
index 49c075b117c..48b1e8ae8c4 100755
--- a/client/tomcatconf/components.xml.in
+++ b/client/tomcatconf/components.xml.in
@@ -161,11 +161,6 @@ under the License.
         </adapters>
         <adapters key="com.cloud.network.element.FirewallServiceProvider">
             <adapter name="VirtualRouter" class="com.cloud.network.element.VirtualRouterElement"/>
-            <adapter name="VirtualRouter" class="com.cloud.network.element.JuniperSRXExternalFirewallElement"/>
-        </adapters>
-        <adapters key="com.cloud.network.element.FirewallServiceProvider">
-            <adapter name="VirtualRouter" class="com.cloud.network.element.VirtualRouterElement"/>
-            <adapter name="JuniperSRXExternalFirewallElement" class="com.cloud.network.element.JuniperSRXExternalFirewallElement"/>
         </adapters>
         <adapters key="com.cloud.network.element.DhcpServiceProvider">
             <adapter name="VirtualRouter" class="com.cloud.network.element.VirtualRouterElement"/>
@@ -176,14 +171,15 @@ under the License.
         </adapters>
         <adapters key="com.cloud.network.element.SourceNatServiceProvider">
             <adapter name="VirtualRouter" class="com.cloud.network.element.VirtualRouterElement"/>
-            <adapter name="JuniperSRXExternalFirewallElement" class="com.cloud.network.element.JuniperSRXExternalFirewallElement"/> 
             <adapter name="NiciraNvp" class="com.cloud.network.element.NiciraNvpElement"/>  
         </adapters>
         <adapters key="com.cloud.network.element.StaticNatServiceProvider">
             <adapter name="VirtualRouter" class="com.cloud.network.element.VirtualRouterElement"/>
+            <adapter name="NiciraNvp" class="com.cloud.network.element.NiciraNvpElement"/>
         </adapters>
         <adapters key="com.cloud.network.element.PortForwardingServiceProvider">
             <adapter name="VirtualRouter" class="com.cloud.network.element.VirtualRouterElement"/>
+            <adapter name="NiciraNvp" class="com.cloud.network.element.NiciraNvpElement"/>
         </adapters>
         <adapters key="com.cloud.network.element.LoadBalancingServiceProvider">
             <adapter name="VirtualRouter" class="com.cloud.network.element.VirtualRouterElement"/>
@@ -191,9 +187,23 @@ under the License.
         <adapters key="com.cloud.network.element.RemoteAccessVPNServiceProvider">
             <adapter name="VirtualRouter" class="com.cloud.network.element.VirtualRouterElement"/>
         </adapters>
+        <adapters key="com.cloud.network.element.Site2SiteVpnServiceProvider">
+            <adapter name="VirtualRouter" class="com.cloud.network.element.VirtualRouterElement" />
+        </adapters>
         <adapters key="com.cloud.network.element.IpDeployer">
             <adapter name="VirtualRouter" class="com.cloud.network.element.VirtualRouterElement"/>
+            <adapter name="NiciraNvp" class="com.cloud.network.element.NiciraNvpElement"/>
         </adapters>
+        <adapters key="com.cloud.network.element.ConnectivityProvider">
+            <adapter name="NiciraNvp" class="com.cloud.network.element.NiciraNvpElement"/>
+        </adapters>
+        <adapters key="com.cloud.network.element.NetworkACLServiceProvider">
+            <adapter name="VirtualRouter" class="com.cloud.network.element.VirtualRouterElement"/>
+        </adapters>
+        <adapters key="com.cloud.network.element.VpcProvider">
+            <adapter name="VirtualRouter" class="com.cloud.network.element.VirtualRouterElement"/>
+        </adapters>
+
         <adapters key="com.cloud.cluster.agentlb.AgentLoadBalancerPlanner">
             <adapter name="ClusterBasedAgentLbPlanner" class="com.cloud.cluster.agentlb.ClusterBasedAgentLoadBalancerPlanner"/>
         </adapters>
diff --git a/server/src/com/cloud/configuration/DefaultComponentLibrary.java b/server/src/com/cloud/configuration/DefaultComponentLibrary.java
index 226ca49a56b..32a6be7c674 100755
--- a/server/src/com/cloud/configuration/DefaultComponentLibrary.java
+++ b/server/src/com/cloud/configuration/DefaultComponentLibrary.java
@@ -74,6 +74,7 @@ import com.cloud.maint.UpgradeManagerImpl;
 import com.cloud.maint.dao.AgentUpgradeDaoImpl;
 import com.cloud.network.ExternalLoadBalancerUsageManagerImpl;
 import com.cloud.network.NetworkManagerImpl;
+import com.cloud.network.NetworkServiceImpl;
 import com.cloud.network.StorageNetworkManagerImpl;
 import com.cloud.network.as.AutoScaleManagerImpl;
 import com.cloud.network.as.dao.AutoScalePolicyConditionMapDaoImpl;
@@ -379,6 +380,7 @@ public class DefaultComponentLibrary extends ComponentLibraryBase implements Com
         addManager("account manager", AccountManagerImpl.class);
         addManager("domain manager", DomainManagerImpl.class);
         addManager("resource limit manager", ResourceLimitManagerImpl.class);
+        addManager("network service", NetworkServiceImpl.class);
         addManager("network manager", NetworkManagerImpl.class);
         addManager("download manager", DownloadMonitorImpl.class);
         addManager("upload manager", UploadMonitorImpl.class);