Refactoring to the changes in workstation+machines merge.