Improve support for groups with multiple targets