updated enhancement handling for nested bundles