added support for groups and project/group assignment