Changing how to validate on date and time