#40 added SimulatorMapper