Added support for scenarios