moving fields to maps