Updated event handlers to M3 stream events