Fixed adding event and list of events