Refactored (scopes)