More work on XPath datamodel