Removed eventEmitter dependency