Updates to support detection of non-interactive mode