enhanced event handling (default event support)
Update demo example