Better Listener management