Changing model verification to work more similarly to the model generation process