Added date/time support