Merge "BaseScenario class added"