More Pathfinding Preparation