Update for the worker-boostrap move