#465 Improve Group handling