Make groups first-class