Change List to Queue class