Improve comments to say which fields are used in which version