Improve scenario share