add support for city field