updated model validator