Pathfinder class improved for future extension.