Add scopes for more efficient controller behaviour