Added an event emitter