Adding root node support