Added event-support