Switch to custom event emitter2