Improve tree integration