Single class event file & more events