Updated metadata handling
Updated NeXML metadata handling