Allow newer bundler
Support extract folders