Adding DateTime support