improved support for nested bundles