Comply with the new output of the NLP. Closes GH-1.