Improve validation add date support.