Back to "key groups"

Switching to "tables" would be too complicated.