More work to implement scopes.