Enhancements for the tree structure