Continued to integrate more model validation (mainly simple constraints)