Added city field to location