Refactored town to cityId, type is int instead of String