ExtractEntities- Port of API changed