Added support for date field