Updated to new GenericTreeNode API