Added missing Nullable annotations