Re-organized actions on Scenario.