added support for date fields