Got rid of between-thread shared data structure