Added the Bundler logic