Add baseurl support