Adding more robust url mappings
Updating mappings