Added --extra-paths option to scrub command