added extra classes for events, conditions and actions