[Refactoring] Scenario refactored to be easier to use.