Further work on WorkerAgent. Some refactoring.