[WIP] Changes for group dictization

Upgrade dictization for groups. Fixes #1208.