SSP-2465 Added UrlBuilder
SSP-2465 Fix compilation error