Added EventEmitter