Feature/prototype

Update Scenario prototype