Change Some to NotNull