Added support for subtree