add scenarios support