Scenario persistence WIP