Refactored urls