Updated Scenario Builder