Update core API to support network/cluster scopes.