Scenario Refactor