Updating to use more advanced Emitter implementation.