Adding sections for sorting and grouping