Updates to contact model validation