Restructured model validation