Added event support