Use a tree instead of separated object lists. WIP