This issue is a follow up of #9 It requires changes in the Event Engine and we still need to find the best way to do it.