Updated to new task states and queue exchanges