Adding grouping support
Added list vs vector