Updated code generation - added NLP stuff