Add Bundler support2