Add support for cities and latitude/longitude