@Nullable and @NotNull additions