Reorganized consumer classes
Untested status line consumer