Changed keys to fields.