Use activity groups with the new structure