Entity tools polish - round 2