Add date set and date sort functionality