Add field structure.
Change row to use field data structure.