Added @Nonnull annotations to required parameters