Add in bundler support