Upgraded map cells to use a structure.