Added NotNull attributes