Improve event emitter trait