Added support for base url