Renamed CityId to Id