Change structure to store more data for slicing later.