Added model validation to 2.0

* The same (where appropriate) level of model validation from 1.2 is present in 2.0