Added lots of Named Entity Recognition logic