improve group support

Reviewer: @poolakiran