Added internal data structures for PathFinder