Add date and time support