make bundles more flexible