Upgraded queue module