Support for file and output device added.