Added support for scenarios.