Repository: nats-io/nsc
Pull request #524 (2022-11-30 19:25:37)

Correct readme chmod to chown reference
The docker example references chmod but it should be chown.


Patch:
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 3d9f350..77ea49d 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -61,7 +61,7 @@ jobs:
           # We have seen a couple of bugs, so are locking this for now.
           # v1.8.3-pro fixes some issues in brew architecture image variants
           # which led to <https://github.com/nats-io/homebrew-nats-tools/issues/9>
-          version: v1.8.3-pro
+          version: v1.13.1-pro
           args: release --rm-dist
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/README.md b/README.md
index 18c6c1f..6ad6431 100644
--- a/README.md
+++ b/README.md
@@ -66,7 +66,7 @@ docker run --rm -it -v $(pwd)/nsc:/nsc synadia/nats-box:latest
 
 # In case NSC not initialized already:
 nats-box:~# nsc init
-nats-box:~# chmod -R 1000:1000 /nsc
+nats-box:~# chown -R 1000:1000 /nsc
 $ tree -L 2 nsc/
 nsc/
  ├── accounts
diff --git a/cmd/accountcontextparams.go b/cmd/accountcontextparams.go
index bbac753..f785a4c 100644
--- a/cmd/accountcontextparams.go
+++ b/cmd/accountcontextparams.go
@@ -18,7 +18,7 @@ package cmd
 import (
 	"errors"
 
-	"github.com/nats-io/nsc/cmd/store"
+	"github.com/nats-io/nsc/v2/cmd/store"
 
 	"github.com/spf13/cobra"
 )
diff --git a/cmd/action.go b/cmd/action.go
index 4266267..a12c4ef 100644
--- a/cmd/action.go
+++ b/cmd/action.go
@@ -19,7 +19,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/nats-io/nsc/cmd/store"
+	"github.com/nats-io/nsc/v2/cmd/store"
 	"github.com/spf13/cobra"
 )
 
diff --git a/cmd/addaccount.go b/cmd/addaccount.go
index bca28ce..28575a4 100644
--- a/cmd/addaccount.go
+++ b/cmd/addaccount.go
@@ -25,7 +25,7 @@ import (
 	cli "github.com/nats-io/cliprompts/v2"
 	"github.com/nats-io/jwt/v2"
 	"github.com/nats-io/nkeys"
-	"github.com/nats-io/nsc/cmd/store"
+	"github.com/nats-io/nsc/v2/cmd/store"
 	"github.com/spf13/cobra"
 )
 
diff --git a/cmd/addexport.go b/cmd/addexport.go
index 7a36d54..d317101 100644
--- a/cmd/addexport.go
+++ b/cmd/addexport.go
@@ -25,7 +25,7 @@ import (
 	cli "github.com/nats-io/cliprompts/v2"
 	"github.com/nats-io/jwt/v2"
 	"github.com/nats-io/nkeys"
-	"github.com/nats-io/nsc/cmd/store"
+	"github.com/nats-io/nsc/v2/cmd/store"
 	"github.com/spf13/cobra"
 )
 
diff --git a/cmd/addimport.go b/cmd/addimport.go
index cfa4d7c..60fe6fb 100644
--- a/cmd/addimport.go
+++ b/cmd/addimport.go
@@ -25,7 +25,7 @@ import (
 	"github.com/nats-io/nkeys"
 	"github.com/spf13/cobra"
 
-	"github.com/nats-io/nsc/cmd/store"
+	"github.com/nats-io/nsc/v2/cmd/store"
 )
 
 func createAddImportCmd() *cobra.Command {
diff --git a/cmd/addmapping.go b/cmd/addmapping.go
index e7c5d38..0547c86 100644
--- a/cmd/addmapping.go
+++ b/cmd/addmapping.go
@@ -22,7 +22,7 @@ import (
 
 	"github.com/nats-io/jwt/v2"
 	"github.com/nats-io/nkeys"
-	"github.com/nats-io/nsc/cmd/store"
+	"github.com/nats-io/nsc/v2/cmd/store"
 	"github.com/spf13/cobra"
 )
 
diff --git a/cmd/addoperator.go b/cmd/addoperator.go
index 7bbf899..34fffa8 100644
--- a/cmd/addoperator.go
+++ b/cmd/addoperator.go
@@ -23,7 +23,7 @@ import (
 	cli "github.com/nats-io/cliprompts/v2"
 	"github.com/nats-io/jwt/v2"
 	"github.com/nats-io/nkeys"
-	"github.com/nats-io/nsc/cmd/store"
+	"github.com/nats-io/nsc/v2/cmd/store"
 	"github.com/spf13/cobra"
 )
 
diff --git a/cmd/adduser.go b/cmd/adduser.go
index fca8e8e..0db4865 100644
--- a/cmd/adduser.go
+++ b/cmd/adduser.go
@@ -26,7 +26,7 @@ import (
 	cli "github.com/nats-io/cliprompts/v2"
 	"github.com/nats-io/jwt/v2"
 	"github.com/nats-io/nkeys"
-	"github.com/nats-io/nsc/cmd/store"
+	"github.com/nats-io/nsc/v2/cmd/store"
 	"github.com/spf13/cobra"
 )
 
@@ -196,6 +196,9 @@ func validUserSigners(ctx ActionCtx, accName string) ([]string, error) {
 			signers = append(signers, signingKey)
 		}
 	}
+	if opc.StrictSigningKeyUsage && len(ac.SigningKeys) == 0 {
+		return nil, errors.New("operator requires signing keys but account does not have any configured")
+	}
 	return signers, nil
 }
 
diff --git a/cmd/common.go b/cmd/common.go
index abee5ff..042a08e 100644
--- a/cmd/common.go
+++ b/cmd/common.go
@@ -39,7 +39,7 @@ import (
 	"golang.org/x/text/cases"
 	"golang.org/x/text/language"
 
-	"github.com/nats-io/nsc/cmd/store"
+	"github.com/nats-io/nsc/v2/cmd/store"
 )
 
 // ResolvePath resolves a directory/file from an environment variable
