Change the usage of baseurl