Added support for bundler