Add subgroup support in header