Updated NER extension