2.0: improved event management