ToDo update: EventAgregator class