Changed the event model