Add (non-functional) channel selector
Message grouping by channel functionality