improve scenario structures