Integrate with entity validator module