Wrap the skip-subtree feature