Updated the Event class.
Updating event system