Added support for base path