Added in the missing validations for timeliness