Added add_indices