added some more @NonNull