Work on adding index information