Update for thread-safety of EventDrivenThread