Refactor URL builders