Added new fields and made all fields optional