added support for the date field