Added xml_nsoa support