Chore/model validation