Added more events for API