added support for check-groups