Added basic XPath query support