Refactored UrlBuilder.