Add the possibility to bypass the use of baseUrl