Rebase + fix naming change (catalog -> tree)