Enhanced scenario selecting