Tweak to access returned data and events  0.1.1