Add xpath support