Updated validation of models