Pathfinder performance improvement