Added back in TreeWalker logic