Refactor Scenario and Extent