Added NP elements to output xml