diff --git a/ecc/input/eccdata.txt b/ecc/input/eccdata.txt
index e78c48b..25797e9 100644
--- a/ecc/input/eccdata.txt
+++ b/ecc/input/eccdata.txt
@@ -839,42 +839,42 @@
   eccs {
     phone_number: "088"
     types: POLICE
-    routing: EMERGENCY
+    routing: NORMAL
   }
   eccs {
     phone_number: "085"
     types: FIRE
-    routing: EMERGENCY
+    routing: NORMAL
   }
   eccs {
     phone_number: "1006"
     types: TYPE_UNSPECIFIED
-    routing: EMERGENCY
+    routing: NORMAL
   }
   eccs {
     phone_number: "061"
     types: TYPE_UNSPECIFIED
-    routing: EMERGENCY
+    routing: NORMAL
   }
   eccs {
     phone_number: "062"
     types: TYPE_UNSPECIFIED
-    routing: EMERGENCY
+    routing: NORMAL
   }
   eccs {
     phone_number: "080"
     types: FIRE
-    routing: EMERGENCY
+    routing: NORMAL
   }
   eccs {
     phone_number: "091"
     types: POLICE
-    routing: EMERGENCY
+    routing: NORMAL
   }
   eccs {
     phone_number: "092"
     types: POLICE
-    routing: EMERGENCY
+    routing: NORMAL
   }
   eccs {
     phone_number: "024"
@@ -2317,6 +2317,77 @@
     types: POLICE
     types: AMBULANCE
     types: FIRE
+    routing: EMERGENCY
+  }
+  eccs {
+    phone_number: "984"
+    types: TYPE_UNSPECIFIED
+    routing: EMERGENCY
+  }
+  eccs {
+    phone_number: "985"
+    types: MOUNTAIN_RESCUE
+    routing: EMERGENCY
+  }
+  eccs {
+    phone_number: "986"
+    types: POLICE
+    routing: EMERGENCY
+  }
+  eccs {
+    phone_number: "997"
+    types: POLICE
+    routing: EMERGENCY
+  }
+  eccs {
+    phone_number: "998"
+    types: FIRE
+    routing: EMERGENCY
+  }
+  eccs {
+    phone_number: "999"
+    types: AMBULANCE
+    routing: EMERGENCY
+  }
+  eccs {
+    phone_number: "991"
+    types: TYPE_UNSPECIFIED
+    routing: EMERGENCY
+  }
+  eccs {
+    phone_number: "992"
+    types: TYPE_UNSPECIFIED
+    routing: EMERGENCY
+  }
+  eccs {
+    phone_number: "993"
+    types: TYPE_UNSPECIFIED
+    routing: EMERGENCY
+  }
+  eccs {
+    phone_number: "994"
+    types: TYPE_UNSPECIFIED
+    routing: EMERGENCY
+  }
+  eccs {
+    phone_number: "995"
+    types: TYPE_UNSPECIFIED
+    routing: EMERGENCY
+  }
+  eccs {
+    phone_number: "996"
+    types: TYPE_UNSPECIFIED
+    routing: EMERGENCY
+  }
+  eccs {
+    phone_number: "987"
+    types: TYPE_UNSPECIFIED
+    routing: EMERGENCY
+  }
+  eccs {
+    phone_number: "989"
+    types: TYPE_UNSPECIFIED
+    routing: EMERGENCY
   }
   ecc_fallback: "112"
 }
diff --git a/ecc/output/eccdata b/ecc/output/eccdata
index 5633c41..324afa7 100644
--- a/ecc/output/eccdata
+++ b/ecc/output/eccdata
Binary files differ