Updated EntityExtractor