Added Level index optimizations