Updates to validation checks