Added changes to index generators.