Integrated new event class hierarchy.