Redesign resulting data structures