Add date time support