Updates to the validation logic.