Added NER but still tweaking the functionality