Finish conversion to WorkerQueue