Add basic support for bundler