Improving SpeakerManager