Added Checks for Dates/Times