Added structure for events