Update for Index API changes.