Refactor the RollupEventEmitter and use the new Emitter using generics