Added date time checking