Minor changes to not assume simulation is stored