diff --git a/config/connectors.cnf b/config/connectors.cnf
index bfbe40b..a7cf47d 100644
--- a/config/connectors.cnf
+++ b/config/connectors.cnf
@@ -13,19 +13,33 @@ billingtags = 343
 size = MEDIUM
 
 [ipsecconnectors3]
+cxp = US-EAST-2
+segments = Pre Prod
+group = Development
+billingtags = 343
+size = SMALL
+
+[ipsecconnectors4]
 cxp = GERMANYWESTCENTRAL-AZURE-1
 segments = Corporate
 group = Users
 billingtags = 333
 size = MEDIUM
 
-[ipsecconnectors4]
+[ipsecconnectors5]
 cxp = GERMANYWESTCENTRAL-AZURE-1
 segments = Prod
 group = Development
 billingtags = 343
 size = MEDIUM
 
+[ipsecconnectors6]
+cxp = GERMANYWESTCENTRAL-AZURE-1
+segments = Pre Prod
+group = Development
+billingtags = 343
+size = SMALL
+
 [internetconnectors1]
 cxp = US-EAST-2
 segments = Corporate
diff --git a/config/demo.cnf b/config/demo.cnf
index 01a798f..40ff44f 100644
--- a/config/demo.cnf
+++ b/config/demo.cnf
@@ -10,21 +10,35 @@ cxp = US-EAST-2
 segments = Prod
 group = Development
 billingtags = 343
-size = LARGE
+size = MEDIUM
 
 [ipsecconnectors3]
+cxp = US-EAST-2
+segments = Pre Prod
+group = Development
+billingtags = 343
+size = SMALL
+
+[ipsecconnectors4]
 cxp = GERMANYWESTCENTRAL-AZURE-1
 segments = Corporate
 group = Users
 billingtags = 333
 size = MEDIUM
 
-[ipsecconnectors4]
+[ipsecconnectors5]
 cxp = GERMANYWESTCENTRAL-AZURE-1
 segments = Prod
 group = Development
 billingtags = 343
-size = LARGE
+size = MEDIUM
+
+[ipsecconnectors6]
+cxp = GERMANYWESTCENTRAL-AZURE-1
+segments = Pre Prod
+group = Development
+billingtags = 343
+size = SMALL
 
 [internetconnectors1]
 cxp = US-EAST-2
diff --git a/config/ipsecconnectors2.txt b/config/ipsecconnectors2.txt
index 5803895..2247c08 100644
--- a/config/ipsecconnectors2.txt
+++ b/config/ipsecconnectors2.txt
@@ -5,9 +5,9 @@
         "segments": [
             "Prod"
         ],
-        "group": "Users",
+        "group": "Development",
 	"billingTags": [
-	    "333"
+	    "343"
 	],
         "vpnMode": "ROUTE_BASED",
         "routingOptions": {
diff --git a/config/ipsecconnectors3.txt b/config/ipsecconnectors3.txt
index a869963..fb53a02 100644
--- a/config/ipsecconnectors3.txt
+++ b/config/ipsecconnectors3.txt
@@ -1,13 +1,13 @@
 {
-        "name": "Amsterdam1",
+        "name": "SanJose3",
         "cxp": "US-EAST-2",
         "size": "LARGE",
         "segments": [
-            "Prod"
+            "Pre Prod"
         ],
-        "group": "Users",
+        "group": "Development",
 	"billingTags": [
-	    "333"
+	    "343"
 	],
         "vpnMode": "ROUTE_BASED",
         "routingOptions": {
@@ -19,7 +19,7 @@
             {
                 "name": "PAN",
                 "gatewayIpType": "STATIC",
-                "customerGwIp": "192.168.2.2"
+                "customerGwIp": "192.168.1.4"
             }
         ]
 }
diff --git a/config/ipsecconnectors4.txt b/config/ipsecconnectors4.txt
index ee94816..f3bf3cf 100644
--- a/config/ipsecconnectors4.txt
+++ b/config/ipsecconnectors4.txt
@@ -1,6 +1,6 @@
 {
-        "name": "Amsterdam2",
-        "cxp": "US-EAST-2",
+        "name": "Amsterdam1",
+        "cxp": "GERMANYWESTCENTRAL-AZURE-1",
         "size": "LARGE",
         "segments": [
             "Corporate"
@@ -19,7 +19,7 @@
             {
                 "name": "PAN",
                 "gatewayIpType": "STATIC",
-                "customerGwIp": "192.168.2.3"
+                "customerGwIp": "192.168.2.2"
             }
         ]
 }
diff --git a/config/ipsecconnectors5.txt b/config/ipsecconnectors5.txt
new file mode 100644
index 0000000..9c04be7
--- /dev/null
+++ b/config/ipsecconnectors5.txt
@@ -0,0 +1,25 @@
+{
+        "name": "Amsterdam2",
+        "cxp": "GERMANYWESTCENTRAL-AZURE-1",
+        "size": "LARGE",
+        "segments": [
+            "Prod"
+        ],
+        "group": "Development",
+	"billingTags": [
+	    "343"
+	],
+        "vpnMode": "ROUTE_BASED",
+        "routingOptions": {
+        "dynamicRouting": {
+            "customerGwAsn": "60131"
+         }
+	},
+        "sites": [
+            {
+                "name": "PAN",
+                "gatewayIpType": "STATIC",
+                "customerGwIp": "192.168.2.3"
+            }
+        ]
+}
diff --git a/config/ipsecconnectors6.txt b/config/ipsecconnectors6.txt
new file mode 100644
index 0000000..85770f5
--- /dev/null
+++ b/config/ipsecconnectors6.txt
@@ -0,0 +1,25 @@
+{
+        "name": "Amsterdam3",
+        "cxp": "GERMANYWESTCENTRAL-AZURE-1",
+        "size": "LARGE",
+        "segments": [
+            "Pre Prod"
+        ],
+        "group": "Development",
+	"billingTags": [
+	    "343"
+	],
+        "vpnMode": "ROUTE_BASED",
+        "routingOptions": {
+        "dynamicRouting": {
+            "customerGwAsn": "60131"
+         }
+	},
+        "sites": [
+            {
+                "name": "PAN",
+                "gatewayIpType": "STATIC",
+                "customerGwIp": "192.168.2.4"
+            }
+        ]
+}
diff --git a/config/panfwservices1.txt b/config/panfwservices1.txt
index deb5af5..6f7de6c 100644
--- a/config/panfwservices1.txt
+++ b/config/panfwservices1.txt
@@ -26,5 +26,15 @@
             "hostName": "PAN-US-instance-1",
             "credentialId": ""
         }
-    ]
+    ],
+    "segmentOptions": {
+        "Corporate": {
+        "segmentId": 1,
+            "zonesToGroups": {
+                "DEFAULT": [
+                    "Users"
+                ]
+            }
+        }
+    }
 }