changed design of entity extractor