Improve tree behavior