Add bundler support