Add support for non-interactive mode