Added more NER logic