Refactored URL creation.