Add date and datetime support