Refactor Url mappings