Refactored presentation scopes