Make cc_group store group id, not name