Added index builder. Not yet tested.