Reverted model validation checks to what they were