Added XPathBuilder