Add support for datefields