Add the event support