- Added grouping support and test cases