PLAT-4004 - unfinished SimulationTool changes