Added support for Scenario

Fixes #106