Add support for base paths