Refactored the bundler