Add EmailValidator and change models.