Changes for AddEvent