Renamed events. Added a Category property for the alerts.