Massive update to allow for deep model validation