Worker infrastructure redone