Small data structure redesign