Added indexing to new structure.