Split contexts into smaller parts, more aligned with bundles