Added Indice Optimization for future plans