Update grouping interfaces and implementations.