Issue #503 Scenario enhancement