Updated to use the latest bundler