Improved infrastructure for fast-rebuilding of parts of the tree