Updated the Scenario creator