Added no data events to on handler.