Add support for baseUrl