Added support for date field parsing