I think this part is not necessary. Extra fields could be left null as long as they are optional.
(or we can just change this later)