Further changes to the XPath config files. Not the final version yet.