Change structure of match fields.