Added first implementation of dynamic scenarios