Renamed url_mapping to short_url