Adding in baseurl where appropriate