modularizing the index more and more