Switch to better system of managing queues and exchanges