Updated bundler support