Refactor WorkerRole