Modify emitted events: add template info, refs #2