Added date and datetime field support