Added options for output modes