Added verifications in Pathfinder