Url refactoring