Added date checking in headers