Work on scenario definition