Refactor/single queue