add entity validators
Merge branch 'entity-validators'