Change XPath query to SonarLibrary API
Add Builder methodes to create Pojo Objects