Changed structure and selectable terminal output formats