Added enumerable and made it an emitter