Class for entity extraction added