BUG-509: migrate to TreeNodes