add xpath support