First draft with support for groups