Modification in EventController