Added Enums for Emitted events in controllers and services