Added classes for event types