Add date parse and sort