Added @NotNull annotations