Updated EventThreadGenerator