Added @Nullable annotations