Improve the org model validation