Tree refactoring - less memory consumption, no need for LeanMapper to look for parent nodes