improve entity verifier