diff --git a/ecc/input/eccdata.txt b/ecc/input/eccdata.txt
index 6988f14..3b860dd 100644
--- a/ecc/input/eccdata.txt
+++ b/ecc/input/eccdata.txt
@@ -114,6 +114,18 @@
     types: AMBULANCE
     types: FIRE
   }
+  eccs {
+    phone_number: "100"
+    types: FIRE
+  }
+  eccs {
+    phone_number: "101"
+    types: POLICE
+  }
+  eccs {
+    phone_number: "107"
+    types: AMBULANCE
+  }
   ecc_fallback: "911"
 }
 countries {
@@ -129,35 +141,35 @@
 countries {
   iso_code: "AT"
   eccs {
-      phone_number: "112"
-      types: POLICE
-      types: AMBULANCE
-      types: FIRE
+    phone_number: "112"
+    types: POLICE
+    types: AMBULANCE
+    types: FIRE
   }
   eccs {
-      phone_number: "122"
-      types: FIRE
-      routing: NORMAL
+    phone_number: "122"
+    types: FIRE
+    routing: NORMAL
   }
   eccs {
-      phone_number: "133"
-      types: POLICE
-      routing: NORMAL
+    phone_number: "133"
+    types: POLICE
+    routing: NORMAL
   }
   eccs {
-      phone_number: "144"
-      types: AMBULANCE
-      routing: NORMAL
+    phone_number: "144"
+    types: AMBULANCE
+    routing: NORMAL
   }
   eccs {
-      phone_number: "128"
-      types: MOUNTAIN_RESCUE
-      routing: NORMAL
+    phone_number: "128"
+    types: MOUNTAIN_RESCUE
+    routing: NORMAL
   }
   eccs {
-      phone_number: "140"
-      types: TYPE_UNSPECIFIED
-      routing: NORMAL
+    phone_number: "140"
+    types: TYPE_UNSPECIFIED
+    routing: NORMAL
   }
   ecc_fallback: "112"
 }
@@ -454,11 +466,11 @@
     types: FIRE
   }
   eccs {
-      phone_number: "112"
-      types: POLICE
-      types: AMBULANCE
-      types: FIRE
-   }
+    phone_number: "112"
+    types: POLICE
+    types: AMBULANCE
+    types: FIRE
+  }
   ecc_fallback: "911"
 }
 countries {
@@ -490,19 +502,19 @@
 countries {
   iso_code: "CH"
   eccs {
-      phone_number: "112"
-      types: POLICE
-      types: AMBULANCE
-      types: FIRE
-      routing: EMERGENCY
+    phone_number: "112"
+    types: POLICE
+    types: AMBULANCE
+    types: FIRE
+    routing: EMERGENCY
   }
   eccs {
-        phone_number: "911"
-        types: POLICE
-        types: AMBULANCE
-        types: FIRE
-        routing: EMERGENCY
-    }
+    phone_number: "911"
+    types: POLICE
+    types: AMBULANCE
+    types: FIRE
+    routing: EMERGENCY
+  }
   eccs {
     phone_number: "117"
     types: POLICE
@@ -519,28 +531,28 @@
     routing: EMERGENCY
   }
   eccs {
-      phone_number: "143"
-      types: TYPE_UNSPECIFIED
-      routing: NORMAL
+    phone_number: "143"
+    types: TYPE_UNSPECIFIED
+    routing: NORMAL
   }
   eccs {
-      phone_number: "145"
-      types: TYPE_UNSPECIFIED
-      routing: NORMAL
+    phone_number: "145"
+    types: TYPE_UNSPECIFIED
+    routing: NORMAL
   }
-   eccs {
-      phone_number: "147"
-      types: TYPE_UNSPECIFIED
-      routing: NORMAL
+  eccs {
+    phone_number: "147"
+    types: TYPE_UNSPECIFIED
+    routing: NORMAL
   }
-   eccs {
-      phone_number: "1414"
-      types: TYPE_UNSPECIFIED
+  eccs {
+    phone_number: "1414"
+    types: TYPE_UNSPECIFIED
   }
-   eccs {
-      phone_number: "0800117117"
-      types: TYPE_UNSPECIFIED
-      routing: NORMAL
+  eccs {
+    phone_number: "0800117117"
+    types: TYPE_UNSPECIFIED
+    routing: NORMAL
   }
   ecc_fallback: "112"
 }
@@ -742,6 +754,7 @@
     types: POLICE
     types: AMBULANCE
     types: FIRE
+    routing: EMERGENCY
   }
   ecc_fallback: "911"
 }
@@ -762,6 +775,12 @@
     types: POLICE
     types: AMBULANCE
     types: FIRE
+    routing: EMERGENCY
+  }
+  eccs {
+    phone_number: "115"
+    types: POLICE
+    routing: NORMAL
   }
   ecc_fallback: "911"
 }