diff --git a/cmd/contextconfig.go b/cmd/contextconfig.go
index 081ae6c..a6e566d 100644
--- a/cmd/contextconfig.go
+++ b/cmd/contextconfig.go
@@ -21,7 +21,7 @@ import (
 	"path/filepath"
 	"sort"
 
-	"github.com/nats-io/nsc/cmd/store"
+	"github.com/nats-io/nsc/v2/cmd/store"
 )
 
 type ContextConfig struct {
diff --git a/cmd/defaults.go b/cmd/defaults.go
index 0e79410..ccfcae9 100644
--- a/cmd/defaults.go
+++ b/cmd/defaults.go
@@ -23,12 +23,11 @@ import (
 	"strings"
 	"time"
 
-	"github.com/nats-io/nsc/home"
+	"github.com/nats-io/nsc/v2/cmd/store"
+	"github.com/nats-io/nsc/v2/home"
 
 	"github.com/nats-io/jwt/v2"
 	"github.com/nats-io/nats.go"
-
-	"github.com/nats-io/nsc/cmd/store"
 )
 
 // NscHomeEnv the folder for the config file
diff --git a/cmd/deleteaccount.go b/cmd/deleteaccount.go
index 5615275..3b01c5d 100644
--- a/cmd/deleteaccount.go
+++ b/cmd/deleteaccount.go
@@ -24,7 +24,7 @@ import (
 	cli "github.com/nats-io/cliprompts/v2"
 	"github.com/nats-io/jwt/v2"
 	"github.com/nats-io/nkeys"
-	"github.com/nats-io/nsc/cmd/store"
+	"github.com/nats-io/nsc/v2/cmd/store"
 	"github.com/spf13/cobra"
 )
 
diff --git a/cmd/deleteexport.go b/cmd/deleteexport.go
index 5669b99..89364d5 100644
--- a/cmd/deleteexport.go
+++ b/cmd/deleteexport.go
@@ -21,7 +21,7 @@ import (
 	cli "github.com/nats-io/cliprompts/v2"
 	"github.com/nats-io/jwt/v2"
 	"github.com/nats-io/nkeys"
-	"github.com/nats-io/nsc/cmd/store"
+	"github.com/nats-io/nsc/v2/cmd/store"
 	"github.com/spf13/cobra"
 )
 
diff --git a/cmd/deleteimport.go b/cmd/deleteimport.go
index 6ee29fa..9bf2ca7 100644
--- a/cmd/deleteimport.go
+++ b/cmd/deleteimport.go
@@ -22,7 +22,7 @@ import (
 	cli "github.com/nats-io/cliprompts/v2"
 	"github.com/nats-io/jwt/v2"
 	"github.com/nats-io/nkeys"
-	"github.com/nats-io/nsc/cmd/store"
+	"github.com/nats-io/nsc/v2/cmd/store"
 	"github.com/spf13/cobra"
 )
 
diff --git a/cmd/deletemapping.go b/cmd/deletemapping.go
index c5aa6b3..1609862 100644
--- a/cmd/deletemapping.go
+++ b/cmd/deletemapping.go
@@ -20,7 +20,7 @@ import (
 
 	"github.com/nats-io/jwt/v2"
 	"github.com/nats-io/nkeys"
-	"github.com/nats-io/nsc/cmd/store"
+	"github.com/nats-io/nsc/v2/cmd/store"
 	"github.com/spf13/cobra"
 )
 
diff --git a/cmd/deleteuser.go b/cmd/deleteuser.go
index 0ab78e0..8fd50be 100644
--- a/cmd/deleteuser.go
+++ b/cmd/deleteuser.go
@@ -22,7 +22,7 @@ import (
 
 	cli "github.com/nats-io/cliprompts/v2"
 	"github.com/nats-io/nkeys"
-	"github.com/nats-io/nsc/cmd/store"
+	"github.com/nats-io/nsc/v2/cmd/store"
 	"github.com/spf13/cobra"
 )
 
diff --git a/cmd/describeaccount.go b/cmd/describeaccount.go
index 57079e0..0a25aad 100644
--- a/cmd/describeaccount.go
+++ b/cmd/describeaccount.go
@@ -17,7 +17,7 @@ package cmd
 
 import (
 	"github.com/nats-io/jwt/v2"
-	"github.com/nats-io/nsc/cmd/store"
+	"github.com/nats-io/nsc/v2/cmd/store"
 	"github.com/spf13/cobra"
 )
 
diff --git a/cmd/describejwt.go b/cmd/describejwt.go
index 73cdb8f..6dcd0c1 100644
--- a/cmd/describejwt.go
+++ b/cmd/describejwt.go
@@ -21,7 +21,7 @@ import (
 
 	cli "github.com/nats-io/cliprompts/v2"
 	"github.com/nats-io/jwt/v2"
-	"github.com/nats-io/nsc/cmd/store"
+	"github.com/nats-io/nsc/v2/cmd/store"
 	"github.com/spf13/cobra"
 )
 
@@ -31,7 +31,7 @@ func createDescribeJwtCmd() *cobra.Command {
 		Use:          "jwt",
 		Short:        "Describe a jwt/creds file",
 		Args:         MaxArgs(0),
-		Example:      fmt.Sprintf(`%s describe -f pathorurl`, GetToolName()),
+		Example:      fmt.Sprintf(`%s describe jwt -f pathorurl`, GetToolName()),
 		SilenceUsage: true,
 		RunE: func(cmd *cobra.Command, args []string) error {
 			if err := RunStoreLessAction(cmd, args, &params); err != nil {
diff --git a/cmd/describeoperator.go b/cmd/describeoperator.go
index e743731..69191f2 100644
--- a/cmd/describeoperator.go
+++ b/cmd/describeoperator.go
@@ -20,7 +20,7 @@ import (
 	"fmt"
 
 	"github.com/nats-io/jwt/v2"
-	"github.com/nats-io/nsc/cmd/store"
+	"github.com/nats-io/nsc/v2/cmd/store"
 	"github.com/spf13/cobra"
 )
 
diff --git a/cmd/describer.go b/cmd/describer.go
index eb8288a..1fa8a50 100644
--- a/cmd/describer.go
+++ b/cmd/describer.go
@@ -63,6 +63,17 @@ func (a *AccountDescriber) Describe() string {
 		table.AddSeparator()
 	}
 
+	if len(a.Authorization.AuthUsers) > 0 {
+		AddListValues(table, "Auth Callout Users", a.Authorization.AuthUsers)
+		if len(a.Authorization.AllowedAccounts) > 0 {
+			AddListValues(table, "Allowed Accounts", a.Authorization.AllowedAccounts)
+		}
+		if a.Authorization.XKey != "" {
+			table.AddRow("Encrypt For", a.Authorization.XKey)
+		}
+		table.AddSeparator()
+	}
+
 	addLimitRow := func(table *tablewriter.Table, name string, limit int64, inBytes bool) {
 		if limit > -1 {
 			val := fmt.Sprintf("%d", limit)
diff --git a/cmd/describeuser.go b/cmd/describeuser.go
index 438a731..a31ca43 100644
--- a/cmd/describeuser.go
+++ b/cmd/describeuser.go
@@ -18,7 +18,7 @@ package cmd
 import (
 	"fmt"
 
-	"github.com/nats-io/nsc/cmd/store"
+	"github.com/nats-io/nsc/v2/cmd/store"
 
 	"github.com/nats-io/jwt/v2"
 	"github.com/spf13/cobra"
diff --git a/cmd/editaccount.go b/cmd/editaccount.go
index 9d4382c..250d75c 100644
--- a/cmd/editaccount.go
+++ b/cmd/editaccount.go
@@ -27,7 +27,7 @@ import (
 	"github.com/nats-io/nkeys"
 	"github.com/spf13/cobra"
 
-	"github.com/nats-io/nsc/cmd/store"
+	"github.com/nats-io/nsc/v2/cmd/store"
 )
 
 func validatorUrlOrEmpty() cli.Opt {
@@ -139,6 +139,7 @@ type JetStreamLimitParams struct {
 	DiskMaxStreamBytes NumberParams
 	MaxBytesRequired   bool
 	MaxAckPending      NumberParams
+	hasJSSetParams     bool
 }
 
 type EditAccountParams struct {
@@ -172,7 +173,7 @@ func (p *EditAccountParams) SetDefaults(ctx ActionCtx) error {
 	p.SignerParams.SetDefaults(nkeys.PrefixByteOperator, true, ctx)
 
 	hasDeleteTier := ctx.AnySet("rm-js-tier")
-	hasJsSetFlags := ctx.AnySet("js-tier", "js-mem-storage",
+	p.hasJSSetParams = ctx.AnySet("js-tier", "js-mem-storage",
 		"js-disk-storage",
 		"js-streams",
 		"js-consumer",
@@ -181,7 +182,7 @@ func (p *EditAccountParams) SetDefaults(ctx ActionCtx) error {
 		"js-max-bytes-required",
 		"js-max-ack-pending")
 
-	if hasDeleteTier && hasJsSetFlags {
+	if hasDeleteTier && p.hasJSSetParams {
 		return fmt.Errorf("rm-js-tier is exclusive of all other js options")
 	}
 
@@ -305,12 +306,12 @@ func (p *EditAccountParams) validJsLimitConfig() error {
 	if tiered > 0 && globalIsSet {
 		return fmt.Errorf("configuration cannot contain both global and tiered limits '%s' - please use the --rm-js-tier to remove undesired tier(s)", strings.Join(keys, ","))
 	}
-	// trying to add global to tiered
-	if tiered > 0 && p.Tier == 0 {
+	// trying to add global to tiered (only if js set params have been passed)
+	if tiered > 0 && p.Tier == 0 && p.hasJSSetParams {
 		return fmt.Errorf("cannot set a jetstream global limit when a configuration has tiered limits '%s'", strings.Join(keys, ","))
 	}
 	// trying to add tiered to global
-	if globalIsSet && p.Tier > 0 {
+	if globalIsSet && p.Tier > 0 && p.hasJSSetParams {
 		return errors.New("cannot set a jetstream tier limit when a configuration has a global limit")
 	}
 	return nil
@@ -709,7 +710,7 @@ func (p *EditAccountParams) Run(ctx ActionCtx) (store.Status, error) {
 
 	p.claim.Limits.Payload = p.payload.Int64()
 	if flags.Changed("payload") {
-		r.AddOK("changed max imports to %d", p.claim.Limits.Payload)
+		r.AddOK("changed max payload size to %d", p.claim.Limits.Payload)
 	}
 
 	p.claim.Limits.Subs = p.subscriptions.Int64()
diff --git a/cmd/editauthorization.go b/cmd/editauthorization.go
new file mode 100644
index 0000000..35d3cbc
--- /dev/null
+++ b/cmd/editauthorization.go
@@ -0,0 +1,287 @@
+/*
+ * Copyright 2018-2023 The NATS Authors
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package cmd
+
+import (
+	"errors"
+	"fmt"
+
+	"github.com/nats-io/jwt/v2"
+	"github.com/nats-io/nkeys"
+	"github.com/nats-io/nsc/v2/cmd/store"
+	"github.com/spf13/cobra"
+)
+
+type EditAccountCalloutParams struct {
+	AccountContextParams
+	SignerParams
+	disable           bool
+	AuthUsers         []string
+	AllowedAccounts   []string
+	RmAuthUsers       []string
+	RmAllowedAccounts []string
+	XKey              SigningKeysParams
+	RmXKey            bool
+	claim             *jwt.AccountClaims
+}
+
+func createEditAuthorizationCallout() *cobra.Command {
+	params := &EditAccountCalloutParams{}
+	cmd := &cobra.Command{
+		Use:          "authcallout",
+		Short:        "Edit an account authorization callout",
+		Args:         cobra.MaximumNArgs(1),
+		SilenceUsage: true,
+		RunE: func(cmd *cobra.Command, args []string) error {
+			return RunAction(cmd, args, params)
+		},
+	}
+
+	cmd.Flags().BoolVarP(&params.disable, "disable", "", false, "disable external authorization")
+	cmd.Flags().StringSliceVarP(&params.AuthUsers, "auth-user", "", nil, "adds a user public key that bypasses the authorization callout and is used by the authorization service itself")
+	cmd.Flags().StringSliceVarP(&params.AllowedAccounts, "allowed-account", "", nil, "adds an account public key that the authorization service can bind authorized users to")
+
+	cmd.Flags().StringSliceVarP(&params.RmAuthUsers, "rm-auth-user", "", nil, "removes a user public key that bypasses the authorization callout and is used by the authorization service itself")
+	cmd.Flags().StringSliceVarP(&params.RmAllowedAccounts, "rm-allowed-account", "", nil, "removes an account public key that the authorization service can bind authorized users to")
+	cmd.Flags().BoolVarP(&params.RmXKey, "rm-curve", "", false, "remove curve encryption target")
+	params.XKey.BindFlags("curve", "x", nkeys.PrefixByteCurve, cmd)
+	params.AccountContextParams.BindFlags(cmd)
+
+	return cmd
+}
+
+func init() {
+	editCmd.AddCommand(createEditAuthorizationCallout())
+}
+
+func (p *EditAccountCalloutParams) SetDefaults(ctx ActionCtx) error {
+	p.AccountContextParams.Name = NameFlagOrArgument(p.AccountContextParams.Name, ctx)
+	if err := p.AccountContextParams.SetDefaults(ctx); err != nil {
+		return err
+	}
+
+	p.SignerParams.SetDefaults(nkeys.PrefixByteOperator, true, ctx)
+
+	if ctx.NothingToDo("auth-user", "rm-auth-user", "allowed-account",
+		"rm-allowed-account", "disable", "curve", "rm-curve") {
+		return errors.New("please specify some options")
+	}
+
+	// fail if are given disable and other flags
+	if p.disable && ctx.AnySet("auth-user", "rm-auth-user", "allowed-account",
+		"rm-allowed-account", "curve", "rm-curve") {
+		return errors.New("--disable is exclusive of all other options")
+	}
+
+	return nil
+}
+
+func (p *EditAccountCalloutParams) PreInteractive(_ ActionCtx) error {
+	return nil
+}
+
+func (p *EditAccountCalloutParams) Load(ctx ActionCtx) error {
+	var err error
+
+	if err = p.AccountContextParams.Validate(ctx); err != nil {
+		return err
+	}
+
+	p.claim, err = ctx.StoreCtx().Store.ReadAccountClaim(p.AccountContextParams.Name)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func (p *EditAccountCalloutParams) PostInteractive(_ ActionCtx) error {
+	return nil
+}
+
+// toPublicKey resolves the public and checks the key for proper type
+func toPublicKey(s string, kind nkeys.PrefixByte) (string, error) {
+	kp, err := store.ResolveKey(s)
+	if err != nil {
+		return "", err
+	}
+	if kp == nil {
+		return "", fmt.Errorf("%q is not a valid %s key", s, kind)
+	}
+	if err := nkeys.CompatibleKeyPair(kp, kind); err != nil {
+		return "", fmt.Errorf("%q is not a valid %s key", s, kind)
+	}
+	return kp.PublicKey()
+}
+
+func (p *EditAccountCalloutParams) Validate(ctx ActionCtx) error {
+	var err error
+
+	if err := p.SignerParams.ResolveWithPriority(ctx, p.claim.Issuer); err != nil {
+		return err
+	}
+
+	if p.disable {
+		return nil
+	}
+
+	if ctx.AnySet("curve") {
+		if err := p.XKey.Valid(); err != nil {
+			return err
+		}
+	}
+
+	for idx, k := range p.AuthUsers {
+		p.AuthUsers[idx], err = toPublicKey(k, nkeys.PrefixByteUser)
+		if err != nil {
+			return err
+		}
+	}
+
+	for idx, k := range p.RmAuthUsers {
+		p.RmAuthUsers[idx], err = toPublicKey(k, nkeys.PrefixByteUser)
+		if err != nil {
+			return err
+		}
+	}
+
+	for idx, k := range p.AllowedAccounts {
+		p.AllowedAccounts[idx], err = toPublicKey(k, nkeys.PrefixByteAccount)
+		if err != nil {
+			return err
+		}
+	}
+
+	for idx, k := range p.RmAllowedAccounts {
+		p.RmAllowedAccounts[idx], err = toPublicKey(k, nkeys.PrefixByteAccount)
+		if err != nil {
+			return err
+		}
+	}
+
+	return nil
+}
+
+func report(list jwt.StringList, toAdd []string, hasMsgT string, missingMsgT string) []string {
+	var r = make([]string, len(toAdd))
+	for idx, v := range toAdd {
+		if list.Contains(v) {
+			r[idx] = fmt.Sprintf(hasMsgT, v)
+		} else {
+			r[idx] = fmt.Sprintf(missingMsgT, v)
+		}
+	}
+	return r
+}
+
+func (p *EditAccountCalloutParams) Run(ctx ActionCtx) (store.Status, error) {
+	var userReport []string
+	var userRmReport []string
+	var accountReport []string
+	var accountRmReport []string
+	var curveReport []string
+
+	if !p.disable {
+		userReport = report(p.claim.Account.Authorization.AuthUsers,
+			p.AuthUsers,
+			"skipped adding user %q - as it's already set",
+			"added user %q")
+
+		p.claim.Account.Authorization.AuthUsers.Add(p.AuthUsers...)
+		accountReport = report(p.claim.Account.Authorization.AllowedAccounts,
+			p.AllowedAccounts,
+			"skipped adding account %q - as it's already set",
+			"added account %q")
+		p.claim.Account.Authorization.AllowedAccounts.Add(p.AllowedAccounts...)
+
+		userRmReport = report(p.claim.Account.Authorization.AuthUsers,
+			p.RmAuthUsers,
+			"deleted user %q",
+			"skipping user %q - as it's not currently set")
+		p.claim.Authorization.AuthUsers.Remove(p.RmAuthUsers...)
+
+		accountRmReport = report(p.claim.Account.Authorization.AllowedAccounts,
+			p.RmAllowedAccounts,
+			"deleted account %q",
+			"skipping account %q - as it's not currently set")
+		p.claim.Account.Authorization.AllowedAccounts.Remove(p.RmAllowedAccounts...)
+
+		if p.RmXKey {
+			old := p.claim.Account.Authorization.XKey
+			if old != "" {
+				p.claim.Account.Authorization.XKey = ""
+				curveReport = append(curveReport, fmt.Sprintf("removed %s curve key", old))
+			} else {
+				curveReport = append(curveReport, "remove curve key didn't do anything as the curve key was not set")
+			}
+		}
+
+		if ctx.AnySet("curve") {
+			ckeys, err := p.XKey.PublicKeys()
+			if err != nil {
+				return nil, err
+			}
+			if len(ckeys) > 1 {
+				return nil, errors.New("only one curve key can be specified")
+			}
+			p.claim.Authorization.XKey = ckeys[0]
+			curveReport = append(curveReport, fmt.Sprintf("set curve key %s", ckeys[0]))
+		}
+
+	} else {
+		p.claim.Account.Authorization = jwt.ExternalAuthorization{}
+	}
+
+	// validate before we store it
+	var vr jwt.ValidationResults
+	p.claim.Validate(&vr)
+	errs := vr.Errors()
+	if len(errs) > 0 {
+		return nil, errs[0]
+	}
+
+	// encode and report
+	token, err := p.claim.Encode(p.signerKP)
+	if err != nil {
+		return nil, err
+	}
+
+	r := store.NewDetailedReport(false)
+	StoreAccountAndUpdateStatus(ctx, token, r)
+	if r.HasNoErrors() {
+		for _, v := range userReport {
+			r.AddOK(v)
+		}
+		for _, v := range userRmReport {
+			r.AddOK(v)
+		}
+		for _, v := range accountReport {
+			r.AddOK(v)
+		}
+		for _, v := range accountRmReport {
+			r.AddOK(v)
+		}
+
+		for _, v := range curveReport {
+			r.AddOK(v)
+		}
+
+		if p.disable {
+			r.AddOK("removed external authorization configuration")
+		}
+	}
+	return r, err
+}
diff --git a/cmd/editexport.go b/cmd/editexport.go
index 09e780e..d271444 100644
--- a/cmd/editexport.go
+++ b/cmd/editexport.go
@@ -23,7 +23,7 @@ import (
 	cli "github.com/nats-io/cliprompts/v2"
 	"github.com/nats-io/jwt/v2"
 	"github.com/nats-io/nkeys"
-	"github.com/nats-io/nsc/cmd/store"
+	"github.com/nats-io/nsc/v2/cmd/store"
 	"github.com/spf13/cobra"
 )
 
diff --git a/cmd/editoperator.go b/cmd/editoperator.go
index a9a2220..2cd3277 100644
--- a/cmd/editoperator.go
+++ b/cmd/editoperator.go
@@ -22,7 +22,7 @@ import (
 	cli "github.com/nats-io/cliprompts/v2"
 	"github.com/nats-io/jwt/v2"
 	"github.com/nats-io/nkeys"
-	"github.com/nats-io/nsc/cmd/store"
+	"github.com/nats-io/nsc/v2/cmd/store"
 	"github.com/spf13/cobra"
 )
 
diff --git a/cmd/editscopedsk.go b/cmd/editscopedsk.go
index f099e7d..d9ba332 100644
--- a/cmd/editscopedsk.go
+++ b/cmd/editscopedsk.go
@@ -20,7 +20,7 @@ import (
 
 	"github.com/nats-io/jwt/v2"
 	"github.com/nats-io/nkeys"
-	"github.com/nats-io/nsc/cmd/store"
+	"github.com/nats-io/nsc/v2/cmd/store"
 	"github.com/spf13/cobra"
 )
 
diff --git a/cmd/edituser.go b/cmd/edituser.go
index 0437442..24c3170 100644
--- a/cmd/edituser.go
+++ b/cmd/edituser.go
@@ -23,7 +23,7 @@ import (
 
 	"github.com/nats-io/jwt/v2"
 	"github.com/nats-io/nkeys"
-	"github.com/nats-io/nsc/cmd/store"
+	"github.com/nats-io/nsc/v2/cmd/store"
 	"github.com/spf13/cobra"
 )
 
diff --git a/cmd/env.go b/cmd/env.go
index c853eec..7778329 100644
--- a/cmd/env.go
+++ b/cmd/env.go
@@ -19,9 +19,9 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/nats-io/nsc/home"
+	"github.com/nats-io/nsc/v2/cmd/store"
+	"github.com/nats-io/nsc/v2/home"
 
-	"github.com/nats-io/nsc/cmd/store"
 	"github.com/spf13/cobra"
 	"github.com/xlab/tablewriter"
 )
diff --git a/cmd/exportkeys.go b/cmd/exportkeys.go
index 38494ed..98daae6 100644
--- a/cmd/exportkeys.go
+++ b/cmd/exportkeys.go
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2019 The NATS Authors
+ * Copyright 2018-2022 The NATS Authors
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -23,7 +23,7 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"github.com/nats-io/nsc/cmd/store"
+	"github.com/nats-io/nsc/v2/cmd/store"
 )
 
 func createExportKeysCmd() *cobra.Command {
@@ -67,8 +67,10 @@ nsc export keys --account <name> (changes the account context to the specified a
 	cmd.Flags().BoolVarP(&params.Operator, "operator", "o", false, "export operator keys")
 	cmd.Flags().BoolVarP(&params.Accounts, "accounts", "a", false, "export account keys")
 	cmd.Flags().BoolVarP(&params.Users, "users", "u", false, "export user keys")
+	cmd.Flags().BoolVarP(&params.Curves, "curves", "", false, "export curve keys")
 	cmd.Flags().StringVarP(&params.Account, "account", "", "", "change account context to the named account")
 	cmd.Flags().StringVarP(&params.User, "user", "", "", "export specified user key")
+	cmd.Flags().StringVarP(&params.Curve, "curve", "", "", "export specified curve key")
 	cmd.Flags().BoolVarP(&params.All, "all", "A", false, "export operator, accounts and users keys")
 	cmd.Flags().StringVarP(&params.Filter, "filter", "f", "", "export keys containing string")
 	cmd.Flags().BoolVarP(&params.Unreferenced, "not-referenced", "", false, "export keys that are not referenced in the current operator context")
diff --git a/cmd/fixenv.go b/cmd/fixenv.go
index 4a047b6..171e0fa 100644
--- a/cmd/fixenv.go
+++ b/cmd/fixenv.go
@@ -26,7 +26,7 @@ import (
 	"github.com/nats-io/nuid"
 	"github.com/spf13/cobra"
 
-	"github.com/nats-io/nsc/cmd/store"
+	"github.com/nats-io/nsc/v2/cmd/store"
 )
 
 func init() {
diff --git a/cmd/friendlynamecollector.go b/cmd/friendlynamecollector.go
index d751f0b..56ce9b6 100644
--- a/cmd/friendlynamecollector.go
+++ b/cmd/friendlynamecollector.go
@@ -18,7 +18,7 @@ package cmd
 import (
 	"fmt"
 
-	"github.com/nats-io/nsc/cmd/store"
+	"github.com/nats-io/nsc/v2/cmd/store"
 )
 
 // NewFriendlyNameCollector returns a map of public keys to
diff --git a/cmd/generateactivation.go b/cmd/generateactivation.go
index ad05b0d..feb14e1 100644
--- a/cmd/generateactivation.go
+++ b/cmd/generateactivation.go
@@ -24,7 +24,7 @@ import (
 	cli "github.com/nats-io/cliprompts/v2"
 	"github.com/nats-io/jwt/v2"
 	"github.com/nats-io/nkeys"
-	"github.com/nats-io/nsc/cmd/store"
+	"github.com/nats-io/nsc/v2/cmd/store"
 	"github.com/spf13/cobra"
 )
 
diff --git a/cmd/generatecreds.go b/cmd/generatecreds.go
index 6986a9c..5c2e623 100644
--- a/cmd/generatecreds.go
+++ b/cmd/generatecreds.go
@@ -22,7 +22,7 @@ import (
 	"github.com/nats-io/jwt/v2"
 
 	"github.com/nats-io/nkeys"
-	"github.com/nats-io/nsc/cmd/store"
+	"github.com/nats-io/nsc/v2/cmd/store"
 	"github.com/spf13/cobra"
 )
 
diff --git a/cmd/generatediagram.go b/cmd/generatediagram.go
index 52eb7a8..0be20cc 100644
--- a/cmd/generatediagram.go
+++ b/cmd/generatediagram.go
@@ -23,7 +23,7 @@ import (
 
 	cli "github.com/nats-io/cliprompts/v2"
 	"github.com/nats-io/jwt/v2"
-	"github.com/nats-io/nsc/cmd/store"
+	"github.com/nats-io/nsc/v2/cmd/store"
 	"github.com/spf13/cobra"
 )
 
diff --git a/cmd/generatenkey.go b/cmd/generatenkey.go
index 8343cd9..ae753c7 100644
--- a/cmd/generatenkey.go
+++ b/cmd/generatenkey.go
@@ -19,7 +19,7 @@ import (
 	"fmt"
 
 	"github.com/nats-io/nkeys"
-	"github.com/nats-io/nsc/cmd/store"
+	"github.com/nats-io/nsc/v2/cmd/store"
 	"github.com/spf13/cobra"
 )
 
@@ -28,6 +28,7 @@ func createGenerateNKeyCmd() *cobra.Command {
 	params.operator.prefix = nkeys.PrefixByteOperator
 	params.account.prefix = nkeys.PrefixByteAccount
 	params.user.prefix = nkeys.PrefixByteUser
+	params.curve.prefix = nkeys.PrefixByteCurve
 
 	cmd := &cobra.Command{
 		Use:   "nkey",
@@ -39,6 +40,7 @@ func createGenerateNKeyCmd() *cobra.Command {
 	cmd.Flags().BoolVarP(&params.operator.generate, "operator", "o", false, "operator")
 	cmd.Flags().BoolVarP(&params.account.generate, "account", "a", false, "account")
 	cmd.Flags().BoolVarP(&params.user.generate, "user", "u", false, "user")
+	cmd.Flags().BoolVarP(&params.curve.generate, "curve", "x", false, "curve")
 	cmd.Flags().BoolVarP(&params.store, "store", "S", false, "store in the keystore")
 
 	return cmd
@@ -52,6 +54,7 @@ type GenerateNKeysParam struct {
 	operator KP
 	account  KP
 	user     KP
+	curve    KP
 	store    bool
 }
 
@@ -70,6 +73,8 @@ func (e *KP) kind() string {
 		return "account"
 	case nkeys.PrefixByteUser:
 		return "user"
+	case nkeys.PrefixByteCurve:
+		return "curve"
 	}
 	return ""
 }
@@ -110,8 +115,8 @@ func (e *KP) String(pubOnly bool) string {
 }
 
 func (p *GenerateNKeysParam) SetDefaults(ctx ActionCtx) error {
-	if !ctx.AnySet("operator", "account", "user") {
-		return fmt.Errorf("set --operator, --account, or --user")
+	if !ctx.AnySet("operator", "account", "user", "curve") {
+		return fmt.Errorf("set --operator, --account, --user, or --curve")
 	}
 	return nil
 }
@@ -135,7 +140,7 @@ func (p *GenerateNKeysParam) Validate(ctx ActionCtx) error {
 func (p *GenerateNKeysParam) Run(ctx ActionCtx) (store.Status, error) {
 	var err error
 	var jobs []*KP
-	jobs = append(jobs, &p.operator, &p.account, &p.user)
+	jobs = append(jobs, &p.operator, &p.account, &p.user, &p.curve)
 	for _, j := range jobs {
 		if j.generate {
 			if err := j.Generate(); err != nil {
diff --git a/cmd/generateprofile.go b/cmd/generateprofile.go
index 1a81acc..662e9e8 100644
--- a/cmd/generateprofile.go
+++ b/cmd/generateprofile.go
@@ -27,7 +27,7 @@ import (
 	"github.com/nats-io/jwt/v2"
 	"github.com/spf13/cobra"
 
-	"github.com/nats-io/nsc/cmd/store"
+	"github.com/nats-io/nsc/v2/cmd/store"
 )
 
 func createProfileCmd() *cobra.Command {
diff --git a/cmd/generateserverconfig.go b/cmd/generateserverconfig.go
index bc00f6a..2445733 100644
--- a/cmd/generateserverconfig.go
+++ b/cmd/generateserverconfig.go
@@ -22,7 +22,7 @@ import (
 	"path/filepath"
 
 	"github.com/nats-io/nkeys"
-	"github.com/nats-io/nsc/cmd/store"
+	"github.com/nats-io/nsc/v2/cmd/store"
 	"github.com/spf13/cobra"
 )
 
diff --git a/cmd/genericclaimparams.go b/cmd/genericclaimparams.go
index d893664..d9ed387 100644
--- a/cmd/genericclaimparams.go
+++ b/cmd/genericclaimparams.go
@@ -24,7 +24,7 @@ import (
 
 	cli "github.com/nats-io/cliprompts/v2"
 	"github.com/nats-io/jwt/v2"
-	"github.com/nats-io/nsc/cmd/store"
+	"github.com/nats-io/nsc/v2/cmd/store"
 )
 
 // GenericClaimsParams - TimeParams and tags
diff --git a/cmd/importaccount.go b/cmd/importaccount.go
index 5f43df7..b7ff6d1 100644
--- a/cmd/importaccount.go
+++ b/cmd/importaccount.go
@@ -23,7 +23,7 @@ import (
 
 	"github.com/nats-io/jwt/v2"
 	"github.com/nats-io/nkeys"
-	"github.com/nats-io/nsc/cmd/store"
+	"github.com/nats-io/nsc/v2/cmd/store"
 	"github.com/spf13/cobra"
 )
 
diff --git a/cmd/importcollector.go b/cmd/importcollector.go
index 2ee4a48..797bf17 100644
--- a/cmd/importcollector.go
+++ b/cmd/importcollector.go
@@ -21,7 +21,7 @@ import (
 	"sort"
 
 	"github.com/nats-io/jwt/v2"
-	"github.com/nats-io/nsc/cmd/store"
+	"github.com/nats-io/nsc/v2/cmd/store"
 )
 
 type AccountExport struct {
diff --git a/cmd/importkeys.go b/cmd/importkeys.go
index ace1dea..a9573c8 100644
--- a/cmd/importkeys.go
+++ b/cmd/importkeys.go
@@ -22,7 +22,7 @@ import (
 	"path/filepath"
 
 	"github.com/nats-io/nkeys"
-	"github.com/nats-io/nsc/cmd/store"
+	"github.com/nats-io/nsc/v2/cmd/store"
 	"github.com/spf13/cobra"
 )
 
diff --git a/cmd/importuser.go b/cmd/importuser.go
index f07ccd9..78a6e4b 100644
--- a/cmd/importuser.go
+++ b/cmd/importuser.go
@@ -23,7 +23,7 @@ import (
 	"github.com/nats-io/nkeys"
 	"github.com/spf13/cobra"
 
-	"github.com/nats-io/nsc/cmd/store"
+	"github.com/nats-io/nsc/v2/cmd/store"
 )
 
 func createImportUserCmd() *cobra.Command {
diff --git a/cmd/init.go b/cmd/init.go
index 395024a..111c617 100644
--- a/cmd/init.go
+++ b/cmd/init.go
@@ -20,12 +20,13 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/nats-io/nsc/home"
+	"github.com/nats-io/nsc/v2/cmd/store"
+	"github.com/nats-io/nsc/v2/home"
 
 	cli "github.com/nats-io/cliprompts/v2"
 	"github.com/nats-io/jwt/v2"
 	"github.com/nats-io/nkeys"
-	"github.com/nats-io/nsc/cmd/store"
+
 	"github.com/spf13/cobra"
 )
 
diff --git a/cmd/keycollector.go b/cmd/keycollector.go
index 03457ff..05e08f8 100644
--- a/cmd/keycollector.go
+++ b/cmd/keycollector.go
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2019 The NATS Authors
+ * Copyright 2018-2022 The NATS Authors
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -16,28 +16,31 @@
 package cmd
 
 import (
+	"fmt"
 	"sort"
 	"strings"
 
 	"github.com/nats-io/nkeys"
-	"github.com/nats-io/nsc/cmd/store"
+	"github.com/nats-io/nsc/v2/cmd/store"
 )
 
 type KeyCollectorParams struct {
 	Operator     bool
 	Accounts     bool
 	Users        bool
+	Curves       bool
 	All          bool
 	Unreferenced bool
 	Account      string
 	User         string
+	Curve        string
 	Filter       string
 }
 
 func (p *KeyCollectorParams) SetDefaults(ctx ActionCtx) error {
 	conf := GetConfig()
 
-	if ctx.NothingToDo("operator", "accounts", "users", "all") {
+	if ctx.NothingToDo("operator", "accounts", "users", "curve", "all") {
 		// default if no args
 		account := p.Account
 		if account == "" {
@@ -46,12 +49,14 @@ func (p *KeyCollectorParams) SetDefaults(ctx ActionCtx) error {
 		p.Operator = true
 		p.Account = account
 		p.Accounts = true
+		p.Curves = true
 		p.Users = true
 	}
 	if p.All {
 		p.Operator = true
 		p.Accounts = true
 		p.Users = true
+		p.Curves = true
 	}
 	return nil
 }
@@ -114,6 +119,14 @@ func (p *KeyCollectorParams) handleAccount(ctx ActionCtx, parent string, name st
 		ask.Resolve(ks)
 		keys = append(keys, &ask)
 	}
+	if ac.Authorization.XKey != "" {
+		var ask Key
+		ask.Name = fmt.Sprintf(ac.Name)
+		ask.Pub = ac.Authorization.XKey
+		ask.Curve = true
+		ask.Resolve(ks)
+		keys = append(keys, &ask)
+	}
 	return keys, nil
 }
 
@@ -212,6 +225,7 @@ func (p *KeyCollectorParams) Run(ctx ActionCtx) (KeyList, error) {
 		var okeys KeyList
 		var akeys KeyList
 		var ukeys KeyList
+		var ckeys KeyList
 		for _, v := range all {
 			_, ok := m[v]
 			if !ok {
@@ -230,16 +244,20 @@ func (p *KeyCollectorParams) Run(ctx ActionCtx) (KeyList, error) {
 					akeys = append(akeys, &k)
 				case nkeys.PrefixByteUser:
 					ukeys = append(ukeys, &k)
+				case nkeys.PrefixByteCurve:
+					ckeys = append(ckeys, &k)
 				}
 			}
 		}
 		sort.Sort(okeys)
 		sort.Sort(akeys)
 		sort.Sort(ukeys)
+		sort.Sort(ckeys)
 		keys = KeyList{}
 		keys = append(keys, okeys...)
 		keys = append(keys, akeys...)
 		keys = append(keys, ukeys...)
+		keys = append(keys, ckeys...)
 	}
 
 	var keyFilter = strings.ToUpper(p.Filter)
@@ -269,6 +287,7 @@ type Key struct {
 	Parent       string
 	ExpectedKind nkeys.PrefixByte
 	Signing      bool
+	Curve        bool
 	KeyPath      string
 	Invalid      bool
 }
diff --git a/cmd/keys.go b/cmd/keys.go
index 508efc1..ec95444 100644
--- a/cmd/keys.go
+++ b/cmd/keys.go
@@ -16,7 +16,7 @@
 package cmd
 
 import (
-	"github.com/nats-io/nsc/cmd/store"
+	"github.com/nats-io/nsc/v2/cmd/store"
 	"github.com/spf13/cobra"
 )
 
diff --git a/cmd/list.go b/cmd/list.go
index e1a081c..7c10252 100644
--- a/cmd/list.go
+++ b/cmd/list.go
@@ -22,7 +22,7 @@ import (
 
 	cli "github.com/nats-io/cliprompts/v2"
 	"github.com/nats-io/jwt/v2"
-	"github.com/nats-io/nsc/cmd/store"
+	"github.com/nats-io/nsc/v2/cmd/store"
 	"github.com/spf13/cobra"
 	"github.com/xlab/tablewriter"
 )
diff --git a/cmd/listkeys.go b/cmd/listkeys.go
index 82f189d..e3e4b2f 100644
--- a/cmd/listkeys.go
+++ b/cmd/listkeys.go
@@ -21,7 +21,7 @@ import (
 	"os"
 
 	"github.com/nats-io/nkeys"
-	"github.com/nats-io/nsc/cmd/store"
+	"github.com/nats-io/nsc/v2/cmd/store"
 	"github.com/spf13/cobra"
 	"github.com/xlab/tablewriter"
 )
@@ -65,6 +65,7 @@ nsc list keys --account A (changes the account context to the specified account)
 	cmd.Flags().BoolVarP(&params.Operator, "operator", "o", false, "show operator keys")
 	cmd.Flags().BoolVarP(&params.Accounts, "accounts", "a", false, "show account keys")
 	cmd.Flags().BoolVarP(&params.Users, "users", "u", false, "show user keys")
+	cmd.Flags().BoolVarP(&params.Users, "curve", "x", false, "show curve keys")
 	cmd.Flags().StringVarP(&params.Account, "account", "", "", "show specified account keys")
 	cmd.Flags().StringVarP(&params.User, "user", "", "", "show specified user key")
 	cmd.Flags().BoolVarP(&params.All, "all", "A", false, "show operator, accounts and users")
@@ -147,6 +148,9 @@ func (p *ListKeysParams) Report(ks Keys) string {
 		if k.Signing {
 			sk = "*"
 		}
+		if k.Curve {
+			sk = "T"
+		}
 		stored := ""
 		if k.HasKey() {
 			stored = "*"
@@ -170,6 +174,7 @@ func (p *ListKeysParams) Report(ks Keys) string {
 	if hasUnreferenced {
 		s = fmt.Sprintf("%s[?] unreferenced key - may belong to a different operator context", s)
 	}
+	s = fmt.Sprintf("%s[ T ] auth callout encryption target\n", s)
 	return s
 }
 
@@ -182,6 +187,9 @@ func (p *ListKeysParams) ReportSeeds(ks Keys) string {
 		if k.Signing {
 			sk = "*"
 		}
+		if k.Curve {
+			sk = "T"
+		}
 
 		pad := ""
 		switch k.ExpectedKind {
@@ -208,5 +216,6 @@ func (p *ListKeysParams) ReportSeeds(ks Keys) string {
 	s := table.Render()
 	s = fmt.Sprintf("%s[ ! ] seed is not stored\n", s)
 	s = fmt.Sprintf("%s[ERR] error reading seed\n", s)
+	s = fmt.Sprintf("%s[ T ] auth callout encryption target\n", s)
 	return s
 }
diff --git a/cmd/load.go b/cmd/load.go
index 9e6870a..b08d3a8 100644
--- a/cmd/load.go
+++ b/cmd/load.go
@@ -19,11 +19,13 @@ import (
 	"os"
 	"strings"
 
+	"github.com/nats-io/nsc/v2/cmd/store"
+	"github.com/nats-io/nsc/v2/home"
+
 	"github.com/nats-io/jsm.go/natscontext"
 	"github.com/nats-io/jwt/v2"
 	"github.com/nats-io/nkeys"
-	"github.com/nats-io/nsc/cmd/store"
-	"github.com/nats-io/nsc/home"
+
 	"github.com/spf13/cobra"
 )
 
diff --git a/cmd/memresolverconfigbuilder.go b/cmd/memresolverconfigbuilder.go
index 85c1507..47b1bed 100644
--- a/cmd/memresolverconfigbuilder.go
+++ b/cmd/memresolverconfigbuilder.go
@@ -25,7 +25,7 @@ import (
 
 	"github.com/nats-io/jwt/v2"
 
-	"github.com/nats-io/nsc/cmd/store"
+	"github.com/nats-io/nsc/v2/cmd/store"
 )
 
 type MemResolverConfigBuilder struct {
diff --git a/cmd/migrate.go b/cmd/migrate.go
index 96a3225..05259cf 100644
--- a/cmd/migrate.go
+++ b/cmd/migrate.go
@@ -26,7 +26,7 @@ import (
 	"github.com/nats-io/nkeys"
 	"github.com/spf13/cobra"
 
-	"github.com/nats-io/nsc/cmd/store"
+	"github.com/nats-io/nsc/v2/cmd/store"
 )
 
 func createMigrateCmd() *cobra.Command {
diff --git a/cmd/pubkeyparams.go b/cmd/pubkeyparams.go
index e9c967a..9b390a7 100644
--- a/cmd/pubkeyparams.go
+++ b/cmd/pubkeyparams.go
@@ -21,7 +21,7 @@ import (
 	cli "github.com/nats-io/cliprompts/v2"
 	"github.com/nats-io/jwt"
 	"github.com/nats-io/nkeys"
-	"github.com/nats-io/nsc/cmd/store"
+	"github.com/nats-io/nsc/v2/cmd/store"
 	"github.com/spf13/cobra"
 )
 
diff --git a/cmd/pubtool.go b/cmd/pubtool.go
index caa195f..bdc0aff 100644
--- a/cmd/pubtool.go
+++ b/cmd/pubtool.go
@@ -20,9 +20,10 @@ import (
 	"os"
 	"strings"
 
-	"github.com/nats-io/nsc/cmd/store"
+	"github.com/nats-io/nsc/v2/cmd/store"
 
 	nats "github.com/nats-io/nats.go"
+
 	"github.com/spf13/cobra"
 )
 
diff --git a/cmd/pull.go b/cmd/pull.go
index 6d70437..0d72c1b 100644
--- a/cmd/pull.go
+++ b/cmd/pull.go
@@ -25,7 +25,7 @@ import (
 	cli "github.com/nats-io/cliprompts/v2"
 	"github.com/nats-io/jwt/v2"
 	"github.com/nats-io/nats.go"
-	"github.com/nats-io/nsc/cmd/store"
+	"github.com/nats-io/nsc/v2/cmd/store"
 	"github.com/spf13/cobra"
 )
 
diff --git a/cmd/push.go b/cmd/push.go
index 9ed8227..7fa4220 100644
--- a/cmd/push.go
+++ b/cmd/push.go
@@ -30,7 +30,7 @@ import (
 	"github.com/nats-io/nats.go"
 	"github.com/spf13/cobra"
 
-	"github.com/nats-io/nsc/cmd/store"
+	"github.com/nats-io/nsc/v2/cmd/store"
 )
 
 func createPushCmd() *cobra.Command {
diff --git a/cmd/reissueoperator.go b/cmd/reissueoperator.go
index 5330109..ff7c867 100644
--- a/cmd/reissueoperator.go
+++ b/cmd/reissueoperator.go
@@ -19,7 +19,7 @@ import (
 	"fmt"
 
 	"github.com/nats-io/nkeys"
-	"github.com/nats-io/nsc/cmd/store"
+	"github.com/nats-io/nsc/v2/cmd/store"
 	"github.com/spf13/cobra"
 )
 
diff --git a/cmd/rename.go b/cmd/rename.go
index 8009de0..a7d3007 100644
--- a/cmd/rename.go
+++ b/cmd/rename.go
@@ -23,7 +23,7 @@ import (
 	"github.com/nats-io/nkeys"
 
 	"github.com/nats-io/jwt/v2"
-	"github.com/nats-io/nsc/cmd/store"
+	"github.com/nats-io/nsc/v2/cmd/store"
 	"github.com/spf13/cobra"
 )
 
diff --git a/cmd/replytool.go b/cmd/replytool.go
index 5ed9360..1e2dc4a 100644
--- a/cmd/replytool.go
+++ b/cmd/replytool.go
@@ -22,9 +22,10 @@ import (
 	"strings"
 	"time"
 
-	"github.com/nats-io/nsc/cmd/store"
+	"github.com/nats-io/nsc/v2/cmd/store"
 
 	nats "github.com/nats-io/nats.go"
+
 	"github.com/spf13/cobra"
 )
 
diff --git a/cmd/reqtool.go b/cmd/reqtool.go
index c44c6d5..42be5c8 100644
--- a/cmd/reqtool.go
+++ b/cmd/reqtool.go
@@ -21,9 +21,10 @@ import (
 	"strings"
 	"time"
 
-	"github.com/nats-io/nsc/cmd/store"
+	"github.com/nats-io/nsc/v2/cmd/store"
 
 	nats "github.com/nats-io/nats.go"
+
 	"github.com/spf13/cobra"
 )
 
diff --git a/cmd/revoke_clearactivation.go b/cmd/revoke_clearactivation.go
index 66583e3..029a917 100644
--- a/cmd/revoke_clearactivation.go
+++ b/cmd/revoke_clearactivation.go
@@ -21,7 +21,7 @@ import (
 	cli "github.com/nats-io/cliprompts/v2"
 	"github.com/nats-io/jwt/v2"
 	"github.com/nats-io/nkeys"
-	"github.com/nats-io/nsc/cmd/store"
+	"github.com/nats-io/nsc/v2/cmd/store"
 	"github.com/spf13/cobra"
 )
 
diff --git a/cmd/revoke_listactivation.go b/cmd/revoke_listactivation.go
index 9bec7d3..5da5863 100644
--- a/cmd/revoke_listactivation.go
+++ b/cmd/revoke_listactivation.go
@@ -22,7 +22,7 @@ import (
 	cli "github.com/nats-io/cliprompts/v2"
 	"github.com/nats-io/jwt/v2"
 	"github.com/nats-io/nkeys"
-	"github.com/nats-io/nsc/cmd/store"
+	"github.com/nats-io/nsc/v2/cmd/store"
 	"github.com/spf13/cobra"
 	"github.com/xlab/tablewriter"
 )
diff --git a/cmd/revoke_listusers.go b/cmd/revoke_listusers.go
index 849002b..773515b 100644
--- a/cmd/revoke_listusers.go
+++ b/cmd/revoke_listusers.go
@@ -20,7 +20,7 @@ import (
 	"time"
 
 	"github.com/nats-io/jwt/v2"
-	"github.com/nats-io/nsc/cmd/store"
+	"github.com/nats-io/nsc/v2/cmd/store"
 	"github.com/spf13/cobra"
 	"github.com/xlab/tablewriter"
 )
diff --git a/cmd/revokeactivation.go b/cmd/revokeactivation.go
index ad475c9..373a6d0 100644
--- a/cmd/revokeactivation.go
+++ b/cmd/revokeactivation.go
@@ -22,7 +22,7 @@ import (
 	cli "github.com/nats-io/cliprompts/v2"
 	"github.com/nats-io/jwt/v2"
 	"github.com/nats-io/nkeys"
-	"github.com/nats-io/nsc/cmd/store"
+	"github.com/nats-io/nsc/v2/cmd/store"
 	"github.com/spf13/cobra"
 )
 
diff --git a/cmd/revokeclearuser.go b/cmd/revokeclearuser.go
index d191678..3fb5c99 100644
--- a/cmd/revokeclearuser.go
+++ b/cmd/revokeclearuser.go
@@ -21,7 +21,7 @@ import (
 
 	"github.com/nats-io/jwt/v2"
 	"github.com/nats-io/nkeys"
-	"github.com/nats-io/nsc/cmd/store"
+	"github.com/nats-io/nsc/v2/cmd/store"
 	"github.com/spf13/cobra"
 )
 
diff --git a/cmd/revokeuser.go b/cmd/revokeuser.go
index c4cefc6..bd4c94d 100644
--- a/cmd/revokeuser.go
+++ b/cmd/revokeuser.go
@@ -23,7 +23,7 @@ import (
 	cli "github.com/nats-io/cliprompts/v2"
 	"github.com/nats-io/jwt/v2"
 	"github.com/nats-io/nkeys"
-	"github.com/nats-io/nsc/cmd/store"
+	"github.com/nats-io/nsc/v2/cmd/store"
 	"github.com/spf13/cobra"
 )
 
diff --git a/cmd/root.go b/cmd/root.go
index e5ae4e4..b9bad3c 100644
--- a/cmd/root.go
+++ b/cmd/root.go
@@ -26,7 +26,7 @@ import (
 	cli "github.com/nats-io/cliprompts/v2"
 	"github.com/nats-io/nats.go"
 	"github.com/nats-io/nkeys"
-	"github.com/nats-io/nsc/cmd/store"
+	"github.com/nats-io/nsc/v2/cmd/store"
 	"github.com/spf13/cobra"
 )
 
@@ -196,8 +196,8 @@ var rootCmd = &cobra.Command{
 		return nil
 	},
 	Run: func(cmd *cobra.Command, args []string) {
-		// we are only called when asked for the version
-		cmd.Printf("nsc version %s\n", cmd.Version)
+		// print command help by default
+		cmd.Help()
 	},
 }
 
diff --git a/cmd/rtttool.go b/cmd/rtttool.go
index ffa0147..1e99102 100644
--- a/cmd/rtttool.go
+++ b/cmd/rtttool.go
@@ -21,9 +21,8 @@ import (
 	"strings"
 	"time"
 
-	"github.com/nats-io/nsc/cmd/store"
-
 	nats "github.com/nats-io/nats.go"
+	"github.com/nats-io/nsc/v2/cmd/store"
 	"github.com/spf13/cobra"
 )
 
diff --git a/cmd/select.go b/cmd/select.go
new file mode 100644
index 0000000..2df75b0
--- /dev/null
+++ b/cmd/select.go
@@ -0,0 +1,78 @@
+/*
+ * Copyright 2018-2022 The NATS Authors
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package cmd
+
+import (
+	"github.com/spf13/cobra"
+)
+
+func init() {
+	GetRootCmd().AddCommand(createSelecteCmd())
+}
+
+func createSelecteCmd() *cobra.Command {
+	cmd := &cobra.Command{
+		Use:   "select",
+		Short: "Set the current operator or account",
+	}
+	cmd.AddCommand(selectOperatorCmd())
+	cmd.AddCommand(selectAccountCmd())
+	return cmd
+}
+
+func selectOperatorCmd() *cobra.Command {
+	return &cobra.Command{
+		Use:   "operator",
+		Short: "set the operator",
+		Args: func(cmd *cobra.Command, args []string) error {
+			if err := cobra.ExactArgs(1)(cmd, args); err != nil {
+				return err
+			}
+
+			return nil
+		},
+		RunE: func(cmd *cobra.Command, args []string) error {
+			current := GetConfig()
+			if err := current.ContextConfig.Update("", args[0], ""); err != nil {
+				return err
+			}
+
+			return current.Save()
+		},
+	}
+}
+
+func selectAccountCmd() *cobra.Command {
+	return &cobra.Command{
+		Use:   "account",
+		Short: "set the account",
+		Args: func(cmd *cobra.Command, args []string) error {
+			if err := cobra.ExactArgs(1)(cmd, args); err != nil {
+				return err
+			}
+
+			return nil
+		},
+		RunE: func(cmd *cobra.Command, args []string) error {
+			current := GetConfig()
+			if err := current.ContextConfig.Update("", "", args[0]); err != nil {
+				return err
+			}
+
+			return current.Save()
+		},
+	}
+}
diff --git a/cmd/signerparams.go b/cmd/signerparams.go
index 9025c79..3453b8a 100644
--- a/cmd/signerparams.go
+++ b/cmd/signerparams.go
@@ -24,7 +24,7 @@ import (
 
 	cli "github.com/nats-io/cliprompts/v2"
 	"github.com/nats-io/nkeys"
-	"github.com/nats-io/nsc/cmd/store"
+	"github.com/nats-io/nsc/v2/cmd/store"
 )
 
 // SignerParams is shared UI for a signer (-K flag). The key
diff --git a/cmd/signingkeyseditor.go b/cmd/signingkeyseditor.go
index 14e38f7..9e65338 100644
--- a/cmd/signingkeyseditor.go
+++ b/cmd/signingkeyseditor.go
@@ -1,6 +1,6 @@
 /*
  *
- *  * Copyright 2018-2019 The NATS Authors
+ *  * Copyright 2018-2022 The NATS Authors
  *  * Licensed under the Apache License, Version 2.0 (the "License");
  *  * you may not use this file except in compliance with the License.
  *  * You may obtain a copy of the License at
@@ -22,7 +22,7 @@ import (
 
 	cli "github.com/nats-io/cliprompts/v2"
 	"github.com/nats-io/nkeys"
-	"github.com/nats-io/nsc/cmd/store"
+	"github.com/nats-io/nsc/v2/cmd/store"
 	"github.com/spf13/cobra"
 )
 
@@ -35,7 +35,12 @@ type SigningKeysParams struct {
 func (e *SigningKeysParams) BindFlags(flagName string, shorthand string, kind nkeys.PrefixByte, cmd *cobra.Command) {
 	e.flagName = flagName
 	e.kind = kind
-	cmd.Flags().StringSliceVarP(&e.paths, flagName, shorthand, nil, `signing key or keypath or the value "generate"" to generate a key pair on the fly - comma separated list or option can be specified multiple times`)
+	if kind == nkeys.PrefixByteCurve {
+		e.paths = make([]string, 1)
+		cmd.Flags().StringVarP(&e.paths[0], flagName, shorthand, "", `curve key or keypath or the value "generate" to generate a curve encryption target key on the fly`)
+	} else {
+		cmd.Flags().StringSliceVarP(&e.paths, flagName, shorthand, nil, `signing key or keypath or the value "generate" to generate a key pair on the fly - comma separated list or option can be specified multiple times`)
+	}
 }
 
 func (e *SigningKeysParams) valid(s string) error {
@@ -63,16 +68,25 @@ func (e *SigningKeysParams) resolve(s string) (nkeys.KeyPair, error) {
 	if err != nil {
 		return nil, err
 	}
+
 	if kp == nil {
-		return nil, fmt.Errorf("a signing key is required")
+		return nil, fmt.Errorf("a %s key is required", e.label())
 	}
 	if !store.KeyPairTypeOk(e.kind, kp) {
-		return nil, fmt.Errorf("invalid %s signing key %q", e.kind.String(), s)
+		return nil, fmt.Errorf("invalid %s %s key %q", e.kind.String(), e.label(), s)
 	}
 
 	return kp, nil
 }
 
+func (e *SigningKeysParams) label() string {
+	label := "signing"
+	if e.kind == nkeys.PrefixByteCurve {
+		label = "curve"
+	}
+	return label
+}
+
 func (e *SigningKeysParams) Valid() error {
 	for _, v := range e.paths {
 		if err := e.valid(v); err != nil {
@@ -108,10 +122,11 @@ func (e *SigningKeysParams) Edit() error {
 		e.paths[i] = sv
 	}
 	first := true
+
 	for {
-		m := "add a signing key"
+		m := fmt.Sprintf("add a %s key", e.label())
 		if !first || len(e.paths) > 0 {
-			m = "add another signing key"
+			m = fmt.Sprintf("add another %s key", e.label())
 		}
 		first = false
 
diff --git a/cmd/store/keys.go b/cmd/store/keys.go
index 0d34d24..413cea2 100644
--- a/cmd/store/keys.go
+++ b/cmd/store/keys.go
@@ -26,7 +26,7 @@ import (
 	"github.com/nats-io/nkeys"
 	"github.com/nats-io/nuid"
 
-	"github.com/nats-io/nsc/home"
+	"github.com/nats-io/nsc/v2/home"
 )
 
 var NscNotGitIgnore bool
@@ -480,6 +480,8 @@ func IsPublicKey(kind nkeys.PrefixByte, key string) bool {
 		f = nkeys.IsValidPublicServerKey
 	case nkeys.PrefixByteUser:
 		f = nkeys.IsValidPublicUserKey
+	case nkeys.PrefixByteCurve:
+		f = nkeys.IsValidPublicCurveKey
 	default:
 		return false
 	}
@@ -502,6 +504,9 @@ func PubKeyType(pk string) (nkeys.PrefixByte, error) {
 	if nkeys.IsValidPublicUserKey(pk) {
 		return nkeys.PrefixByteUser, nil
 	}
+	if nkeys.IsValidPublicCurveKey(pk) {
+		return nkeys.PrefixByteCurve, nil
+	}
 	return 0, fmt.Errorf("unsupported key type")
 }
 
diff --git a/cmd/subtool.go b/cmd/subtool.go
index 4bbecb7..8ab2675 100644
--- a/cmd/subtool.go
+++ b/cmd/subtool.go
@@ -22,9 +22,10 @@ import (
 	"strings"
 	"time"
 
-	"github.com/nats-io/nsc/cmd/store"
+	"github.com/nats-io/nsc/v2/cmd/store"
 
 	nats "github.com/nats-io/nats.go"
+
 	"github.com/spf13/cobra"
 )
 
diff --git a/cmd/upgradejwt.go b/cmd/upgradejwt.go
index 80c17e0..a52f66e 100644
--- a/cmd/upgradejwt.go
+++ b/cmd/upgradejwt.go
@@ -27,8 +27,7 @@ import (
 
 	"github.com/nats-io/cliprompts/v2"
 
-	"github.com/nats-io/nsc/cmd/store"
-
+	"github.com/nats-io/nsc/v2/cmd/store"
 	"github.com/spf13/cobra"
 )
 
diff --git a/cmd/usercontextparams.go b/cmd/usercontextparams.go
index 28a0978..2fd143d 100644
--- a/cmd/usercontextparams.go
+++ b/cmd/usercontextparams.go
@@ -19,7 +19,7 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/nats-io/nsc/cmd/store"
+	"github.com/nats-io/nsc/v2/cmd/store"
 	"github.com/spf13/cobra"
 )
 
diff --git a/cmd/validate.go b/cmd/validate.go
index 9e3b7c4..e5faeaf 100644
--- a/cmd/validate.go
+++ b/cmd/validate.go
@@ -25,8 +25,7 @@ import (
 	"github.com/nats-io/jwt/v2"
 	"github.com/xlab/tablewriter"
 
-	"github.com/nats-io/nsc/cmd/store"
-
+	"github.com/nats-io/nsc/v2/cmd/store"
 	"github.com/spf13/cobra"
 )
 
diff --git a/go.mod b/go.mod
index b2bae84..768afcb 100644
--- a/go.mod
+++ b/go.mod
@@ -1,57 +1,58 @@
-module github.com/nats-io/nsc
+module github.com/nats-io/nsc/v2
 
 go 1.19
 
 require (
 	github.com/blang/semver v3.5.1+incompatible
-	github.com/briandowns/spinner v0.0.0-20181029155426-195c31b675a7
+	github.com/briandowns/spinner v1.19.0
 	github.com/dustin/go-humanize v1.0.0
 	github.com/mitchellh/go-homedir v1.1.0
-	github.com/nats-io/cliprompts/v2 v2.0.0-20191226174129-372d79b36768
-	github.com/nats-io/jsm.go v0.0.33
+	github.com/nats-io/cliprompts/v2 v2.0.0-20200221130455-2737f3b8cbb9
+	github.com/nats-io/jsm.go v0.0.35
 	github.com/nats-io/jwt v1.2.3-0.20210314221642-a826c77dc9d2
-	github.com/nats-io/jwt/v2 v2.3.0
-	github.com/nats-io/nats-server/v2 v2.8.4
-	github.com/nats-io/nats.go v1.16.0
-	github.com/nats-io/nkeys v0.3.0
+	github.com/nats-io/jwt/v2 v2.3.1-0.20221214233435-ff7baa9e5e73
+	github.com/nats-io/nats-server/v2 v2.9.6
+	github.com/nats-io/nats.go v1.21.0
+	github.com/nats-io/nkeys v0.3.1-0.20221215194120-47c7408e7546
 	github.com/nats-io/nuid v1.0.1
-	github.com/rhysd/go-github-selfupdate v1.2.2
-	github.com/spf13/cobra v0.0.3
-	github.com/spf13/pflag v1.0.3
+	github.com/rhysd/go-github-selfupdate v1.2.3
+	github.com/spf13/cobra v1.6.1
+	github.com/spf13/pflag v1.0.5
 	github.com/stretchr/testify v1.7.0
 	github.com/xlab/tablewriter v0.0.0-20160610135559-80b567a11ad5
+	golang.org/x/text v0.5.0
 )
 
 require (
-	github.com/AlecAivazis/survey/v2 v2.0.4 // indirect
-	github.com/cpuguy83/go-md2man v1.0.10 // indirect
+	github.com/AlecAivazis/survey/v2 v2.3.6 // indirect
+	github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/fatih/color v1.9.0 // indirect
-	github.com/golang/protobuf v1.4.2 // indirect
+	github.com/fatih/color v1.13.0 // indirect
+	github.com/golang/protobuf v1.5.2 // indirect
 	github.com/google/go-github/v30 v30.1.0 // indirect
-	github.com/google/go-querystring v1.0.0 // indirect
+	github.com/google/go-querystring v1.1.0 // indirect
 	github.com/inconshreveable/go-update v0.0.0-20160112193335-8152e7eb6ccf // indirect
-	github.com/inconshreveable/mousetrap v1.0.0 // indirect
+	github.com/inconshreveable/mousetrap v1.1.0 // indirect
 	github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect
-	github.com/klauspost/compress v1.15.5 // indirect
-	github.com/mattn/go-colorable v0.1.4 // indirect
-	github.com/mattn/go-isatty v0.0.11 // indirect
-	github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b // indirect
+	github.com/klauspost/compress v1.15.12 // indirect
+	github.com/mattn/go-colorable v0.1.13 // indirect
+	github.com/mattn/go-isatty v0.0.16 // indirect
+	github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d // indirect
 	github.com/minio/highwayhash v1.0.2 // indirect
-	github.com/mitchellh/go-wordwrap v1.0.0 // indirect
+	github.com/mitchellh/go-wordwrap v1.0.1 // indirect
 	github.com/onsi/gomega v1.4.3 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
-	github.com/russross/blackfriday v1.5.2 // indirect
+	github.com/russross/blackfriday/v2 v2.1.0 // indirect
 	github.com/tcnksm/go-gitconfig v0.1.2 // indirect
-	github.com/ulikunitz/xz v0.5.8 // indirect
-	golang.org/x/crypto v0.0.0-20220315160706-3147a52a75dd // indirect
-	golang.org/x/net v0.0.0-20220906165146-f3363e06e74c // indirect
-	golang.org/x/oauth2 v0.0.0-20181203162652-d668ce993890 // indirect
-	golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10 // indirect
-	golang.org/x/text v0.4.0 // indirect
-	golang.org/x/time v0.0.0-20211116232009-f0f3c7e86c11 // indirect
-	google.golang.org/appengine v1.3.0 // indirect
-	google.golang.org/protobuf v1.23.0 // indirect
-	gopkg.in/yaml.v2 v2.2.8 // indirect
-	gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c // indirect
+	github.com/ulikunitz/xz v0.5.11 // indirect
+	golang.org/x/crypto v0.4.0 // indirect
+	golang.org/x/net v0.4.0 // indirect
+	golang.org/x/oauth2 v0.3.0 // indirect
+	golang.org/x/sys v0.3.0 // indirect
+	golang.org/x/term v0.3.0 // indirect
+	golang.org/x/time v0.1.0 // indirect
+	google.golang.org/appengine v1.6.7 // indirect
+	google.golang.org/protobuf v1.28.1 // indirect
+	gopkg.in/yaml.v2 v2.4.0 // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
diff --git a/go.sum b/go.sum
index c87493e..e7f706f 100644
--- a/go.sum
+++ b/go.sum
@@ -1,84 +1,93 @@
-github.com/AlecAivazis/survey/v2 v2.0.4 h1:qzXnJSzXEvmUllWqMBWpZndvT2YfoAUzAMvZUax3L2M=
 github.com/AlecAivazis/survey/v2 v2.0.4/go.mod h1:WYBhg6f0y/fNYUuesWQc0PKbJcEliGcYHB9sNT3Bg74=
-github.com/Netflix/go-expect v0.0.0-20180615182759-c93bf25de8e8 h1:xzYJEypr/85nBpB11F9br+3HUrpgb+fcm5iADzXXYEw=
+github.com/AlecAivazis/survey/v2 v2.3.6 h1:NvTuVHISgTHEHeBFqt6BHOe4Ny/NwGZr7w+F8S9ziyw=
+github.com/AlecAivazis/survey/v2 v2.3.6/go.mod h1:4AuI9b7RjAR+G7v9+C4YSlX/YL3K3cWNXgWXOhllqvI=
 github.com/Netflix/go-expect v0.0.0-20180615182759-c93bf25de8e8/go.mod h1:oX5x61PbNXchhh0oikYAH+4Pcfw5LKv21+Jnpr6r6Pc=
+github.com/Netflix/go-expect v0.0.0-20220104043353-73e0943537d2 h1:+vx7roKuyA63nhn5WAunQHLTznkw5W8b1Xc0dNjp83s=
+github.com/Netflix/go-expect v0.0.0-20220104043353-73e0943537d2/go.mod h1:HBCaDeC1lPdgDeDbhX8XFpy1jqjK0IBG8W5K+xYqA0w=
 github.com/blang/semver v3.5.1+incompatible h1:cQNTCjp13qL8KC3Nbxr/y2Bqb63oX6wdnnjpJbkM4JQ=
 github.com/blang/semver v3.5.1+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk=
-github.com/briandowns/spinner v0.0.0-20181029155426-195c31b675a7 h1:IvbBe4mOtBLz3X8n95FV5FzQqGWkrkCrfKdQxj7DkUg=
-github.com/briandowns/spinner v0.0.0-20181029155426-195c31b675a7/go.mod h1:hw/JEQBIE+c/BLI4aKM8UU8v+ZqrD3h7HC27kKt8JQU=
-github.com/cpuguy83/go-md2man v1.0.10 h1:BSKMNlYxDvnunlTymqtgONjNnaRV1sTpcovwwjF22jk=
-github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE=
+github.com/briandowns/spinner v1.19.0 h1:s8aq38H+Qju89yhp89b4iIiMzMm8YN3p6vGpwyh/a8E=
+github.com/briandowns/spinner v1.19.0/go.mod h1:mQak9GHqbspjC/5iUx3qMlIho8xBS/ppAL/hX5SmPJU=
+github.com/cpuguy83/go-md2man/v2 v2.0.2 h1:p1EgwI/C7NhT0JmVkwCD2ZBK8j4aeHQX2pMHHBfMQ6w=
+github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
+github.com/creack/pty v1.1.17 h1:QeVUsEDNrLBW4tMgZHvxy18sKtr6VI492kBhUfhDJNI=
+github.com/creack/pty v1.1.17/go.mod h1:MOBLtS5ELjhRRrroQr9kyvTxUAFNvYEK993ew/Vr4O4=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/dustin/go-humanize v1.0.0 h1:VSnTsYCnlFHaM2/igO1h6X3HA71jcobQuxemgkq4zYo=
 github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
-github.com/fatih/color v1.9.0 h1:8xPHl4/q1VyqGIPif1F+1V3Y3lSmrq01EabUW3CoW5s=
-github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU=
+github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
+github.com/fatih/color v1.13.0 h1:8LOYc1KYPPmyKMuN8QV2DNRWNbLo6LZ0iLs8+mlH53w=
+github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8=
-github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA=
-github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs=
-github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w=
-github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=
-github.com/golang/protobuf v1.4.2 h1:+Z5KGCizgyZCbGh1KZqA0fcLLkwbsjIzS4aV2v7wJX0=
-github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
-github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
-github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
-github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg=
+github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
+github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw=
+github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
+github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
 github.com/google/go-github/v30 v30.1.0 h1:VLDx+UolQICEOKu2m4uAoMti1SxuEBAl7RSEG16L+Oo=
 github.com/google/go-github/v30 v30.1.0/go.mod h1:n8jBpHl45a/rlBUtRJMOG4GhNADUQFEufcolZ95JfU8=
-github.com/google/go-querystring v1.0.0 h1:Xkwi/a1rcvNg1PPYe5vI8GbeBY/jrVuDX5ASuANWTrk=
 github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck=
-github.com/hinshun/vt10x v0.0.0-20180616224451-1954e6464174 h1:WlZsjVhE8Af9IcZDGgJGQpNflI3+MJSBhsgT5PCtzBQ=
+github.com/google/go-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD/fhyJ8=
+github.com/google/go-querystring v1.1.0/go.mod h1:Kcdr2DB4koayq7X8pmAG4sNG59So17icRSOU623lUBU=
 github.com/hinshun/vt10x v0.0.0-20180616224451-1954e6464174/go.mod h1:DqJ97dSdRW1W22yXSB90986pcOyQ7r45iio1KN2ez1A=
+github.com/hinshun/vt10x v0.0.0-20220119200601-820417d04eec h1:qv2VnGeEQHchGaZ/u7lxST/RaJw+cv273q79D81Xbog=
+github.com/hinshun/vt10x v0.0.0-20220119200601-820417d04eec/go.mod h1:Q48J4R4DvxnHolD5P8pOtXigYlRuPLGl6moFx3ulM68=
 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
 github.com/inconshreveable/go-update v0.0.0-20160112193335-8152e7eb6ccf h1:WfD7VjIE6z8dIvMsI4/s+1qr5EL+zoIGev1BQj1eoJ8=
 github.com/inconshreveable/go-update v0.0.0-20160112193335-8152e7eb6ccf/go.mod h1:hyb9oH7vZsitZCiBt0ZvifOrB+qc8PS5IiilCIb87rg=
-github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM=
-github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
+github.com/inconshreveable/mousetrap v1.0.1/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
+github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
+github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
 github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 h1:Z9n2FFNUXsshfwJMBgNA0RU6/i7WVaAegv3PtuIHPMs=
 github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51/go.mod h1:CzGEWj7cYgsdH8dAjBGEr58BoE7ScuLd+fwFZ44+/x8=
-github.com/klauspost/compress v1.15.5 h1:qyCLMz2JCrKADihKOh9FxnW3houKeNsp2h5OEz0QSEA=
-github.com/klauspost/compress v1.15.5/go.mod h1:PhcZ0MbTNciWF3rruxRgKxI5NkcHHrHUDtV4Yw2GlzU=
+github.com/klauspost/compress v1.15.12 h1:YClS/PImqYbn+UILDnqxQCZ3RehC9N318SU3kElDUEM=
+github.com/klauspost/compress v1.15.12/go.mod h1:QPwzmACJjUTFsnSHH934V6woptycfrDDJnH7hvFVbGM=
 github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
-github.com/kr/pty v1.1.4 h1:5Myjjh3JY/NaAi4IsUbHADytDyl1VE1Y9PXDlL+P/VQ=
 github.com/kr/pty v1.1.4/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
-github.com/mattn/go-colorable v0.1.4 h1:snbPLB8fVfU9iwbbo30TPtbLRzwWu6aJS6Xh4eaaviA=
-github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
+github.com/mattn/go-colorable v0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
+github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
+github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
 github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
-github.com/mattn/go-isatty v0.0.11 h1:FxPOTFNqGkuDUGi3H/qkUbQO4ZiBa2brKq5r0l8TGeM=
-github.com/mattn/go-isatty v0.0.11/go.mod h1:PhnuNfih5lzO57/f3n+odYbM4JtupLOxQOAqxQCu2WE=
-github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b h1:j7+1HpAFS1zy5+Q4qx1fWh90gTKwiN4QCGoY9TWyyO4=
+github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
+github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
+github.com/mattn/go-isatty v0.0.16 h1:bq3VjFmv/sOjHtdEhmkEV4x1AJtvUvOJ2PFAZ5+peKQ=
+github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
 github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b/go.mod h1:01TrycV0kFyexm33Z7vhZRXopbI8J3TDReVlkTgMUxE=
+github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d h1:5PJl274Y63IEHC+7izoQE9x6ikvDFZS2mDVS3drnohI=
+github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d/go.mod h1:01TrycV0kFyexm33Z7vhZRXopbI8J3TDReVlkTgMUxE=
 github.com/minio/highwayhash v1.0.2 h1:Aak5U0nElisjDCfPSG79Tgzkn2gl66NxOMspRrKnA/g=
 github.com/minio/highwayhash v1.0.2/go.mod h1:BQskDq+xkJ12lmlUUi7U0M5Swg3EWR+dLTk+kldvVxY=
 github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y=
 github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
-github.com/mitchellh/go-wordwrap v1.0.0 h1:6GlHJ/LTGMrIJbwgdqdl2eEH8o+Exx/0m8ir9Gns0u4=
 github.com/mitchellh/go-wordwrap v1.0.0/go.mod h1:ZXFpozHsX6DPmq2I0TCekCxypsnAUbP2oI0UX1GXzOo=
-github.com/nats-io/cliprompts/v2 v2.0.0-20191226174129-372d79b36768 h1:sdr8zfPeN/b4/TDoxbD9ARAtyP92zDFDvj87MeAAyjk=
-github.com/nats-io/cliprompts/v2 v2.0.0-20191226174129-372d79b36768/go.mod h1:oweZn7AeaVJYKlNHfCIhznJVsdySLSng55vfuINE/d0=
-github.com/nats-io/jsm.go v0.0.33 h1:mNxlZEnSiHo9BwAFpjZYuopVvtwVUdtoAana2ovyWOU=
-github.com/nats-io/jsm.go v0.0.33/go.mod h1:1ySvWrDbPo/Rs1v0Ccoy7QjZKBGfVhvmolfJRBX+fCg=
+github.com/mitchellh/go-wordwrap v1.0.1 h1:TLuKupo69TCn6TQSyGxwI1EblZZEsQ0vMlAFQflz0v0=
+github.com/mitchellh/go-wordwrap v1.0.1/go.mod h1:R62XHJLzvMFRBbcrT7m7WgmE1eOyTSsCt+hzestvNj0=
+github.com/nats-io/cliprompts/v2 v2.0.0-20200221130455-2737f3b8cbb9 h1:d9PC9CwHLrDE9+PzwEcYxTm/RHOfZVC/xGw9IKbGgvQ=
+github.com/nats-io/cliprompts/v2 v2.0.0-20200221130455-2737f3b8cbb9/go.mod h1:oweZn7AeaVJYKlNHfCIhznJVsdySLSng55vfuINE/d0=
+github.com/nats-io/jsm.go v0.0.35 h1:l03xuGttRA9b81Q0P/WEGm3e5DYof743ZEI4nQR3PUs=
+github.com/nats-io/jsm.go v0.0.35/go.mod h1:AkNKZTxbvdFBOJCdlKuLHsRlOP+AI4hV9REQKmq3sWw=
 github.com/nats-io/jwt v1.2.3-0.20210314221642-a826c77dc9d2 h1:Y5jKuPP58S+Fm96nMqInCvSwUKLAm+u8hD96qpiRSCo=
 github.com/nats-io/jwt v1.2.3-0.20210314221642-a826c77dc9d2/go.mod h1:kIiOxe25rMg5oMi63AjFkNK2F1q7ISvH+aaKzAXprDs=
-github.com/nats-io/jwt/v2 v2.3.0 h1:z2mA1a7tIf5ShggOFlR1oBPgd6hGqcDYsISxZByUzdI=
-github.com/nats-io/jwt/v2 v2.3.0/go.mod h1:0tqz9Hlu6bCBFLWAASKhE5vUA4c24L9KPUUgvwumE/k=
-github.com/nats-io/nats-server/v2 v2.8.4 h1:0jQzze1T9mECg8YZEl8+WYUXb9JKluJfCBriPUtluB4=
-github.com/nats-io/nats-server/v2 v2.8.4/go.mod h1:8zZa+Al3WsESfmgSs98Fi06dRWLH5Bnq90m5bKD/eT4=
-github.com/nats-io/nats.go v1.16.0 h1:zvLE7fGBQYW6MWaFaRdsgm9qT39PJDQoju+DS8KsO1g=
-github.com/nats-io/nats.go v1.16.0/go.mod h1:BPko4oXsySz4aSWeFgOHLZs3G4Jq4ZAyE6/zMCxRT6w=
-github.com/nats-io/nkeys v0.3.0 h1:cgM5tL53EvYRU+2YLXIK0G2mJtK12Ft9oeooSZMA2G8=
+github.com/nats-io/jwt/v2 v2.3.1-0.20221214233435-ff7baa9e5e73 h1:YPnTZkw0tAZE2zmbG8LlTS0GGfCSPbAu00Gfi+DVi+0=
+github.com/nats-io/jwt/v2 v2.3.1-0.20221214233435-ff7baa9e5e73/go.mod h1:DYujvzCMZzUuqB3i1Pnpf1YtkuTwhdI84Aah9wRXkK0=
+github.com/nats-io/nats-server/v2 v2.9.6 h1:RTtK+rv/4CcliOuqGsy58g7MuWkBaWmF5TUNwuUo9Uw=
+github.com/nats-io/nats-server/v2 v2.9.6/go.mod h1:AB6hAnGZDlYfqb7CTAm66ZKMZy9DpfierY1/PbpvI2g=
+github.com/nats-io/nats.go v1.21.0 h1:kQiWyQMMMIPjDR7NanrLhTnRUxWgU04yrzmYdq9JxCU=
+github.com/nats-io/nats.go v1.21.0/go.mod h1:tLqubohF7t4z3du1QDPYJIQQyhb4wl6DhjxEajSI7UA=
 github.com/nats-io/nkeys v0.3.0/go.mod h1:gvUNGjVcM2IPr5rCsRsC6Wb3Hr2CQAm08dsxtV6A5y4=
+github.com/nats-io/nkeys v0.3.1-0.20221215194120-47c7408e7546 h1:7ZylVLLiDSFqxJTSibNsO2RjVSXj3QWnDc+zKara2HE=
+github.com/nats-io/nkeys v0.3.1-0.20221215194120-47c7408e7546/go.mod h1:JOEZlxMfMnmaLwr+mpmP+RGIYSxLNBFsZykCGaI2PvA=
 github.com/nats-io/nuid v1.0.1 h1:5iA8DT8V7q8WK2EScv2padNa/rTESc1KdnPw4TC2paw=
 github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c=
 github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
@@ -87,41 +96,44 @@ github.com/onsi/gomega v1.4.3 h1:RE1xgDvH7imwFD45h+u2SgIfERHlS2yNG4DObb5BSKU=
 github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/rhysd/go-github-selfupdate v1.2.2 h1:G+mNzkc1wEtpmM6sFS/Ghkeq+ad4Yp6EZEHyp//wGEo=
-github.com/rhysd/go-github-selfupdate v1.2.2/go.mod h1:khesvSyKcXDUxeySCedFh621iawCks0dS/QnHPcpCws=
-github.com/russross/blackfriday v1.5.2 h1:HyvC0ARfnZBqnXwABFeSZHpKvJHJJfPz81GNueLj0oo=
-github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g=
-github.com/spf13/cobra v0.0.3 h1:ZlrZ4XsMRm04Fr5pSFxBgfND2EBVa1nLpiy1stUsX/8=
-github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ=
-github.com/spf13/pflag v1.0.3 h1:zPAT6CGy6wXeQ7NtTnaTerfKOsV6V6F8agHXFiazDkg=
-github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
+github.com/rhysd/go-github-selfupdate v1.2.3 h1:iaa+J202f+Nc+A8zi75uccC8Wg3omaM7HDeimXA22Ag=
+github.com/rhysd/go-github-selfupdate v1.2.3/go.mod h1:mp/N8zj6jFfBQy/XMYoWsmfzxazpPAODuqarmPDe2Rg=
+github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk=
+github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
+github.com/spf13/cobra v1.6.1 h1:o94oiPyS4KD1mPy2fmcYYHHfCxLqYjJOhGsCHFZtEzA=
+github.com/spf13/cobra v1.6.1/go.mod h1:IOw/AERYS7UzyrGinqmz6HLUo219MORXGxhbaJUqzrY=
+github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
+github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.2.1/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
+github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/tcnksm/go-gitconfig v0.1.2 h1:iiDhRitByXAEyjgBqsKi9QU4o2TNtv9kPP3RgPgXBPw=
 github.com/tcnksm/go-gitconfig v0.1.2/go.mod h1:/8EhP4H7oJZdIPyT+/UIsG87kTzrzM4UsLGSItWYCpE=
-github.com/ulikunitz/xz v0.5.5/go.mod h1:2bypXElzHzzJZwzH67Y6wb67pO62Rzfn7BSiF4ABRW8=
-github.com/ulikunitz/xz v0.5.8 h1:ERv8V6GKqVi23rgu5cj9pVfVzJbOqAY2Ntl88O6c2nQ=
-github.com/ulikunitz/xz v0.5.8/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14=
+github.com/ulikunitz/xz v0.5.9/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14=
+github.com/ulikunitz/xz v0.5.11 h1:kpFauv27b6ynzBNT/Xy+1k+fK4WswhN/6PN5WhFAGw8=
+github.com/ulikunitz/xz v0.5.11/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14=
 github.com/xlab/tablewriter v0.0.0-20160610135559-80b567a11ad5 h1:gmD7q6cCJfBbcuobWQe/KzLsd9Cd3amS1Mq5f3uU1qo=
 github.com/xlab/tablewriter v0.0.0-20160610135559-80b567a11ad5/go.mod h1:fVwOndYN3s5IaGlMucfgxwMhqwcaJtlGejBU6zX6Yxw=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20190530122614-20be4c3c3ed5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I=
 golang.org/x/crypto v0.0.0-20210314154223-e6e6c4f2bb5b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4=
-golang.org/x/crypto v0.0.0-20220315160706-3147a52a75dd h1:XcWmESyNjXJMLahc3mqVQJcgSTDxFxhETVlfk9uGc38=
-golang.org/x/crypto v0.0.0-20220315160706-3147a52a75dd/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
+golang.org/x/crypto v0.4.0 h1:UVQgzMY87xqpKNgb+kDsll2Igd33HszWHFLmpaRMq/8=
+golang.org/x/crypto v0.4.0/go.mod h1:3quD/ATkf6oY+rnes5c3ExXTbLc8mueNue5/DoinL80=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
-golang.org/x/net v0.0.0-20220906165146-f3363e06e74c h1:yKufUcDwucU5urd+50/Opbt4AYpqthk7wHpHok8f1lo=
-golang.org/x/net v0.0.0-20220906165146-f3363e06e74c/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
+golang.org/x/net v0.4.0 h1:Q5QPcMlvfxFTAPV0+07Xz/MpK9NTXu2VDUuy0FeMfaU=
+golang.org/x/net v0.4.0/go.mod h1:MBQ8lrhLObU/6UmLb4fmbmk5OcyYmqtbGd/9yIeKjEE=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20181106182150-f42d05182288/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
-golang.org/x/oauth2 v0.0.0-20181203162652-d668ce993890 h1:uESlIz09WIHT2I+pasSXcpLYqYK8wHcdCetU3VuMBJE=
-golang.org/x/oauth2 v0.0.0-20181203162652-d668ce993890/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
+golang.org/x/oauth2 v0.3.0 h1:6l90koy8/LaBLmLu8jpHeHexzMwEita0zFfYlggy2F8=
+golang.org/x/oauth2 v0.3.0/go.mod h1:rQrIauxkUhJ6CuwEXwymO2/eh4xz2ZWF1nBkcxS+tGk=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190130150945-aca44879d564/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -130,36 +142,45 @@ golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5h
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190530182044-ad28b68e88f1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10 h1:WIoqL4EROvwiPdUtaip4VcDdpZ4kha7wBWZrbVKCIZg=
-golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220422013727-9388b58f7150/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.3.0 h1:w8ZOecv6NaNa/zC8944JTU3vz4u6Lagfk4RPQxv92NQ=
+golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
+golang.org/x/term v0.0.0-20210503060354-a79de5458b56/go.mod h1:tfny5GFUkzUvx4ps4ajbZsCe5lw1metzhBm9T3x7oIY=
+golang.org/x/term v0.3.0 h1:qoo4akIqOcDME5bhc/NgxUdovd6BSS2uMsVjB56q1xI=
+golang.org/x/term v0.3.0/go.mod h1:q750SLmJuPmVoN1blW3UFBPREJfb1KmY3vwxfr+nFDA=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
-golang.org/x/text v0.4.0 h1:BrVqGRd7+k1DiOgtnFvAkoQEWQvBc25ouMJM6429SFg=
-golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
-golang.org/x/time v0.0.0-20211116232009-f0f3c7e86c11 h1:GZokNIeuVkl3aZHJchRrr13WCsols02MLUcz1U9is6M=
-golang.org/x/time v0.0.0-20211116232009-f0f3c7e86c11/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
+golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/text v0.5.0 h1:OLmvp0KP+FVG99Ct/qFiL/Fhk4zp4QQnZ7b2U+5piUM=
+golang.org/x/text v0.5.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
+golang.org/x/time v0.1.0 h1:xYY+Bajn2a7VBmTM5GikTmnK8ZuX8YgnQCqZpbBNtmA=
+golang.org/x/time v0.1.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
-google.golang.org/appengine v1.3.0 h1:FBSsiFRMz3LBeXIomRnVzrQwSDj4ibvcRexLG0LZGQk=
 google.golang.org/appengine v1.3.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
-google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
-google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
-google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
-google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE=
-google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo=
-google.golang.org/protobuf v1.23.0 h1:4MY060fB1DLGMB/7MBTLnwQUY6+F09GEiz6SsrNqyzM=
-google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
+google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c=
+google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
+google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
+google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
+google.golang.org/protobuf v1.28.1 h1:d0NfwRgPtno5B1Wa6L2DAG+KivqkdutMf1UhdNx175w=
+google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
 gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
-gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
+gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
+gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
+gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
diff --git a/main.go b/main.go
index 3670b35..97d2096 100644
--- a/main.go
+++ b/main.go
@@ -16,7 +16,7 @@
 package main
 
 import (
-	"github.com/nats-io/nsc/cmd"
+	"github.com/nats-io/nsc/v2/cmd"
 )
 
 // The build system should inject this data.


Test patch:
diff --git a/cmd/action_test.go b/cmd/action_test.go
index 1cc1b89..bddb726 100644
--- a/cmd/action_test.go
+++ b/cmd/action_test.go
@@ -18,7 +18,7 @@ package cmd
 import (
 	"testing"
 
-	"github.com/nats-io/nsc/cmd/store"
+	"github.com/nats-io/nsc/v2/cmd/store"
 	"github.com/spf13/cobra"
 	"github.com/stretchr/testify/require"
 )
diff --git a/cmd/addaccount_test.go b/cmd/addaccount_test.go
index d4a9b8e..a43ad55 100644
--- a/cmd/addaccount_test.go
+++ b/cmd/addaccount_test.go
@@ -25,7 +25,7 @@ import (
 	"github.com/nats-io/nkeys"
 	"github.com/stretchr/testify/require"
 
-	"github.com/nats-io/nsc/cmd/store"
+	"github.com/nats-io/nsc/v2/cmd/store"
 )
 
 func Test_AddAccount(t *testing.T) {
diff --git a/cmd/addoperator_test.go b/cmd/addoperator_test.go
index 8d6b38b..28fa5ae 100644
--- a/cmd/addoperator_test.go
+++ b/cmd/addoperator_test.go
@@ -28,7 +28,7 @@ import (
 
 	jwtv1 "github.com/nats-io/jwt"
 	"github.com/nats-io/jwt/v2"
-	"github.com/nats-io/nsc/cmd/store"
+	"github.com/nats-io/nsc/v2/cmd/store"
 	"github.com/stretchr/testify/require"
 )
 
diff --git a/cmd/deleteuser_test.go b/cmd/deleteuser_test.go
index a7b24d4..e947d05 100644
--- a/cmd/deleteuser_test.go
+++ b/cmd/deleteuser_test.go
@@ -19,7 +19,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/nats-io/nsc/cmd/store"
+	"github.com/nats-io/nsc/v2/cmd/store"
 	"github.com/stretchr/testify/require"
 )
 
diff --git a/cmd/describeaccount_test.go b/cmd/describeaccount_test.go
index 6d0d9a0..375fade 100644
--- a/cmd/describeaccount_test.go
+++ b/cmd/describeaccount_test.go
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2020 The NATS Authors
+ * Copyright 2018-2022 The NATS Authors
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -21,7 +21,6 @@ import (
 	"testing"
 
 	"github.com/nats-io/jwt/v2"
-
 	"github.com/stretchr/testify/require"
 )
 
@@ -217,3 +216,25 @@ func TestDescribeAccount_JSTiers(t *testing.T) {
 	require.Contains(t, out, " | optional")
 	require.Contains(t, out, " | 99")
 }
+
+func TestDescribeAccount_Callout(t *testing.T) {
+	ts := NewTestStore(t, "test")
+	defer ts.Done(t)
+
+	ts.AddAccount(t, "A")
+
+	_, uPK, _ := CreateUserKey(t)
+	_, aPK, _ := CreateAccountKey(t)
+	_, xPK, _ := CreateCurveKey(t)
+	_, _, err := ExecuteCmd(createEditAuthorizationCallout(),
+		"--auth-user", uPK,
+		"--allowed-account", aPK,
+		"--curve", xPK)
+	require.NoError(t, err)
+
+	out, _, err := ExecuteCmd(createDescribeAccountCmd())
+	require.NoError(t, err)
+	require.Contains(t, out, fmt.Sprintf(" | %s", uPK))
+	require.Contains(t, out, fmt.Sprintf(" | %s", aPK))
+	require.Contains(t, out, fmt.Sprintf(" | %s", xPK))
+}
diff --git a/cmd/describejwt_test.go b/cmd/describejwt_test.go
index 22c08dd..9cd5abe 100644
--- a/cmd/describejwt_test.go
+++ b/cmd/describejwt_test.go
@@ -24,7 +24,7 @@ import (
 	"testing"
 
 	"github.com/nats-io/jwt/v2"
-	"github.com/nats-io/nsc/cmd/store"
+	"github.com/nats-io/nsc/v2/cmd/store"
 	"github.com/stretchr/testify/require"
 )
 
diff --git a/cmd/editaccount_test.go b/cmd/editaccount_test.go
index 609f5c6..8b1c2a9 100644
--- a/cmd/editaccount_test.go
+++ b/cmd/editaccount_test.go
@@ -205,6 +205,24 @@ func Test_TieredPreventsGlobal(t *testing.T) {
 	require.Equal(t, "cannot set a jetstream global limit when a configuration has tiered limits 'R2'", err.Error())
 }
 
+func Test_TieredDoesntPreventOtherClaims(t *testing.T) {
+	ts := NewTestStore(t, "edit account")
+	defer ts.Done(t)
+
+	ts.AddAccount(t, "A")
+	_, _, err := ExecuteCmd(createEditAccount(),
+		"--js-tier", "2", "--js-streams", "5", "--js-disk-storage", "10")
+	require.NoError(t, err)
+
+	ac, err := ts.Store.ReadAccountClaim("A")
+	require.NoError(t, err)
+	require.Equal(t, int64(5), ac.Limits.JetStreamTieredLimits["R2"].Streams)
+
+	_, _, err = ExecuteCmd(createEditAccount(),
+		"--sk", "generate")
+	require.NoError(t, err)
+}
+
 func Test_EditAccountSigningKeys(t *testing.T) {
 	ts := NewTestStore(t, "edit account")
 	defer ts.Done(t)
diff --git a/cmd/editauthorization_test.go b/cmd/editauthorization_test.go
new file mode 100644
index 0000000..7029388
--- /dev/null
+++ b/cmd/editauthorization_test.go
@@ -0,0 +1,204 @@
+/*
+ * Copyright 2018-2023 The NATS Authors
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package cmd
+
+import (
+	"fmt"
+	"testing"
+
+	"github.com/nats-io/nkeys"
+	"github.com/stretchr/testify/assert"
+
+	"github.com/stretchr/testify/require"
+)
+
+func Test_EditAuthorizationNoFlags(t *testing.T) {
+	ts := NewTestStore(t, "test")
+	defer ts.Done(t)
+
+	ts.AddAccount(t, "A")
+
+	_, _, err := ExecuteCmd(createEditAuthorizationCallout())
+	require.Error(t, err)
+	require.Equal(t, "please specify some options", err.Error())
+}
+
+func Test_EditAuthorizationBadUser(t *testing.T) {
+	ts := NewTestStore(t, "test")
+	defer ts.Done(t)
+
+	ts.AddAccount(t, "A")
+
+	_, aPK, _ := CreateAccountKey(t)
+	_, _, err := ExecuteCmd(createEditAuthorizationCallout(), "--auth-user", aPK)
+	require.Error(t, err)
+	require.Equal(t, fmt.Sprintf("%q is not a valid user key", aPK), err.Error())
+}
+
+func Test_EditAuthorizationBadAccount(t *testing.T) {
+	ts := NewTestStore(t, "test")
+	defer ts.Done(t)
+
+	ts.AddAccount(t, "A")
+
+	_, aPK, _ := CreateUserKey(t)
+	_, _, err := ExecuteCmd(createEditAuthorizationCallout(), "--allowed-account", aPK)
+	require.Error(t, err)
+	require.Equal(t, fmt.Sprintf("%q is not a valid account key", aPK), err.Error())
+}
+
+func Test_EditAuthorizationBadNonNkey(t *testing.T) {
+	ts := NewTestStore(t, "test")
+	defer ts.Done(t)
+
+	ts.AddAccount(t, "A")
+	_, _, err := ExecuteCmd(createEditAuthorizationCallout(), "--allowed-account", "hello")
+	require.Error(t, err)
+	require.Equal(t, fmt.Sprintf("%q is not a valid account key", "hello"), err.Error())
+}
+
+func Test_EditAuthorizationJustUser(t *testing.T) {
+	ts := NewTestStore(t, "test")
+	defer ts.Done(t)
+
+	ts.AddAccount(t, "A")
+
+	_, uPK, _ := CreateUserKey(t)
+	_, _, err := ExecuteCmd(createEditAuthorizationCallout(), "--auth-user", uPK)
+	require.NoError(t, err)
+
+	ac, err := ts.Store.ReadAccountClaim("A")
+	require.NoError(t, err)
+	require.Contains(t, ac.Authorization.AuthUsers, uPK)
+}
+
+func Test_EditAuthorizationJustAccount(t *testing.T) {
+	ts := NewTestStore(t, "test")
+	defer ts.Done(t)
+
+	ts.AddAccount(t, "A")
+
+	_, aPK, _ := CreateAccountKey(t)
+	_, _, err := ExecuteCmd(createEditAuthorizationCallout(), "--allowed-account", aPK)
+	require.Error(t, err)
+	require.Contains(t, err.Error(), "External authorization cannot have accounts without users specified")
+}
+
+func Test_EditAuthorizationDelete(t *testing.T) {
+	ts := NewTestStore(t, "test")
+	defer ts.Done(t)
+
+	ts.AddAccount(t, "A")
+
+	_, uPK, _ := CreateUserKey(t)
+	_, aPK, _ := CreateAccountKey(t)
+	_, _, err := ExecuteCmd(createEditAuthorizationCallout(), "--auth-user", uPK, "--allowed-account", aPK)
+	require.NoError(t, err)
+
+	ac, err := ts.Store.ReadAccountClaim("A")
+	require.NoError(t, err)
+	require.Contains(t, ac.Authorization.AuthUsers, uPK)
+	require.Contains(t, ac.Authorization.AllowedAccounts, aPK)
+
+	_, _, err = ExecuteCmd(createEditAuthorizationCallout(), "--disable")
+	require.NoError(t, err)
+
+	ac, err = ts.Store.ReadAccountClaim("A")
+	require.NoError(t, err)
+	require.Empty(t, ac.Authorization.AuthUsers)
+	require.Empty(t, ac.Authorization.AllowedAccounts)
+}
+
+func Test_EditAuthorizationDeleteUser(t *testing.T) {
+	ts := NewTestStore(t, "test")
+	defer ts.Done(t)
+
+	ts.AddAccount(t, "A")
+
+	_, uPK, _ := CreateUserKey(t)
+	_, u2PK, _ := CreateUserKey(t)
+	_, aPK, _ := CreateAccountKey(t)
+	_, a2PK, _ := CreateAccountKey(t)
+	_, _, err := ExecuteCmd(createEditAuthorizationCallout(),
+		"--auth-user", fmt.Sprintf("%s,%s", uPK, u2PK),
+		"--allowed-account", fmt.Sprintf("%s,%s", aPK, a2PK))
+	require.NoError(t, err)
+
+	ac, err := ts.Store.ReadAccountClaim("A")
+	require.NoError(t, err)
+	require.Contains(t, ac.Authorization.AuthUsers, uPK)
+	require.Contains(t, ac.Authorization.AuthUsers, u2PK)
+	require.Contains(t, ac.Authorization.AllowedAccounts, aPK)
+	require.Contains(t, ac.Authorization.AllowedAccounts, a2PK)
+
+	_, _, err = ExecuteCmd(createEditAuthorizationCallout(),
+		"--rm-auth-user", u2PK,
+		"--rm-allowed-account", a2PK)
+	require.NoError(t, err)
+
+	ac, err = ts.Store.ReadAccountClaim("A")
+	require.NoError(t, err)
+	require.Contains(t, ac.Authorization.AuthUsers, uPK)
+	require.NotContains(t, ac.Authorization.AuthUsers, u2PK)
+	require.Contains(t, ac.Authorization.AllowedAccounts, aPK)
+	require.NotContains(t, ac.Authorization.AllowedAccounts, a2PK)
+}
+
+func Test_EditAuthorizationCurveKey(t *testing.T) {
+	ts := NewTestStore(t, "test")
+	defer ts.Done(t)
+
+	ts.AddAccount(t, "A")
+
+	_, uPK, _ := CreateUserKey(t)
+	_, u2PK, _ := CreateUserKey(t)
+	_, aPK, _ := CreateAccountKey(t)
+	_, a2PK, _ := CreateAccountKey(t)
+	_, _, err := ExecuteCmd(createEditAuthorizationCallout(),
+		"--auth-user", fmt.Sprintf("%s,%s", uPK, u2PK),
+		"--allowed-account", fmt.Sprintf("%s,%s", aPK, a2PK),
+		"--curve", "generate")
+	require.NoError(t, err)
+
+	ac, err := ts.Store.ReadAccountClaim("A")
+	require.NoError(t, err)
+	require.Contains(t, ac.Authorization.AuthUsers, uPK)
+	require.Contains(t, ac.Authorization.AuthUsers, u2PK)
+	require.Contains(t, ac.Authorization.AllowedAccounts, aPK)
+	require.Contains(t, ac.Authorization.AllowedAccounts, a2PK)
+	require.NotEmpty(t, ac.Authorization.XKey)
+	require.True(t, nkeys.IsValidPublicCurveKey(ac.Authorization.XKey))
+
+	// find the key in the store
+	kp, err := ts.KeyStore.GetKeyPair(ac.Authorization.XKey)
+	require.NoError(t, err)
+	sx, err := kp.Seed()
+	require.NoError(t, err)
+	assert.Equal(t, "SX", string(sx[0:2]))
+
+	_, _, err = ExecuteCmd(createEditAuthorizationCallout(),
+		"--rm-auth-user", u2PK,
+		"--rm-allowed-account", a2PK,
+		"--rm-curve")
+	require.NoError(t, err)
+
+	ac, err = ts.Store.ReadAccountClaim("A")
+	require.NoError(t, err)
+	require.Contains(t, ac.Authorization.AuthUsers, uPK)
+	require.NotContains(t, ac.Authorization.AuthUsers, u2PK)
+	require.Contains(t, ac.Authorization.AllowedAccounts, aPK)
+	require.NotContains(t, ac.Authorization.AllowedAccounts, a2PK)
+	require.Empty(t, ac.Authorization.XKey)
+}
diff --git a/cmd/editoperator_test.go b/cmd/editoperator_test.go
index bf7a235..c498015 100644
--- a/cmd/editoperator_test.go
+++ b/cmd/editoperator_test.go
@@ -24,7 +24,7 @@ import (
 
 	"github.com/nats-io/jwt/v2"
 	"github.com/nats-io/nkeys"
-	"github.com/nats-io/nsc/cmd/store"
+	"github.com/nats-io/nsc/v2/cmd/store"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
diff --git a/cmd/env_test.go b/cmd/env_test.go
index 7ebb434..5079158 100644
--- a/cmd/env_test.go
+++ b/cmd/env_test.go
@@ -20,7 +20,7 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/nats-io/nsc/cmd/store"
+	"github.com/nats-io/nsc/v2/cmd/store"
 	"github.com/stretchr/testify/require"
 )
 
diff --git a/cmd/exportkeys_test.go b/cmd/exportkeys_test.go
index bdb56b6..2ac6d38 100644
--- a/cmd/exportkeys_test.go
+++ b/cmd/exportkeys_test.go
@@ -21,7 +21,7 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/nats-io/nsc/cmd/store"
+	"github.com/nats-io/nsc/v2/cmd/store"
 
 	"github.com/nats-io/nkeys"
 	"github.com/stretchr/testify/require"
@@ -108,8 +108,17 @@ func Test_ExportAllContext(t *testing.T) {
 	ts.AddAccount(t, "A")
 	ts.AddUser(t, "A", "U")
 
+	upk := ts.GetUserPublicKey(t, "AA", "UU")
+	_, _, err := ExecuteCmd(createEditAuthorizationCallout(), "--account", "AA", "--auth-user", upk, "--curve", "generate")
+	require.NoError(t, err)
+
+	ac, err := ts.Store.ReadAccountClaim("AA")
+	require.NoError(t, err)
+	xpk := ac.Authorization.XKey
+
 	exportDir := filepath.Join(ts.Dir, "export")
-	_, _, err := ExecuteCmd(createExportKeysCmd(), "--all", "--dir", exportDir)
+
+	_, _, err = ExecuteCmd(createExportKeysCmd(), "--all", "--dir", exportDir)
 	require.NoError(t, err)
 
 	opk := ts.GetOperatorPublicKey(t)
@@ -118,7 +127,6 @@ func Test_ExportAllContext(t *testing.T) {
 	apk := ts.GetAccountPublicKey(t, "A")
 	requireExportedKey(t, exportDir, apk)
 
-	upk := ts.GetUserPublicKey(t, "A", "U")
 	requireExportedKey(t, exportDir, upk)
 
 	aapk := ts.GetAccountPublicKey(t, "AA")
@@ -126,6 +134,8 @@ func Test_ExportAllContext(t *testing.T) {
 
 	uupk := ts.GetUserPublicKey(t, "AA", "UU")
 	requireExportedKey(t, exportDir, uupk)
+
+	requireExportedKey(t, exportDir, xpk)
 }
 
 func Test_ExportAccount(t *testing.T) {
@@ -188,3 +198,41 @@ func Test_ExportNoKeyStore(t *testing.T) {
 	require.Error(t, err)
 	require.Equal(t, err.Error(), fmt.Sprintf("keystore `%s` does not exist", ts.KeysDir))
 }
+
+func Test_ExportXKeyNotReferenced(t *testing.T) {
+	ts := NewEmptyStore(t)
+	defer ts.Done(t)
+
+	exportDir := filepath.Join(ts.Dir, "export")
+
+	_, xPK, kp := CreateCurveKey(t)
+	ts.KeyStore.Store(kp)
+	_, _, err := ExecuteCmd(createExportKeysCmd(), "--dir", exportDir, "--curve", xPK, "--not-referenced")
+	require.NoError(t, err)
+	requireExportedKey(t, exportDir, xPK)
+}
+
+func Test_ExportXKeyInContext(t *testing.T) {
+	ts := NewTestStore(t, "O")
+	defer ts.Done(t)
+
+	ts.AddAccount(t, "A")
+	_, uPK, _ := CreateUserKey(t)
+	_, _, err := ExecuteCmd(createEditAuthorizationCallout(), "--auth-user", uPK, "--curve", "generate")
+	require.NoError(t, err)
+
+	ac, err := ts.Store.ReadAccountClaim("A")
+	require.NoError(t, err)
+	xPK := ac.Authorization.XKey
+	require.NotEmpty(t, xPK)
+
+	exportDir := filepath.Join(ts.Dir, "export")
+	_, _, err = ExecuteCmd(createExportKeysCmd(), "--dir", exportDir, "--curves")
+	require.NoError(t, err)
+	requireExportedKey(t, exportDir, xPK)
+
+	exportDir = filepath.Join(ts.Dir, "export2")
+	_, _, err = ExecuteCmd(createExportKeysCmd(), "--dir", exportDir, "-A")
+	require.NoError(t, err)
+	requireExportedKey(t, exportDir, xPK)
+}
diff --git a/cmd/fixenv_test.go b/cmd/fixenv_test.go
index 14858d2..16a7899 100644
--- a/cmd/fixenv_test.go
+++ b/cmd/fixenv_test.go
@@ -22,7 +22,7 @@ import (
 	"time"
 
 	"github.com/nats-io/jwt/v2"
-	"github.com/nats-io/nsc/cmd/store"
+	"github.com/nats-io/nsc/v2/cmd/store"
 	"github.com/stretchr/testify/require"
 )
 
diff --git a/cmd/generatecreds_test.go b/cmd/generatecreds_test.go
index ff91edb..8db8f7b 100644
--- a/cmd/generatecreds_test.go
+++ b/cmd/generatecreds_test.go
@@ -21,7 +21,7 @@ import (
 
 	"github.com/nats-io/jwt/v2"
 
-	"github.com/nats-io/nsc/cmd/store"
+	"github.com/nats-io/nsc/v2/cmd/store"
 	"github.com/stretchr/testify/require"
 )
 
diff --git a/cmd/generatenkey_test.go b/cmd/generatenkey_test.go
index 34b73e6..bc40033 100644
--- a/cmd/generatenkey_test.go
+++ b/cmd/generatenkey_test.go
@@ -20,7 +20,7 @@ import (
 	"testing"
 
 	"github.com/nats-io/nkeys"
-	"github.com/nats-io/nsc/cmd/store"
+	"github.com/nats-io/nsc/v2/cmd/store"
 	"github.com/stretchr/testify/require"
 )
 
diff --git a/cmd/keys_test.go b/cmd/keys_test.go
index 8612885..d004b3b 100644
--- a/cmd/keys_test.go
+++ b/cmd/keys_test.go
@@ -24,7 +24,7 @@ import (
 	"github.com/nats-io/nkeys"
 	"github.com/stretchr/testify/require"
 
-	"github.com/nats-io/nsc/cmd/store"
+	"github.com/nats-io/nsc/v2/cmd/store"
 )
 
 func storeOldCreds(ts *TestStore, operator string, account string, user string, data []byte) error {
diff --git a/cmd/listkeys_test.go b/cmd/listkeys_test.go
index c4c0a68..f661ac5 100644
--- a/cmd/listkeys_test.go
+++ b/cmd/listkeys_test.go
@@ -19,7 +19,7 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/nats-io/nsc/cmd/store"
+	"github.com/nats-io/nsc/v2/cmd/store"
 
 	"github.com/stretchr/testify/require"
 )
@@ -138,3 +138,37 @@ func Test_ListKeysNoKeyStore(t *testing.T) {
 	require.Equal(t, err.Error(), fmt.Sprintf("keystore `%s` does not exist", ts.KeysDir))
 	store.KeyStorePath = old
 }
+
+func Test_listKeysAuthorizationXKey(t *testing.T) {
+	ts := NewTestStore(t, "O")
+	defer ts.Done(t)
+
+	ts.AddAccount(t, "A")
+	_, uPK, _ := CreateUserKey(t)
+	_, _, err := ExecuteCmd(createEditAuthorizationCallout(), "--auth-user", uPK, "--curve", "generate")
+	require.NoError(t, err)
+
+	ac, err := ts.Store.ReadAccountClaim("A")
+	require.NoError(t, err)
+
+	xPK := ac.Authorization.XKey
+	require.NotEmpty(t, xPK)
+
+	_, stderr, err := ExecuteCmd(createListKeysCmd(), "-A")
+	require.NoError(t, err)
+	stderr = StripTableDecorations(stderr)
+	require.Contains(t, stderr, xPK)
+
+	_, _, err = ExecuteCmd(createEditAuthorizationCallout(), "--rm-curve")
+	require.NoError(t, err)
+
+	_, stderr, err = ExecuteCmd(createListKeysCmd(), "-A")
+	require.NoError(t, err)
+	stderr = StripTableDecorations(stderr)
+	require.NotContains(t, stderr, xPK)
+
+	_, stderr, err = ExecuteCmd(createListKeysCmd(), "--not-referenced")
+	require.NoError(t, err)
+	stderr = StripTableDecorations(stderr)
+	require.Contains(t, stderr, xPK)
+}
diff --git a/cmd/memresolverconfigbuilder_test.go b/cmd/memresolverconfigbuilder_test.go
index 28eb39e..7a8b91f 100644
--- a/cmd/memresolverconfigbuilder_test.go
+++ b/cmd/memresolverconfigbuilder_test.go
@@ -24,7 +24,7 @@ import (
 	"github.com/nats-io/nats-server/v2/server"
 	"github.com/stretchr/testify/require"
 
-	"github.com/nats-io/nsc/cmd/store"
+	"github.com/nats-io/nsc/v2/cmd/store"
 )
 
 func Test_MemResolverContainsStandardProperties(t *testing.T) {
diff --git a/cmd/migrate_test.go b/cmd/migrate_test.go
index 68e891a..49f3aa4 100644
--- a/cmd/migrate_test.go
+++ b/cmd/migrate_test.go
@@ -19,7 +19,7 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/nats-io/nsc/cmd/store"
+	"github.com/nats-io/nsc/v2/cmd/store"
 	"github.com/stretchr/testify/require"
 )
 
diff --git a/cmd/nkeyconfigbuilder_test.go b/cmd/nkeyconfigbuilder_test.go
index 4a93ca9..baea53e 100644
--- a/cmd/nkeyconfigbuilder_test.go
+++ b/cmd/nkeyconfigbuilder_test.go
@@ -22,7 +22,7 @@ import (
 
 	"github.com/nats-io/jwt/v2"
 
-	"github.com/nats-io/nsc/cmd/store"
+	"github.com/nats-io/nsc/v2/cmd/store"
 	"github.com/stretchr/testify/require"
 )
 
diff --git a/cmd/select_test.go b/cmd/select_test.go
new file mode 100644
index 0000000..387b66a
--- /dev/null
+++ b/cmd/select_test.go
@@ -0,0 +1,80 @@
+/*
+ * Copyright 2018-2022 The NATS Authors
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package cmd
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/require"
+)
+
+func TestSelectAccount(t *testing.T) {
+	require := require.New(t)
+	ts := NewTestStore(t, "test")
+	defer ts.Done(t)
+
+	_, _, err := ExecuteCmd(selectAccountCmd(), "A")
+	require.NotNil(err)
+
+	ts.AddAccount(t, "A")
+	ts.AddAccount(t, "B")
+
+	_, _, err = ExecuteCmd(selectAccountCmd(), "A")
+	require.Nil(err)
+	conf := GetConfig()
+	require.Equal(conf.Account, "A")
+
+	_, _, err = ExecuteCmd(selectAccountCmd(), "B")
+	require.Nil(err)
+	conf = GetConfig()
+	require.Equal(conf.Account, "B")
+
+	_, _, err = ExecuteCmd(selectAccountCmd(), "NO")
+	require.NotNil(err)
+	require.Contains(err.Error(), "\"NO\" not in accounts for operator")
+
+	conf = GetConfig()
+	require.Equal(conf.Account, "B")
+}
+
+func TestSelectOperator(t *testing.T) {
+	require := require.New(t)
+	ts := NewTestStore(t, "test")
+	defer ts.Done(t)
+
+	_, _, err := ExecuteCmd(selectOperatorCmd(), "test")
+	require.Nil(err)
+
+	ts.AddOperator(t, "test2")
+	ts.AddOperator(t, "test3")
+
+	_, _, err = ExecuteCmd(selectOperatorCmd(), "test2")
+	require.Nil(err)
+	conf := GetConfig()
+	require.Equal(conf.Operator, "test2")
+
+	_, _, err = ExecuteCmd(selectOperatorCmd(), "test3")
+	require.Nil(err)
+	conf = GetConfig()
+	require.Equal(conf.Operator, "test3")
+
+	_, _, err = ExecuteCmd(selectOperatorCmd(), "NO")
+	require.NotNil(err)
+	require.Contains(err.Error(), "operator \"NO\" not in")
+
+	conf = GetConfig()
+	require.Equal(conf.Operator, "test3")
+}
diff --git a/cmd/signerparams_test.go b/cmd/signerparams_test.go
index ca27cfa..df7a309 100644
--- a/cmd/signerparams_test.go
+++ b/cmd/signerparams_test.go
@@ -21,10 +21,11 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/nats-io/nsc/cmd/store"
+	"github.com/nats-io/nsc/v2/cmd/store"
 
-	"github.com/mitchellh/go-homedir"
 	"github.com/nats-io/nkeys"
+
+	"github.com/mitchellh/go-homedir"
 	"github.com/spf13/cobra"
 	"github.com/stretchr/testify/require"
 )
diff --git a/cmd/store/keys_test.go b/cmd/store/keys_test.go
index 9588f07..86cdfe6 100644
--- a/cmd/store/keys_test.go
+++ b/cmd/store/keys_test.go
@@ -20,9 +20,8 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/nats-io/nsc/home"
-
 	"github.com/nats-io/nkeys"
+	"github.com/nats-io/nsc/v2/home"
 	"github.com/stretchr/testify/require"
 )
 
diff --git a/cmd/upgradejwt_test.go b/cmd/upgradejwt_test.go
index 8a344a2..5cbf990 100644
--- a/cmd/upgradejwt_test.go
+++ b/cmd/upgradejwt_test.go
@@ -28,7 +28,7 @@ import (
 	"github.com/nats-io/nkeys"
 	"github.com/stretchr/testify/require"
 
-	"github.com/nats-io/nsc/cmd/store"
+	"github.com/nats-io/nsc/v2/cmd/store"
 )
 
 func storeOperatorKey(t *testing.T, ts *TestStore, kp nkeys.KeyPair) {
diff --git a/cmd/util_test.go b/cmd/util_test.go
index e5722f1..8603528 100644
--- a/cmd/util_test.go
+++ b/cmd/util_test.go
@@ -38,7 +38,7 @@ import (
 	"github.com/nats-io/nkeys"
 	"github.com/stretchr/testify/require"
 
-	"github.com/nats-io/nsc/cmd/store"
+	"github.com/nats-io/nsc/v2/cmd/store"
 )
 
 type TestStore struct {
@@ -382,6 +382,10 @@ func CreateOperatorKey(t *testing.T) (seed []byte, pub string, kp nkeys.KeyPair)
 	return CreateNkey(t, nkeys.PrefixByteOperator)
 }
 
+func CreateCurveKey(t *testing.T) (seed []byte, pub string, kp nkeys.KeyPair) {
+	return CreateNkey(t, nkeys.PrefixByteCurve)
+}
+
 func CreateNkey(t *testing.T, kind nkeys.PrefixByte) ([]byte, string, nkeys.KeyPair) {
 	kp, err := nkeys.CreatePair(kind)
 	require.NoError(t, err)
diff --git a/cmd/validate_test.go b/cmd/validate_test.go
index 0b0bc48..f81024a 100644
--- a/cmd/validate_test.go
+++ b/cmd/validate_test.go
@@ -20,7 +20,7 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/nats-io/nsc/cmd/store"
+	"github.com/nats-io/nsc/v2/cmd/store"
 	"github.com/stretchr/testify/require"
 )