Tune entity validation