Refactored worker handling.