Refactored scenarios