Add NotNull for fields