Simulation architecture changes