Add Jeffrey Way's model validator