Simulation setup improvements: