Make some modifications over pathfinder class