Adding a=group support