Account for flatter node structure

Accomodate the changes to the tree structure (i.e. handle the altered schema).