Enhance: Pathfinding