Restructure for more data.