Added validate functions