Added regex and date checks