Add subtree support