Updated scenarios structure