metadata: changed the way xpaths and values are stored