Integrate with entity validator module

opened a follow up issue -- #97