added support for different scenario types