Added experimental $events support