- WIP: #34 Improve tree node generation