Full NLP support

The last part NLP update is covered in this commit