Changed converters to return dates/datetimes