Added groupWithUsing + unit test