Added mute support