Added Filtering and Sorting