Simplification of tree handling