Added 'term' output mode