Update fields to match later versions