Some improvments for Events for TaskRunner