Added the datetime and timestamp handler.