Add event support