Improve interactive mode.