adding the channel grouping support