Replace struct + list with array