Improved index queue support