Adapt to new groups class.