initial support for groups added