Implement explicit scenario choice across package.

Implement explicit scenario choice across package. #918