Updates #24 and adds common grouping