Refactoring to include channel mute support