Refactor: Use a new Field structure to store field data