Added functionality for events