Added more sort functionality