VID-1787 Make them all arrays