Added AssignedMachine
fixed AssignedMachine