Changes to BaseWorker