Add support for Datetime fields