diff --git a/test/Ocelot.ManualTest/configuration.json b/test/Ocelot.ManualTest/configuration.json
index c8298b20..a8d01b24 100644
--- a/test/Ocelot.ManualTest/configuration.json
+++ b/test/Ocelot.ManualTest/configuration.json
@@ -3,8 +3,12 @@
     {
       "DownstreamPathTemplate": "/",
       "DownstreamScheme": "http",
-      "DownstreamHost": "localhost",
-      "DownstreamPort": 52876,
+      "DownstreamHostAndPorts": [
+        {
+          "Host": "localhost",
+          "Port": 52876
+        }
+      ],
       "UpstreamPathTemplate": "/identityserverexample",
       "UpstreamHttpMethod": [ "Get" ],
       "QoSOptions": {
@@ -45,8 +49,12 @@
     {
       "DownstreamPathTemplate": "/posts",
       "DownstreamScheme": "https",
-      "DownstreamHost": "jsonplaceholder.typicode.com",
-      "DownstreamPort": 443,
+      "DownstreamHostAndPorts": [
+        {
+          "Host": "jsonplaceholder.typicode.com",
+          "Port": 443
+        }
+      ],
       "UpstreamPathTemplate": "/posts",
       "UpstreamHttpMethod": [ "Get" ],
       "QoSOptions": {
@@ -58,8 +66,12 @@
     {
       "DownstreamPathTemplate": "/posts/{postId}",
       "DownstreamScheme": "http",
-      "DownstreamHost": "jsonplaceholder.typicode.com",
-      "DownstreamPort": 80,
+      "DownstreamHostAndPorts": [
+        {
+          "Host": "jsonplaceholder.typicode.com",
+          "Port": 80
+        }
+      ],
       "UpstreamPathTemplate": "/posts/{postId}",
       "UpstreamHttpMethod": [ "Get" ],
       "RequestIdKey": "ReRouteRequestId",
@@ -72,8 +84,12 @@
     {
       "DownstreamPathTemplate": "/posts/{postId}/comments",
       "DownstreamScheme": "http",
-      "DownstreamHost": "jsonplaceholder.typicode.com",
-      "DownstreamPort": 80,
+      "DownstreamHostAndPorts": [
+        {
+          "Host": "jsonplaceholder.typicode.com",
+          "Port": 80
+        }
+      ],
       "UpstreamPathTemplate": "/posts/{postId}/comments",
       "UpstreamHttpMethod": [ "Get" ],
       "QoSOptions": {
@@ -85,8 +101,12 @@
     {
       "DownstreamPathTemplate": "/comments",
       "DownstreamScheme": "http",
-      "DownstreamHost": "jsonplaceholder.typicode.com",
-      "DownstreamPort": 80,
+      "DownstreamHostAndPorts": [
+        {
+          "Host": "jsonplaceholder.typicode.com",
+          "Port": 80
+        }
+      ],
       "UpstreamPathTemplate": "/comments",
       "UpstreamHttpMethod": [ "Get" ],
       "QoSOptions": {
@@ -98,8 +118,12 @@
     {
       "DownstreamPathTemplate": "/posts",
       "DownstreamScheme": "http",
-      "DownstreamHost": "jsonplaceholder.typicode.com",
-      "DownstreamPort": 80,
+      "DownstreamHostAndPorts": [
+        {
+          "Host": "jsonplaceholder.typicode.com",
+          "Port": 80
+        }
+      ],
       "UpstreamPathTemplate": "/posts",
       "UpstreamHttpMethod": [ "Post" ],
       "QoSOptions": {
@@ -111,8 +135,12 @@
     {
       "DownstreamPathTemplate": "/posts/{postId}",
       "DownstreamScheme": "http",
-      "DownstreamHost": "jsonplaceholder.typicode.com",
-      "DownstreamPort": 80,
+      "DownstreamHostAndPorts": [
+        {
+          "Host": "jsonplaceholder.typicode.com",
+          "Port": 80
+        }
+      ],
       "UpstreamPathTemplate": "/posts/{postId}",
       "UpstreamHttpMethod": [ "Put" ],
       "QoSOptions": {
@@ -124,8 +152,12 @@
     {
       "DownstreamPathTemplate": "/posts/{postId}",
       "DownstreamScheme": "http",
-      "DownstreamHost": "jsonplaceholder.typicode.com",
-      "DownstreamPort": 80,
+      "DownstreamHostAndPorts": [
+        {
+          "Host": "jsonplaceholder.typicode.com",
+          "Port": 80
+        }
+      ],
       "UpstreamPathTemplate": "/posts/{postId}",
       "UpstreamHttpMethod": [ "Patch" ],
       "QoSOptions": {
@@ -137,8 +169,12 @@
     {
       "DownstreamPathTemplate": "/posts/{postId}",
       "DownstreamScheme": "http",
-      "DownstreamHost": "jsonplaceholder.typicode.com",
-      "DownstreamPort": 80,
+      "DownstreamHostAndPorts": [
+        {
+          "Host": "jsonplaceholder.typicode.com",
+          "Port": 80
+        }
+      ],
       "UpstreamPathTemplate": "/posts/{postId}",
       "UpstreamHttpMethod": [ "Delete" ],
       "QoSOptions": {
@@ -150,8 +186,12 @@
     {
       "DownstreamPathTemplate": "/api/products",
       "DownstreamScheme": "http",
-      "DownstreamHost": "jsonplaceholder.typicode.com",
-      "DownstreamPort": 80,
+      "DownstreamHostAndPorts": [
+        {
+          "Host": "jsonplaceholder.typicode.com",
+          "Port": 80
+        }
+      ],
       "UpstreamPathTemplate": "/products",
       "UpstreamHttpMethod": [ "Get" ],
       "QoSOptions": {
@@ -164,8 +204,12 @@
     {
       "DownstreamPathTemplate": "/api/products/{productId}",
       "DownstreamScheme": "http",
-      "DownstreamHost": "jsonplaceholder.typicode.com",
-      "DownstreamPort": 80,
+      "DownstreamHostAndPorts": [
+        {
+          "Host": "jsonplaceholder.typicode.com",
+          "Port": 80
+        }
+      ],
       "UpstreamPathTemplate": "/products/{productId}",
       "UpstreamHttpMethod": [ "Get" ],
       "FileCacheOptions": { "TtlSeconds": 15 }
@@ -173,8 +217,12 @@
     {
       "DownstreamPathTemplate": "/api/products",
       "DownstreamScheme": "http",
-      "DownstreamHost": "products20161126090340.azurewebsites.net",
-      "DownstreamPort": 80,
+      "DownstreamHostAndPorts": [
+        {
+          "Host": "jsonplaceholder.typicode.com",
+          "Port": 80
+        }
+      ],
       "UpstreamPathTemplate": "/products",
       "UpstreamHttpMethod": [ "Post" ],
       "QoSOptions": {
@@ -186,8 +234,12 @@
     {
       "DownstreamPathTemplate": "/api/products/{productId}",
       "DownstreamScheme": "http",
-      "DownstreamHost": "products20161126090340.azurewebsites.net",
-      "DownstreamPort": 80,
+      "DownstreamHostAndPorts": [
+        {
+          "Host": "jsonplaceholder.typicode.com",
+          "Port": 80
+        }
+      ],
       "UpstreamPathTemplate": "/products/{productId}",
       "UpstreamHttpMethod": [ "Put" ],
       "QoSOptions": {
@@ -197,95 +249,15 @@
       },
       "FileCacheOptions": { "TtlSeconds": 15 }
     },
-    {
-      "DownstreamPathTemplate": "/api/products/{productId}",
-      "DownstreamScheme": "http",
-      "DownstreamHost": "products20161126090340.azurewebsites.net",
-      "DownstreamPort": 80,
-      "UpstreamPathTemplate": "/products/{productId}",
-      "UpstreamHttpMethod": [ "Delete" ],
-      "QoSOptions": {
-        "ExceptionsAllowedBeforeBreaking": 3,
-        "DurationOfBreak": 10,
-        "TimeoutValue": 5000
-      },
-      "FileCacheOptions": { "TtlSeconds": 15 }
-    },
-    {
-      "DownstreamPathTemplate": "/api/customers",
-      "DownstreamScheme": "http",
-      "DownstreamHost": "customers20161126090811.azurewebsites.net",
-      "DownstreamPort": 80,
-      "UpstreamPathTemplate": "/customers",
-      "UpstreamHttpMethod": [ "Get" ],
-      "QoSOptions": {
-        "ExceptionsAllowedBeforeBreaking": 3,
-        "DurationOfBreak": 10,
-        "TimeoutValue": 5000
-      },
-      "FileCacheOptions": { "TtlSeconds": 15 }
-    },
-    {
-      "DownstreamPathTemplate": "/api/customers/{customerId}",
-      "DownstreamScheme": "http",
-      "DownstreamHost": "customers20161126090811.azurewebsites.net",
-      "DownstreamPort": 80,
-      "UpstreamPathTemplate": "/customers/{customerId}",
-      "UpstreamHttpMethod": [ "Get" ],
-      "QoSOptions": {
-        "ExceptionsAllowedBeforeBreaking": 3,
-        "DurationOfBreak": 10,
-        "TimeoutValue": 5000
-      },
-      "FileCacheOptions": { "TtlSeconds": 15 }
-    },
-    {
-      "DownstreamPathTemplate": "/api/customers",
-      "DownstreamScheme": "http",
-      "DownstreamHost": "customers20161126090811.azurewebsites.net",
-      "DownstreamPort": 80,
-      "UpstreamPathTemplate": "/customers",
-      "UpstreamHttpMethod": [ "Post" ],
-      "QoSOptions": {
-        "ExceptionsAllowedBeforeBreaking": 3,
-        "DurationOfBreak": 10,
-        "TimeoutValue": 5000
-      },
-      "FileCacheOptions": { "TtlSeconds": 15 }
-    },
-    {
-      "DownstreamPathTemplate": "/api/customers/{customerId}",
-      "DownstreamScheme": "http",
-      "DownstreamHost": "customers20161126090811.azurewebsites.net",
-      "DownstreamPort": 80,
-      "UpstreamPathTemplate": "/customers/{customerId}",
-      "UpstreamHttpMethod": [ "Put" ],
-      "QoSOptions": {
-        "ExceptionsAllowedBeforeBreaking": 3,
-        "DurationOfBreak": 10,
-        "TimeoutValue": 5000
-      },
-      "FileCacheOptions": { "TtlSeconds": 15 }
-    },
-    {
-      "DownstreamPathTemplate": "/api/customers/{customerId}",
-      "DownstreamScheme": "http",
-      "DownstreamHost": "customers20161126090811.azurewebsites.net",
-      "DownstreamPort": 80,
-      "UpstreamPathTemplate": "/customers/{customerId}",
-      "UpstreamHttpMethod": [ "Delete" ],
-      "QoSOptions": {
-        "ExceptionsAllowedBeforeBreaking": 3,
-        "DurationOfBreak": 10,
-        "TimeoutValue": 5000
-      },
-      "FileCacheOptions": { "TtlSeconds": 15 }
-    },
     {
       "DownstreamPathTemplate": "/posts",
       "DownstreamScheme": "http",
-      "DownstreamHost": "jsonplaceholder.typicode.com",
-      "DownstreamPort": 80,
+      "DownstreamHostAndPorts": [
+        {
+          "Host": "jsonplaceholder.typicode.com",
+          "Port": 80
+        }
+      ],
       "UpstreamPathTemplate": "/posts/",
       "UpstreamHttpMethod": [ "Get" ],
       "QoSOptions": {
@@ -298,8 +270,12 @@
     {
       "DownstreamPathTemplate": "/",
       "DownstreamScheme": "http",
-      "DownstreamHost": "www.bbc.co.uk",
-      "DownstreamPort": 80,
+      "DownstreamHostAndPorts": [
+        {
+          "Host": "www.bbc.co.uk",
+          "Port": 80
+        }
+      ],
       "UpstreamPathTemplate": "/bbc/",
       "UpstreamHttpMethod": [ "Get" ]
     }
@@ -308,4 +284,4 @@
   "GlobalConfiguration": {
     "RequestIdKey": "OcRequestId"
   }
-}
\ No newline at end of file
+}