Slightly more accurate log message
Refactor module interfaces
Split out #buildGroups
Tests for building groups
Support multi-value keys
Add comment on this matter
Remove TODO section