Improve mechanism of selecting scenario change