Add output formatting
Add full channels list