Modified how the Emitter chooses the handler to associate a model instance with