Optimization. Add QueueWithIndexer