Added non-interactive mode.