Replace UriBuilder by URI and UriUtils