Inital support for groups (not complete yet)