Added baseDir option