Moved scenario building to Scenario class.