rework dispatcher/stores/task_queue