Improve efficency of queueing