More progress on data structure.