Making FastMatcher a little bit more modular
Add city name matcher