Add datetime support