Added @Nonnull to new method