Merge: lib/trees: more services and documentation