Added not null to all field and type defs.