Refactored. Handled scenario execution