Improved queue behavior