Updated TreeUtils