Added base path option