[PATCH v2 00/19] Refactoring conf to use XPath