Added support for Scenario Expecteds
Added support for Scenario Attributes