Groups moved to structs to share the data-space