Added correct formats for date fields