Fix scenario creation and expansion