Improve emitter class