Update to go through UrlBuilder for everything