Adding bundler support