Should these new fields be defaulted to None?