Added groups (though Athletic doesn't see them yet), fixed Athletic version constraint.