Add support for 'add to group' and 'remove from group'