Added better parsing for date