Switch to bundler