Add xpath lookup