Add support for group-to-group correspondence
Fix bug where ordering of items in groups would not match order written in specification