Moved to custom EventEmitter