diff --git a/scripts/geodata/address_formatting/formatter.py b/scripts/geodata/address_formatting/formatter.py
index 16c33515..9a81e7f7 100644
--- a/scripts/geodata/address_formatting/formatter.py
+++ b/scripts/geodata/address_formatting/formatter.py
@@ -65,6 +65,7 @@ class AddressFormatter(object):
     UNIT = 'unit'
     INTERSECTION = 'intersection'
     SUBDIVISION = 'subdivision'
+    METRO_STATION = 'metro_station'
     SUBURB = 'suburb'
     CITY_DISTRICT = 'city_district'
     CITY = 'city'
@@ -91,6 +92,7 @@ class AddressFormatter(object):
         ROAD,
         INTERSECTION,
         SUBDIVISION,
+        METRO_STATION,
         SUBURB,
         CITY,
         CITY_DISTRICT,
@@ -104,6 +106,7 @@ class AddressFormatter(object):
 
     BOUNDARY_COMPONENTS_ORDERED = [
         SUBDIVISION,
+        METRO_STATION,
         SUBURB,
         CITY_DISTRICT,
         CITY,