Added support for event hierarchies