add with_bundles option