Groups become object and more support code