Add group_check decorator