MouldAssembly and MachineJobShop modified following the OperatedMachine collapse