Adding support for all bundles.