Add support for different base url paths