add groups support