Added XPathParser for future use
Synced from master
Synced from master