Updated for date field format