Updated queues to use a wrapper for the item