changes for xpath support