@@ -818,44 +837,49 @@
     routing: EMERGENCY
   }
   eccs {
-      phone_number: "088"
-      types: POLICE
-      routing: EMERGENCY
+    phone_number: "088"
+    types: POLICE
+    routing: EMERGENCY
   }
   eccs {
-      phone_number: "085"
-      types: FIRE
-      routing: EMERGENCY
+    phone_number: "085"
+    types: FIRE
+    routing: EMERGENCY
   }
   eccs {
-      phone_number: "1006"
-      types: TYPE_UNSPECIFIED
-      routing: EMERGENCY
+    phone_number: "1006"
+    types: TYPE_UNSPECIFIED
+    routing: EMERGENCY
   }
   eccs {
-      phone_number: "061"
-      types: TYPE_UNSPECIFIED
-      routing: EMERGENCY
+    phone_number: "061"
+    types: TYPE_UNSPECIFIED
+    routing: EMERGENCY
   }
   eccs {
-      phone_number: "062"
-      types: TYPE_UNSPECIFIED
-      routing: EMERGENCY
+    phone_number: "062"
+    types: TYPE_UNSPECIFIED
+    routing: EMERGENCY
   }
   eccs {
-      phone_number: "080"
-      types: FIRE
-      routing: EMERGENCY
+    phone_number: "080"
+    types: FIRE
+    routing: EMERGENCY
   }
   eccs {
-       phone_number: "091"
-       types: POLICE
-       routing: EMERGENCY
+    phone_number: "091"
+    types: POLICE
+    routing: EMERGENCY
   }
   eccs {
-       phone_number: "092"
-       types: POLICE
-       routing: EMERGENCY
+    phone_number: "092"
+    types: POLICE
+    routing: EMERGENCY
+  }
+  eccs {
+    phone_number: "024"
+    types: TYPE_UNSPECIFIED
+    routing: NORMAL
   }
   ecc_fallback: "112"
 }
@@ -945,7 +969,7 @@
   eccs {
     phone_number: "18"
     types: FIRE
-    routing:NORMAL
+    routing: NORMAL
   }
   eccs {
     phone_number: "115"
@@ -1376,6 +1400,18 @@
     types: AMBULANCE
     types: FIRE
   }
+  eccs {
+    phone_number: "113"
+    types: POLICE
+  }
+  eccs {
+    phone_number: "115"
+    types: FIRE
+  }
+  eccs {
+    phone_number: "118"
+    types: AMBULANCE
+  }
   ecc_fallback: "112"
 }
 countries {
@@ -2358,6 +2394,7 @@
     types: POLICE
     types: AMBULANCE
     types: FIRE
+    routing: EMERGENCY
   }
   ecc_fallback: "911"
 }
@@ -2451,7 +2488,7 @@
     phone_number: "123"
     types: TYPE_UNSPECIFIED
     routing: EMERGENCY
-    }
+  }
   ecc_fallback: "112"
 }
 countries {
@@ -2962,6 +2999,18 @@
     types: AMBULANCE
     types: FIRE
   }
+  eccs {
+    phone_number: "104"
+    types: FIRE
+  }
+  eccs {
+    phone_number: "105"
+    types: AMBULANCE
+  }
+  eccs {
+    phone_number: "106"
+    types: MARINE_GUARD
+  }
   ecc_fallback: "911"
 }
 countries {
diff --git a/ecc/output/eccdata b/ecc/output/eccdata
index 8b4f49b..e34e47b 100644
--- a/ecc/output/eccdata
+++ b/ecc/output/eccdata
Binary files differ