diff --git a/test/data/gws-direct.json b/test/data/gws-direct.json
index a2cd3d4366eed4ea3a6dc0941f78f5a0b386dd29..a4aa9f64562250e5e4a16fc795117f741720e49f 100644
--- a/test/data/gws-direct.json
+++ b/test/data/gws-direct.json
@@ -2,253 +2,288 @@
   {
     "nren": "ARNES",
     "isp": "Cogent",
-    "hosts": {
-      "hostname": "88.200.0.63",
-      "community": "gn2nocT3st",
-      "interfaces": [
-        {
-          "tag": "a",
-          "counters": {
-            "discards_in": "1.3.6.1.2.1.2.2.1.13.533",
-            "discards_out": "1.3.6.1.2.1.2.2.1.19.533",
-            "errors_in": "1.3.6.1.2.1.2.2.1.14.533",
-            "errors_out": "1.3.6.1.2.1.2.2.1.20.533"
+    "hosts": [
+      {
+        "hostname": "88.200.0.63",
+        "community": "gn2nocT3st",
+        "interfaces": [
+          {
+            "name": "a",
+            "counters": {
+              "discards_in": "1.3.6.1.2.1.2.2.1.13.533",
+              "discards_out": "1.3.6.1.2.1.2.2.1.19.533",
+              "errors_in": "1.3.6.1.2.1.2.2.1.14.533",
+              "errors_out": "1.3.6.1.2.1.2.2.1.20.533"
+            }
+          },
+          {
+            "name": "b",
+            "counters": {
+              "traffic_in": "1.3.6.1.2.1.31.1.1.1.6.531",
+              "traffic_out": "1.3.6.1.2.1.31.1.1.1.10.531"
+            }
+          },
+          {
+            "name": "c",
+            "counters": {
+              "traffic_in": "1.3.6.1.2.1.31.1.1.1.6.525",
+              "traffic_out": "1.3.6.1.2.1.31.1.1.1.10.525"
+            }
+          },
+          {
+            "name": "d",
+            "counters": {
+              "traffic_in": "1.3.6.1.2.1.31.1.1.1.6.553",
+              "traffic_out": "1.3.6.1.2.1.31.1.1.1.10.553"
+            }
+          },
+          {
+            "name": "e",
+            "counters": {
+              "traffic_in": "1.3.6.1.2.1.31.1.1.1.6.563",
+              "traffic_out": "1.3.6.1.2.1.31.1.1.1.10.563"
+            }
           }
-        },
-        {
-          "tag": "b",
-          "counters": {
-            "traffic_in": "1.3.6.1.2.1.31.1.1.1.6.531",
-            "traffic_out": "1.3.6.1.2.1.31.1.1.1.10.531"
-          }
-        },
-        {
-          "tag": "c",
-          "counters": {
-            "traffic_in": "1.3.6.1.2.1.31.1.1.1.6.525",
-            "traffic_out": "1.3.6.1.2.1.31.1.1.1.10.525"
-          }
-        },
-        {
-          "tag": "d",
-          "counters": {
-            "traffic_in": "1.3.6.1.2.1.31.1.1.1.6.553",
-            "traffic_out": "1.3.6.1.2.1.31.1.1.1.10.553"
-          }
-        },
-        {
-          "tag": "e",
-          "counters": {
-            "traffic_in": "1.3.6.1.2.1.31.1.1.1.6.563",
-            "traffic_out": "1.3.6.1.2.1.31.1.1.1.10.563"
-          }
-        }
-      ]
-    }
+        ]
+      }
+    ]
   },
   {
     "nren": "ARNES",
     "isp": "Telia",
-    "hosts": {
-      "hostname": "62.40.124.6",
-      "community": "gn2nocT3st",
-      "interfaces": [
-        {
-          "tag": "a",
-          "counters": {
-            "traffic_in": "1.3.6.1.2.1.31.1.1.1.6.611",
-            "traffic_out": "1.3.6.1.2.1.31.1.1.1.10.611"
-          }
-        },
-        {
-          "tag": "b",
-          "counters": {
-            "traffic_in": "1.3.6.1.2.1.31.1.1.1.6.589",
-            "traffic_out": "1.3.6.1.2.1.31.1.1.1.10.589"
+    "hosts": [
+      {
+        "hostname": "62.40.124.6",
+        "community": "gn2nocT3st",
+        "interfaces": [
+          {
+            "name": "a",
+            "counters": {
+              "traffic_in": "1.3.6.1.2.1.31.1.1.1.6.611",
+              "traffic_out": "1.3.6.1.2.1.31.1.1.1.10.611"
+            }
+          },
+          {
+            "name": "b",
+            "counters": {
+              "traffic_in": "1.3.6.1.2.1.31.1.1.1.6.589",
+              "traffic_out": "1.3.6.1.2.1.31.1.1.1.10.589"
+            }
           }
-        }
-      ]
-    }
+        ]
+      }
+    ]
   },
   {
     "nren": "CARNET",
     "isp": "Cogent",
-    "hosts": {
-      "hostname": "62.40.124.10",
-      "community": "atlas1453",
-      "interfaces": [
-        {
-          "tag": "a",
-          "counters": {
-            "traffic_in": "1.3.6.1.2.1.31.1.1.1.6.35",
-            "traffic_out": "1.3.6.1.2.1.31.1.1.1.10.35"
+    "hosts": [
+      {
+        "hostname": "62.40.124.10",
+        "community": "atlas1453",
+        "interfaces": [
+          {
+            "name": "a",
+            "counters": {
+              "traffic_in": "1.3.6.1.2.1.31.1.1.1.6.35",
+              "traffic_out": "1.3.6.1.2.1.31.1.1.1.10.35"
+            }
           }
-        }
-      ]
-    }
+        ]
+      }
+    ]
   },
   {
     "nren": "CARNET",
     "isp": "Telia",
-    "hosts": {
-      "hostname": "62.40.125.150",
-      "community": "atlas1453",
-      "interfaces": [
-        {
-          "tag": "a",
-          "counters": {
-            "traffic_in": "1.3.6.1.2.1.31.1.1.1.6.48",
-            "traffic_out": "1.3.6.1.2.1.31.1.1.1.10.48"
+    "hosts": [
+      {
+        "hostname": "62.40.125.150",
+        "community": "atlas1453",
+        "interfaces": [
+          {
+            "name": "a",
+            "counters": {
+              "traffic_in": "1.3.6.1.2.1.31.1.1.1.6.48",
+              "traffic_out": "1.3.6.1.2.1.31.1.1.1.10.48"
+            }
           }
-        }
-      ]
-    }
+        ]
+      }
+    ]
   },
   {
     "nren": "KIFU",
     "isp": "Cogent",
-    "hosts": {
-      "hostname": "195.111.97.108",
-      "community": "atlas1453",
-      "interfaces": [
-        {
-          "tag": "a",
-          "counters": {
-            "traffic_in": "1.3.6.1.2.1.31.1.1.1.6.155",
-            "traffic_out": "1.3.6.1.2.1.31.1.1.1.10.155"
+    "hosts": [
+      {
+        "hostname": "195.111.97.108",
+        "community": "atlas1453",
+        "interfaces": [
+          {
+            "name": "a",
+            "counters": {
+              "traffic_in": "1.3.6.1.2.1.31.1.1.1.6.155",
+              "traffic_out": "1.3.6.1.2.1.31.1.1.1.10.155"
+            }
           }
-        }
-      ]
-    }
+        ]
+      }
+    ]
   },
   {
     "nren": "KIFU",
     "isp": "Telia",
-    "hosts": {
-      "hostname": "195.111.97.108",
-      "community": "atlas1453",
-      "interfaces": [
-        {
-          "tag": "a",
-          "counters": {
-            "traffic_in": "1.3.6.1.2.1.31.1.1.1.6.148",
-            "traffic_out": "1.3.6.1.2.1.31.1.1.1.10.148"
+    "hosts": [
+      {
+        "hostname": "195.111.97.108",
+        "community": "atlas1453",
+        "interfaces": [
+          {
+            "name": "a",
+            "counters": {
+              "traffic_in": "1.3.6.1.2.1.31.1.1.1.6.148",
+              "traffic_out": "1.3.6.1.2.1.31.1.1.1.10.148"
+            }
           }
-        }
-      ]
-    }
+        ]
+      }
+    ]
   },
   {
     "nren": "RedIRIS",
     "isp": "Telia",
-    "hosts": {
-      "hostname": "130.206.206.250",
-      "community": "atlas1453",
-      "interfaces": [
-        {
-          "tag": "a",
-          "counters": {
-            "traffic_in": "1.3.6.1.2.1.31.1.1.1.6.1487",
-            "traffic_out": "1.3.6.1.2.1.31.1.1.1.10.1487"
+    "hosts": [
+      {
+        "hostname": "130.206.206.250",
+        "community": "atlas1453",
+        "interfaces": [
+          {
+            "name": "a",
+            "counters": {
+              "traffic_in": "1.3.6.1.2.1.31.1.1.1.6.1487",
+              "traffic_out": "1.3.6.1.2.1.31.1.1.1.10.1487"
+            }
+          },
+          {
+            "name": "b",
+            "counters": {
+              "traffic_in": "1.3.6.1.2.1.31.1.1.1.6.1488",
+              "traffic_out": "1.3.6.1.2.1.31.1.1.1.10.1488"
+            }
+          },
+          {
+            "name": "c",
+            "counters": {
+              "traffic_in": "1.3.6.1.2.1.31.1.1.1.6.1489",
+              "traffic_out": "1.3.6.1.2.1.31.1.1.1.10.1489"
+            }
+          },
+          {
+            "name": "d",
+            "counters": {
+              "traffic_in": "1.3.6.1.2.1.31.1.1.1.6.760",
+              "traffic_out": "1.3.6.1.2.1.31.1.1.1.10.760"
+            }
+          },
+          {
+            "name": "e",
+            "counters": {
+              "traffic_in": "1.3.6.1.2.1.31.1.1.1.6.796",
+              "traffic_out": "1.3.6.1.2.1.31.1.1.1.10.796"
+            }
           }
-        },
-        {
-          "tag": "b",
-          "counters": {
-            "traffic_in": "1.3.6.1.2.1.31.1.1.1.6.1488",
-            "traffic_out": "1.3.6.1.2.1.31.1.1.1.10.1488"
-          }
-        },
-        {
-          "tag": "c",
-          "counters": {
-            "traffic_in": "1.3.6.1.2.1.31.1.1.1.6.1489",
-            "traffic_out": "1.3.6.1.2.1.31.1.1.1.10.1489"
-          }
-        },
-        {
-          "tag": "d",
-          "counters": {
-            "traffic_in": "1.3.6.1.2.1.31.1.1.1.6.760",
-            "traffic_out": "1.3.6.1.2.1.31.1.1.1.10.760"
-          }
-        },
-        {
-          "tag": "e",
-          "counters": {
-            "traffic_in": "1.3.6.1.2.1.31.1.1.1.6.796",
-            "traffic_out": "1.3.6.1.2.1.31.1.1.1.10.796"
-          }
-        }
-      ]
-    }
+        ]
+      }
+    ]
   },
   {
     "nren": "RoEduNet",
     "isp": "Cogent",
-    "hosts": {
-      "hostname": "149.6.50.10",
-      "community": "dante",
-      "interfaces": [
-        {
-          "tag": "a",
-          "counters": {
-            "traffic_in": "1.3.6.1.2.1.31.1.1.1.6.531",
-            "traffic_out": "1.3.6.1.2.1.31.1.1.1.10.531"
+    "hosts": [
+      {
+        "hostname": "149.6.50.10",
+        "community": "dante",
+        "interfaces": [
+          {
+            "name": "a",
+            "counters": {
+              "traffic_in": "1.3.6.1.2.1.31.1.1.1.6.531",
+              "traffic_out": "1.3.6.1.2.1.31.1.1.1.10.531"
+            }
           }
-        }
-      ]
-    }
+        ]
+      }
+    ]
   },
   {
     "nren": "RoEduNet",
     "isp": "Century Link",
-    "hosts": {
-      "hostname": "212.162.45.194",
-      "community": "dante",
-      "interfaces": [
-        {
-          "tag": "a",
-          "counters": {
-            "traffic_in": "1.3.6.1.2.1.31.1.1.1.6.9",
-            "traffic_out": "1.3.6.1.2.1.31.1.1.1.10.9"
+    "hosts": [
+      {
+        "hostname": "212.162.45.194",
+        "community": "dante",
+        "interfaces": [
+          {
+            "name": "a",
+            "counters": {
+              "traffic_in": "1.3.6.1.2.1.31.1.1.1.6.9",
+              "traffic_out": "1.3.6.1.2.1.31.1.1.1.10.9"
+            }
           }
-        }
-      ]
-    }
+        ]
+      }
+    ]
   },
   {
     "nren": "EENet",
     "isp": "Telia",
-    "hosts": {
-      "hostname": "193.40.133.2",
-      "community": "geant-mon-telia",
-      "interfaces": [
-        {
-          "tag": "a",
-          "counters": {
-            "traffic_in": "1.3.6.1.2.1.31.1.1.1.6.263",
-            "traffic_out": "1.3.6.1.2.1.31.1.1.1.10.263"
+    "hosts": [
+      {
+        "hostname": "193.40.133.2",
+        "community": "geant-mon-telia",
+        "interfaces": [
+          {
+            "name": "a",
+            "counters": {
+              "traffic_in": "1.3.6.1.2.1.31.1.1.1.6.263",
+              "traffic_out": "1.3.6.1.2.1.31.1.1.1.10.263"
+            }
           }
-        }
-      ]
-    }
+        ]
+      }
+    ]
   },
   {
     "nren": "PSNC",
     "isp": "Century Link",
-    "hosts": {
-      "hostname": "212.191.126.7",
-      "community": "atlas1453",
-      "interfaces": [
-        {
-          "tag": "a",
-          "counters": {
-            "traffic_in": "1.3.6.1.2.1.31.1.1.1.6.677",
-            "traffic_out": "1.3.6.1.2.1.31.1.1.1.10.677"
+    "hosts": [
+      {
+        "hostname": "212.191.126.6",
+        "community": "atlas1453",
+        "interfaces": [
+          {
+            "name": "a",
+            "counters": {
+              "traffic_in": "1.3.6.1.2.1.31.1.1.1.6.675",
+              "traffic_out": "1.3.6.1.2.1.31.1.1.1.10.675"
+            }
+          }
+        ]
+      },
+      {
+        "hostname": "212.191.126.7",
+        "community": "atlas1453",
+        "interfaces": [
+          {
+            "name": "a",
+            "counters": {
+              "traffic_in": "1.3.6.1.2.1.31.1.1.1.6.677",
+              "traffic_out": "1.3.6.1.2.1.31.1.1.1.10.677"
+            }
           }
-        }
-      ]
-    }
+        ]
+      }
+    ]
   }
 ]
\ No newline at end of file