Major changes to the Simulation Framework