Use field data structure instead of plain vector