Add subgroup support