Add Bundler support