Update #35 : refactor Queue