Queue refactor
Queue refactor