Added bundler support