Updated scopes implementation