Updated Group address handling - instead of forcing groups to list of addresses, keep the groups