SimulationFactory updated