adding support for default base directory