Refactor roles scopes