Added xpath support