Adding more validation checks.