tree_collection wrapper improvements