Make new fields optional for backward compatability.