Improved and expanded the traversal functionality.