Added support for base URL