More changes to move to baseurl