Update for new event listeners, treeId param