Added SimpleDateFormat for Date fields