Update #35 : refactor WorkerManager