Updates #79 and adds common grouping