Rework tools
Use new LineEmitter (tests must be adapted)