Rework of SimulationSupervisor