Add control group support