Introducted new event emitter since the previous one was causing memory leaks