Improved bundles config