Updates to allow targeting of root nodes.