Scenario refactor