[PATCH 00/21] Refactoring conf to use XPath