Make it work with baseUrl