Fixed annotation
XPathConvertor: reorganized code