Enhanced Bundler support

all external calls should setup bundler