added entities extraction