Added Sorting feature