diff --git a/packages/cli/README.md b/packages/cli/README.md
index 2e35bba97..7815f0461 100644
--- a/packages/cli/README.md
+++ b/packages/cli/README.md
@@ -156,9 +156,10 @@ that maps to that hierarchy.
 * [`smartthings rules:delete [ID]`](#smartthings-rulesdelete-id)
 * [`smartthings rules:update [ID]`](#smartthings-rulesupdate-id)
 * [`smartthings schema [ID]`](#smartthings-schema-id)
+* [`smartthings schema:authorize ARN`](#smartthings-schemaauthorize-arn)
 * [`smartthings schema:create`](#smartthings-schemacreate)
 * [`smartthings schema:delete [ID]`](#smartthings-schemadelete-id)
-* [`smartthings schema:update ID`](#smartthings-schemaupdate-id)
+* [`smartthings schema:update [ID]`](#smartthings-schemaupdate-id)
 
 ## `smartthings apps [ID]`
 
@@ -172,19 +173,27 @@ ARGUMENTS
   ID  the app id or number from list
 
 OPTIONS
-  -h, --help             show CLI help
-  -j, --json             use JSON format of input and/or output
-  -o, --output=output    specify output file
-  -p, --profile=profile  [default: default] configuration profile
-  -t, --token=token      the auth token to use
-  -v, --verbose          include URLs and ARNs in table output
-  -y, --yaml             use YAML format of input and/or output
-  --compact              use compact table format with no lines between body rows
-  --expanded             use expanded table format with a line between each body row
-  --indent=indent        specify indentation for formatting JSON or YAML output
+  -h, --help                       show CLI help
+  -j, --json                       use JSON format of input and/or output
+  -o, --output=output              specify output file
+  -p, --profile=profile            [default: default] configuration profile
+  -t, --token=token                the auth token to use
+  -v, --verbose                    include URLs and ARNs in table output
+  -y, --yaml                       use YAML format of input and/or output
+
+  --classification=classification  filter results by one or more classifications, AUTOMATION, SERVICE, DEVICE,
+                                   CONNECTED_SERVICE
+
+  --compact                        use compact table format with no lines between body rows
+
+  --expanded                       use expanded table format with a line between each body row
+
+  --indent=indent                  specify indentation for formatting JSON or YAML output
+
+  --type=type                      filter results by appType, WEBHOOK_SMART_APP, LAMBDA_SMART_APP, API_ONLY
 ```
 
-_See code: [dist/commands/apps.ts](https://github.com/SmartThingsCommunity/smartthings-cli/blob/v0.0.0-pre.8/dist/commands/apps.ts)_
+_See code: [dist/commands/apps.ts](https://github.com/SmartThingsCommunity/smartthings-cli/blob/v0.0.0-pre.10/dist/commands/apps.ts)_
 
 ## `smartthings apps:authorize ARN`
 
@@ -198,9 +207,11 @@ ARGUMENTS
   ARN  the ARN of the AWS Lambda function
 
 OPTIONS
-  -h, --help             show CLI help
-  -p, --profile=profile  [default: default] configuration profile
-  -t, --token=token      the auth token to use
+  -h, --help                   show CLI help
+  -p, --profile=profile        [default: default] configuration profile
+  -t, --token=token            the auth token to use
+  --principal=principal        use this principal instead of the default when authorizing lambda functions
+  --statement-id=statement-id  use this statement id instead of the default when authorizing lambda functions
 
 EXAMPLES
   $ smartthings apps:authorize arn:aws:lambda:us-east-1:1234567890:function:your-test-app
@@ -214,7 +225,7 @@ EXAMPLES
   It requires your machine to be configured to run the AWS CLI
 ```
 
-_See code: [dist/commands/apps/authorize.ts](https://github.com/SmartThingsCommunity/smartthings-cli/blob/v0.0.0-pre.8/dist/commands/apps/authorize.ts)_
+_See code: [dist/commands/apps/authorize.ts](https://github.com/SmartThingsCommunity/smartthings-cli/blob/v0.0.0-pre.10/dist/commands/apps/authorize.ts)_
 
 ## `smartthings apps:create`
 
@@ -225,21 +236,23 @@ USAGE
   $ smartthings apps:create
 
 OPTIONS
-  -d, --dry-run          produce JSON but don't actually submit
-  -h, --help             show CLI help
-  -i, --input=input      specify input file
-  -j, --json             use JSON format of input and/or output
-  -o, --output=output    specify output file
-  -p, --profile=profile  [default: default] configuration profile
-  -t, --token=token      the auth token to use
-  -y, --yaml             use YAML format of input and/or output
-  --authorize            authorize Lambda functions to be called by SmartThings
-  --compact              use compact table format with no lines between body rows
-  --expanded             use expanded table format with a line between each body row
-  --indent=indent        specify indentation for formatting JSON or YAML output
+  -d, --dry-run                produce JSON but don't actually submit
+  -h, --help                   show CLI help
+  -i, --input=input            specify input file
+  -j, --json                   use JSON format of input and/or output
+  -o, --output=output          specify output file
+  -p, --profile=profile        [default: default] configuration profile
+  -t, --token=token            the auth token to use
+  -y, --yaml                   use YAML format of input and/or output
+  --authorize                  authorize Lambda functions to be called by SmartThings
+  --compact                    use compact table format with no lines between body rows
+  --expanded                   use expanded table format with a line between each body row
+  --indent=indent              specify indentation for formatting JSON or YAML output
+  --principal=principal        use this principal instead of the default when authorizing lambda functions
+  --statement-id=statement-id  use this statement id instead of the default when authorizing lambda functions
 ```
 
-_See code: [dist/commands/apps/create.ts](https://github.com/SmartThingsCommunity/smartthings-cli/blob/v0.0.0-pre.8/dist/commands/apps/create.ts)_
+_See code: [dist/commands/apps/create.ts](https://github.com/SmartThingsCommunity/smartthings-cli/blob/v0.0.0-pre.10/dist/commands/apps/create.ts)_
 
 ## `smartthings apps:delete [ID]`
 
@@ -258,7 +271,7 @@ OPTIONS
   -t, --token=token      the auth token to use
 ```
 
-_See code: [dist/commands/apps/delete.ts](https://github.com/SmartThingsCommunity/smartthings-cli/blob/v0.0.0-pre.8/dist/commands/apps/delete.ts)_
+_See code: [dist/commands/apps/delete.ts](https://github.com/SmartThingsCommunity/smartthings-cli/blob/v0.0.0-pre.10/dist/commands/apps/delete.ts)_
 
 ## `smartthings apps:oauth [ID]`
 
@@ -283,7 +296,7 @@ OPTIONS
   --indent=indent        specify indentation for formatting JSON or YAML output
 ```
 
-_See code: [dist/commands/apps/oauth.ts](https://github.com/SmartThingsCommunity/smartthings-cli/blob/v0.0.0-pre.8/dist/commands/apps/oauth.ts)_
+_See code: [dist/commands/apps/oauth.ts](https://github.com/SmartThingsCommunity/smartthings-cli/blob/v0.0.0-pre.10/dist/commands/apps/oauth.ts)_
 
 ## `smartthings apps:oauth:generate [ID]`
 
@@ -309,7 +322,7 @@ OPTIONS
   --indent=indent        specify indentation for formatting JSON or YAML output
 ```
 
-_See code: [dist/commands/apps/oauth/generate.ts](https://github.com/SmartThingsCommunity/smartthings-cli/blob/v0.0.0-pre.8/dist/commands/apps/oauth/generate.ts)_
+_See code: [dist/commands/apps/oauth/generate.ts](https://github.com/SmartThingsCommunity/smartthings-cli/blob/v0.0.0-pre.10/dist/commands/apps/oauth/generate.ts)_
 
 ## `smartthings apps:oauth:update [ID]`
 
@@ -335,11 +348,11 @@ OPTIONS
   --indent=indent        specify indentation for formatting JSON or YAML output
 ```
 
-_See code: [dist/commands/apps/oauth/update.ts](https://github.com/SmartThingsCommunity/smartthings-cli/blob/v0.0.0-pre.8/dist/commands/apps/oauth/update.ts)_
+_See code: [dist/commands/apps/oauth/update.ts](https://github.com/SmartThingsCommunity/smartthings-cli/blob/v0.0.0-pre.10/dist/commands/apps/oauth/update.ts)_
 
 ## `smartthings apps:register [ID]`
 
-register the app
+Send request to app target URL to confirm existence and authorize lifecycle events
 
 ```
 USAGE
@@ -354,7 +367,7 @@ OPTIONS
   -t, --token=token      the auth token to use
 ```
 
-_See code: [dist/commands/apps/register.ts](https://github.com/SmartThingsCommunity/smartthings-cli/blob/v0.0.0-pre.8/dist/commands/apps/register.ts)_
+_See code: [dist/commands/apps/register.ts](https://github.com/SmartThingsCommunity/smartthings-cli/blob/v0.0.0-pre.10/dist/commands/apps/register.ts)_
 
 ## `smartthings apps:settings [ID]`
 
@@ -379,7 +392,7 @@ OPTIONS
   --indent=indent        specify indentation for formatting JSON or YAML output
 ```
 
-_See code: [dist/commands/apps/settings.ts](https://github.com/SmartThingsCommunity/smartthings-cli/blob/v0.0.0-pre.8/dist/commands/apps/settings.ts)_
+_See code: [dist/commands/apps/settings.ts](https://github.com/SmartThingsCommunity/smartthings-cli/blob/v0.0.0-pre.10/dist/commands/apps/settings.ts)_
 
 ## `smartthings apps:settings:update [ID]`
 
@@ -405,7 +418,7 @@ OPTIONS
   --indent=indent        specify indentation for formatting JSON or YAML output
 ```
 
-_See code: [dist/commands/apps/settings/update.ts](https://github.com/SmartThingsCommunity/smartthings-cli/blob/v0.0.0-pre.8/dist/commands/apps/settings/update.ts)_
+_See code: [dist/commands/apps/settings/update.ts](https://github.com/SmartThingsCommunity/smartthings-cli/blob/v0.0.0-pre.10/dist/commands/apps/settings/update.ts)_
 
 ## `smartthings apps:update [ID]`
 
@@ -419,20 +432,22 @@ ARGUMENTS
   ID  the app id
 
 OPTIONS
-  -h, --help             show CLI help
-  -i, --input=input      specify input file
-  -j, --json             use JSON format of input and/or output
-  -o, --output=output    specify output file
-  -p, --profile=profile  [default: default] configuration profile
-  -t, --token=token      the auth token to use
-  -y, --yaml             use YAML format of input and/or output
-  --authorize            authorize Lambda functions to be called by SmartThings
-  --compact              use compact table format with no lines between body rows
-  --expanded             use expanded table format with a line between each body row
-  --indent=indent        specify indentation for formatting JSON or YAML output
+  -h, --help                   show CLI help
+  -i, --input=input            specify input file
+  -j, --json                   use JSON format of input and/or output
+  -o, --output=output          specify output file
+  -p, --profile=profile        [default: default] configuration profile
+  -t, --token=token            the auth token to use
+  -y, --yaml                   use YAML format of input and/or output
+  --authorize                  authorize Lambda functions to be called by SmartThings
+  --compact                    use compact table format with no lines between body rows
+  --expanded                   use expanded table format with a line between each body row
+  --indent=indent              specify indentation for formatting JSON or YAML output
+  --principal=principal        use this principal instead of the default when authorizing lambda functions
+  --statement-id=statement-id  use this statement id instead of the default when authorizing lambda functions
 ```
 
-_See code: [dist/commands/apps/update.ts](https://github.com/SmartThingsCommunity/smartthings-cli/blob/v0.0.0-pre.8/dist/commands/apps/update.ts)_
+_See code: [dist/commands/apps/update.ts](https://github.com/SmartThingsCommunity/smartthings-cli/blob/v0.0.0-pre.10/dist/commands/apps/update.ts)_
 
 ## `smartthings autocomplete [SHELL]`
 
@@ -483,7 +498,7 @@ OPTIONS
   --indent=indent            specify indentation for formatting JSON or YAML output
 ```
 
-_See code: [dist/commands/capabilities.ts](https://github.com/SmartThingsCommunity/smartthings-cli/blob/v0.0.0-pre.8/dist/commands/capabilities.ts)_
+_See code: [dist/commands/capabilities.ts](https://github.com/SmartThingsCommunity/smartthings-cli/blob/v0.0.0-pre.10/dist/commands/capabilities.ts)_
 
 ## `smartthings capabilities:create`
 
@@ -508,7 +523,7 @@ OPTIONS
   --indent=indent            specify indentation for formatting JSON or YAML output
 ```
 
-_See code: [dist/commands/capabilities/create.ts](https://github.com/SmartThingsCommunity/smartthings-cli/blob/v0.0.0-pre.8/dist/commands/capabilities/create.ts)_
+_See code: [dist/commands/capabilities/create.ts](https://github.com/SmartThingsCommunity/smartthings-cli/blob/v0.0.0-pre.10/dist/commands/capabilities/create.ts)_
 
 ## `smartthings capabilities:delete [ID] [VERSION]`
 
@@ -528,7 +543,7 @@ OPTIONS
   -t, --token=token      the auth token to use
 ```
 
-_See code: [dist/commands/capabilities/delete.ts](https://github.com/SmartThingsCommunity/smartthings-cli/blob/v0.0.0-pre.8/dist/commands/capabilities/delete.ts)_
+_See code: [dist/commands/capabilities/delete.ts](https://github.com/SmartThingsCommunity/smartthings-cli/blob/v0.0.0-pre.10/dist/commands/capabilities/delete.ts)_
 
 ## `smartthings capabilities:namespaces`
 
@@ -550,7 +565,7 @@ OPTIONS
   --indent=indent        specify indentation for formatting JSON or YAML output
 ```
 
-_See code: [dist/commands/capabilities/namespaces.ts](https://github.com/SmartThingsCommunity/smartthings-cli/blob/v0.0.0-pre.8/dist/commands/capabilities/namespaces.ts)_
+_See code: [dist/commands/capabilities/namespaces.ts](https://github.com/SmartThingsCommunity/smartthings-cli/blob/v0.0.0-pre.10/dist/commands/capabilities/namespaces.ts)_
 
 ## `smartthings capabilities:presentation [ID] [VERSION]`
 
@@ -577,7 +592,7 @@ OPTIONS
   --indent=indent            specify indentation for formatting JSON or YAML output
 ```
 
-_See code: [dist/commands/capabilities/presentation.ts](https://github.com/SmartThingsCommunity/smartthings-cli/blob/v0.0.0-pre.8/dist/commands/capabilities/presentation.ts)_
+_See code: [dist/commands/capabilities/presentation.ts](https://github.com/SmartThingsCommunity/smartthings-cli/blob/v0.0.0-pre.10/dist/commands/capabilities/presentation.ts)_
 
 ## `smartthings capabilities:presentation:create [ID] [VERSION]`
 
@@ -604,7 +619,7 @@ OPTIONS
   --indent=indent        specify indentation for formatting JSON or YAML output
 ```
 
-_See code: [dist/commands/capabilities/presentation/create.ts](https://github.com/SmartThingsCommunity/smartthings-cli/blob/v0.0.0-pre.8/dist/commands/capabilities/presentation/create.ts)_
+_See code: [dist/commands/capabilities/presentation/create.ts](https://github.com/SmartThingsCommunity/smartthings-cli/blob/v0.0.0-pre.10/dist/commands/capabilities/presentation/create.ts)_
 
 ## `smartthings capabilities:presentation:update [ID] [VERSION]`
 
@@ -631,7 +646,7 @@ OPTIONS
   --indent=indent        specify indentation for formatting JSON or YAML output
 ```
 
-_See code: [dist/commands/capabilities/presentation/update.ts](https://github.com/SmartThingsCommunity/smartthings-cli/blob/v0.0.0-pre.8/dist/commands/capabilities/presentation/update.ts)_
+_See code: [dist/commands/capabilities/presentation/update.ts](https://github.com/SmartThingsCommunity/smartthings-cli/blob/v0.0.0-pre.10/dist/commands/capabilities/presentation/update.ts)_
 
 ## `smartthings capabilities:update [ID] [VERSION]`
 
@@ -658,7 +673,7 @@ OPTIONS
   --indent=indent        specify indentation for formatting JSON or YAML output
 ```
 
-_See code: [dist/commands/capabilities/update.ts](https://github.com/SmartThingsCommunity/smartthings-cli/blob/v0.0.0-pre.8/dist/commands/capabilities/update.ts)_
+_See code: [dist/commands/capabilities/update.ts](https://github.com/SmartThingsCommunity/smartthings-cli/blob/v0.0.0-pre.10/dist/commands/capabilities/update.ts)_
 
 ## `smartthings config [NAME]`
 
@@ -684,7 +699,7 @@ OPTIONS
   --indent=indent        specify indentation for formatting JSON or YAML output
 ```
 
-_See code: [dist/commands/config.ts](https://github.com/SmartThingsCommunity/smartthings-cli/blob/v0.0.0-pre.8/dist/commands/config.ts)_
+_See code: [dist/commands/config.ts](https://github.com/SmartThingsCommunity/smartthings-cli/blob/v0.0.0-pre.10/dist/commands/config.ts)_
 
 ## `smartthings deviceprofiles [ID]`
 
@@ -721,7 +736,7 @@ EXAMPLES
   $ smartthings deviceprofiles 4 -j -o profile.json # write the profile to the file "profile.json"
 ```
 
-_See code: [dist/commands/deviceprofiles.ts](https://github.com/SmartThingsCommunity/smartthings-cli/blob/v0.0.0-pre.8/dist/commands/deviceprofiles.ts)_
+_See code: [dist/commands/deviceprofiles.ts](https://github.com/SmartThingsCommunity/smartthings-cli/blob/v0.0.0-pre.10/dist/commands/deviceprofiles.ts)_
 
 ## `smartthings deviceprofiles:create`
 
@@ -755,7 +770,7 @@ EXAMPLES
   $ smartthings deviceprofiles:create                      # create a device profile with interactive dialog
 ```
 
-_See code: [dist/commands/deviceprofiles/create.ts](https://github.com/SmartThingsCommunity/smartthings-cli/blob/v0.0.0-pre.8/dist/commands/deviceprofiles/create.ts)_
+_See code: [dist/commands/deviceprofiles/create.ts](https://github.com/SmartThingsCommunity/smartthings-cli/blob/v0.0.0-pre.10/dist/commands/deviceprofiles/create.ts)_
 
 ## `smartthings deviceprofiles:delete [ID]`
 
@@ -778,7 +793,7 @@ EXAMPLES
   $ smartthings deviceprofiles:delete 5                                     # delete the 5th profile in the list
 ```
 
-_See code: [dist/commands/deviceprofiles/delete.ts](https://github.com/SmartThingsCommunity/smartthings-cli/blob/v0.0.0-pre.8/dist/commands/deviceprofiles/delete.ts)_
+_See code: [dist/commands/deviceprofiles/delete.ts](https://github.com/SmartThingsCommunity/smartthings-cli/blob/v0.0.0-pre.10/dist/commands/deviceprofiles/delete.ts)_
 
 ## `smartthings deviceprofiles:device-config [ID]`
 
@@ -803,7 +818,7 @@ OPTIONS
   --indent=indent        specify indentation for formatting JSON or YAML output
 ```
 
-_See code: [dist/commands/deviceprofiles/device-config.ts](https://github.com/SmartThingsCommunity/smartthings-cli/blob/v0.0.0-pre.8/dist/commands/deviceprofiles/device-config.ts)_
+_See code: [dist/commands/deviceprofiles/device-config.ts](https://github.com/SmartThingsCommunity/smartthings-cli/blob/v0.0.0-pre.10/dist/commands/deviceprofiles/device-config.ts)_
 
 ## `smartthings deviceprofiles:presentation [ID]`
 
@@ -828,7 +843,7 @@ OPTIONS
   --indent=indent        specify indentation for formatting JSON or YAML output
 ```
 
-_See code: [dist/commands/deviceprofiles/presentation.ts](https://github.com/SmartThingsCommunity/smartthings-cli/blob/v0.0.0-pre.8/dist/commands/deviceprofiles/presentation.ts)_
+_See code: [dist/commands/deviceprofiles/presentation.ts](https://github.com/SmartThingsCommunity/smartthings-cli/blob/v0.0.0-pre.10/dist/commands/deviceprofiles/presentation.ts)_
 
 ## `smartthings deviceprofiles:publish [ID]`
 
@@ -853,7 +868,7 @@ OPTIONS
   --indent=indent        specify indentation for formatting JSON or YAML output
 ```
 
-_See code: [dist/commands/deviceprofiles/publish.ts](https://github.com/SmartThingsCommunity/smartthings-cli/blob/v0.0.0-pre.8/dist/commands/deviceprofiles/publish.ts)_
+_See code: [dist/commands/deviceprofiles/publish.ts](https://github.com/SmartThingsCommunity/smartthings-cli/blob/v0.0.0-pre.10/dist/commands/deviceprofiles/publish.ts)_
 
 ## `smartthings deviceprofiles:update [ID]`
 
@@ -879,7 +894,7 @@ OPTIONS
   --indent=indent        specify indentation for formatting JSON or YAML output
 ```
 
-_See code: [dist/commands/deviceprofiles/update.ts](https://github.com/SmartThingsCommunity/smartthings-cli/blob/v0.0.0-pre.8/dist/commands/deviceprofiles/update.ts)_
+_See code: [dist/commands/deviceprofiles/update.ts](https://github.com/SmartThingsCommunity/smartthings-cli/blob/v0.0.0-pre.10/dist/commands/deviceprofiles/update.ts)_
 
 ## `smartthings deviceprofiles:view [ID]`
 
@@ -904,7 +919,7 @@ OPTIONS
   --indent=indent        specify indentation for formatting JSON or YAML output
 ```
 
-_See code: [dist/commands/deviceprofiles/view.ts](https://github.com/SmartThingsCommunity/smartthings-cli/blob/v0.0.0-pre.8/dist/commands/deviceprofiles/view.ts)_
+_See code: [dist/commands/deviceprofiles/view.ts](https://github.com/SmartThingsCommunity/smartthings-cli/blob/v0.0.0-pre.10/dist/commands/deviceprofiles/view.ts)_
 
 ## `smartthings deviceprofiles:view:create`
 
@@ -955,7 +970,7 @@ EXAMPLES
          - capability: switch
 ```
 
-_See code: [dist/commands/deviceprofiles/view/create.ts](https://github.com/SmartThingsCommunity/smartthings-cli/blob/v0.0.0-pre.8/dist/commands/deviceprofiles/view/create.ts)_
+_See code: [dist/commands/deviceprofiles/view/create.ts](https://github.com/SmartThingsCommunity/smartthings-cli/blob/v0.0.0-pre.10/dist/commands/deviceprofiles/view/create.ts)_
 
 ## `smartthings deviceprofiles:view:update [ID]`
 
@@ -1011,7 +1026,7 @@ EXAMPLES
          - capability: switch
 ```
 
-_See code: [dist/commands/deviceprofiles/view/update.ts](https://github.com/SmartThingsCommunity/smartthings-cli/blob/v0.0.0-pre.8/dist/commands/deviceprofiles/view/update.ts)_
+_See code: [dist/commands/deviceprofiles/view/update.ts](https://github.com/SmartThingsCommunity/smartthings-cli/blob/v0.0.0-pre.10/dist/commands/deviceprofiles/view/update.ts)_
 
 ## `smartthings devices [ID]`
 
@@ -1055,7 +1070,7 @@ OPTIONS
   --indent=indent                 specify indentation for formatting JSON or YAML output
 ```
 
-_See code: [dist/commands/devices.ts](https://github.com/SmartThingsCommunity/smartthings-cli/blob/v0.0.0-pre.8/dist/commands/devices.ts)_
+_See code: [dist/commands/devices.ts](https://github.com/SmartThingsCommunity/smartthings-cli/blob/v0.0.0-pre.10/dist/commands/devices.ts)_
 
 ## `smartthings devices:capability-status [ID] [COMPONENT] [CAPABILITY]`
 
@@ -1082,7 +1097,7 @@ OPTIONS
   --indent=indent        specify indentation for formatting JSON or YAML output
 ```
 
-_See code: [dist/commands/devices/capability-status.ts](https://github.com/SmartThingsCommunity/smartthings-cli/blob/v0.0.0-pre.8/dist/commands/devices/capability-status.ts)_
+_See code: [dist/commands/devices/capability-status.ts](https://github.com/SmartThingsCommunity/smartthings-cli/blob/v0.0.0-pre.10/dist/commands/devices/capability-status.ts)_
 
 ## `smartthings devices:commands [ID] [COMMAND]`
 
@@ -1109,7 +1124,7 @@ OPTIONS
   --indent=indent        specify indentation for formatting JSON or YAML output
 ```
 
-_See code: [dist/commands/devices/commands.ts](https://github.com/SmartThingsCommunity/smartthings-cli/blob/v0.0.0-pre.8/dist/commands/devices/commands.ts)_
+_See code: [dist/commands/devices/commands.ts](https://github.com/SmartThingsCommunity/smartthings-cli/blob/v0.0.0-pre.10/dist/commands/devices/commands.ts)_
 
 ## `smartthings devices:component-status [ID] [COMPONENT]`
 
@@ -1135,7 +1150,7 @@ OPTIONS
   --indent=indent        specify indentation for formatting JSON or YAML output
 ```
 
-_See code: [dist/commands/devices/component-status.ts](https://github.com/SmartThingsCommunity/smartthings-cli/blob/v0.0.0-pre.8/dist/commands/devices/component-status.ts)_
+_See code: [dist/commands/devices/component-status.ts](https://github.com/SmartThingsCommunity/smartthings-cli/blob/v0.0.0-pre.10/dist/commands/devices/component-status.ts)_
 
 ## `smartthings devices:delete [ID]`
 
@@ -1154,7 +1169,7 @@ OPTIONS
   -t, --token=token      the auth token to use
 ```
 
-_See code: [dist/commands/devices/delete.ts](https://github.com/SmartThingsCommunity/smartthings-cli/blob/v0.0.0-pre.8/dist/commands/devices/delete.ts)_
+_See code: [dist/commands/devices/delete.ts](https://github.com/SmartThingsCommunity/smartthings-cli/blob/v0.0.0-pre.10/dist/commands/devices/delete.ts)_
 
 ## `smartthings devices:health [ID]`
 
@@ -1179,7 +1194,7 @@ OPTIONS
   --indent=indent        specify indentation for formatting JSON or YAML output
 ```
 
-_See code: [dist/commands/devices/health.ts](https://github.com/SmartThingsCommunity/smartthings-cli/blob/v0.0.0-pre.8/dist/commands/devices/health.ts)_
+_See code: [dist/commands/devices/health.ts](https://github.com/SmartThingsCommunity/smartthings-cli/blob/v0.0.0-pre.10/dist/commands/devices/health.ts)_
 
 ## `smartthings devices:presentation [ID]`
 
@@ -1204,7 +1219,7 @@ OPTIONS
   --indent=indent        specify indentation for formatting JSON or YAML output
 ```
 
-_See code: [dist/commands/devices/presentation.ts](https://github.com/SmartThingsCommunity/smartthings-cli/blob/v0.0.0-pre.8/dist/commands/devices/presentation.ts)_
+_See code: [dist/commands/devices/presentation.ts](https://github.com/SmartThingsCommunity/smartthings-cli/blob/v0.0.0-pre.10/dist/commands/devices/presentation.ts)_
 
 ## `smartthings devices:rename [ID] [LABEL]`
 
@@ -1230,7 +1245,7 @@ OPTIONS
   --indent=indent        specify indentation for formatting JSON or YAML output
 ```
 
-_See code: [dist/commands/devices/rename.ts](https://github.com/SmartThingsCommunity/smartthings-cli/blob/v0.0.0-pre.8/dist/commands/devices/rename.ts)_
+_See code: [dist/commands/devices/rename.ts](https://github.com/SmartThingsCommunity/smartthings-cli/blob/v0.0.0-pre.10/dist/commands/devices/rename.ts)_
 
 ## `smartthings devices:status [ID]`
 
@@ -1255,7 +1270,7 @@ OPTIONS
   --indent=indent        specify indentation for formatting JSON or YAML output
 ```
 
-_See code: [dist/commands/devices/status.ts](https://github.com/SmartThingsCommunity/smartthings-cli/blob/v0.0.0-pre.8/dist/commands/devices/status.ts)_
+_See code: [dist/commands/devices/status.ts](https://github.com/SmartThingsCommunity/smartthings-cli/blob/v0.0.0-pre.10/dist/commands/devices/status.ts)_
 
 ## `smartthings devices:update [ID]`
 
@@ -1281,7 +1296,7 @@ OPTIONS
   --indent=indent        specify indentation for formatting JSON or YAML output
 ```
 
-_See code: [dist/commands/devices/update.ts](https://github.com/SmartThingsCommunity/smartthings-cli/blob/v0.0.0-pre.8/dist/commands/devices/update.ts)_
+_See code: [dist/commands/devices/update.ts](https://github.com/SmartThingsCommunity/smartthings-cli/blob/v0.0.0-pre.10/dist/commands/devices/update.ts)_
 
 ## `smartthings generate:java`
 
@@ -1296,7 +1311,7 @@ OPTIONS
   -p, --profile=profile  [default: default] configuration profile
 ```
 
-_See code: [dist/commands/generate/java.ts](https://github.com/SmartThingsCommunity/smartthings-cli/blob/v0.0.0-pre.8/dist/commands/generate/java.ts)_
+_See code: [dist/commands/generate/java.ts](https://github.com/SmartThingsCommunity/smartthings-cli/blob/v0.0.0-pre.10/dist/commands/generate/java.ts)_
 
 ## `smartthings generate:node`
 
@@ -1311,7 +1326,7 @@ OPTIONS
   -p, --profile=profile  [default: default] configuration profile
 ```
 
-_See code: [dist/commands/generate/node.ts](https://github.com/SmartThingsCommunity/smartthings-cli/blob/v0.0.0-pre.8/dist/commands/generate/node.ts)_
+_See code: [dist/commands/generate/node.ts](https://github.com/SmartThingsCommunity/smartthings-cli/blob/v0.0.0-pre.10/dist/commands/generate/node.ts)_
 
 ## `smartthings help [COMMAND]`
 
@@ -1354,7 +1369,7 @@ OPTIONS
   --indent=indent        specify indentation for formatting JSON or YAML output
 ```
 
-_See code: [dist/commands/installedapps.ts](https://github.com/SmartThingsCommunity/smartthings-cli/blob/v0.0.0-pre.8/dist/commands/installedapps.ts)_
+_See code: [dist/commands/installedapps.ts](https://github.com/SmartThingsCommunity/smartthings-cli/blob/v0.0.0-pre.10/dist/commands/installedapps.ts)_
 
 ## `smartthings installedapps:delete [ID]`
 
@@ -1373,7 +1388,7 @@ OPTIONS
   -t, --token=token      the auth token to use
 ```
 
-_See code: [dist/commands/installedapps/delete.ts](https://github.com/SmartThingsCommunity/smartthings-cli/blob/v0.0.0-pre.8/dist/commands/installedapps/delete.ts)_
+_See code: [dist/commands/installedapps/delete.ts](https://github.com/SmartThingsCommunity/smartthings-cli/blob/v0.0.0-pre.10/dist/commands/installedapps/delete.ts)_
 
 ## `smartthings installedapps:rename [ID] [NAME]`
 
@@ -1399,7 +1414,7 @@ OPTIONS
   --indent=indent        specify indentation for formatting JSON or YAML output
 ```
 
-_See code: [dist/commands/installedapps/rename.ts](https://github.com/SmartThingsCommunity/smartthings-cli/blob/v0.0.0-pre.8/dist/commands/installedapps/rename.ts)_
+_See code: [dist/commands/installedapps/rename.ts](https://github.com/SmartThingsCommunity/smartthings-cli/blob/v0.0.0-pre.10/dist/commands/installedapps/rename.ts)_
 
 ## `smartthings locations [IDORINDEX]`
 
@@ -1424,7 +1439,7 @@ OPTIONS
   --indent=indent        specify indentation for formatting JSON or YAML output
 ```
 
-_See code: [dist/commands/locations.ts](https://github.com/SmartThingsCommunity/smartthings-cli/blob/v0.0.0-pre.8/dist/commands/locations.ts)_
+_See code: [dist/commands/locations.ts](https://github.com/SmartThingsCommunity/smartthings-cli/blob/v0.0.0-pre.10/dist/commands/locations.ts)_
 
 ## `smartthings locations:create`
 
@@ -1448,7 +1463,7 @@ OPTIONS
   --indent=indent        specify indentation for formatting JSON or YAML output
 ```
 
-_See code: [dist/commands/locations/create.ts](https://github.com/SmartThingsCommunity/smartthings-cli/blob/v0.0.0-pre.8/dist/commands/locations/create.ts)_
+_See code: [dist/commands/locations/create.ts](https://github.com/SmartThingsCommunity/smartthings-cli/blob/v0.0.0-pre.10/dist/commands/locations/create.ts)_
 
 ## `smartthings locations:delete [ID]`
 
@@ -1467,7 +1482,7 @@ OPTIONS
   -t, --token=token      the auth token to use
 ```
 
-_See code: [dist/commands/locations/delete.ts](https://github.com/SmartThingsCommunity/smartthings-cli/blob/v0.0.0-pre.8/dist/commands/locations/delete.ts)_
+_See code: [dist/commands/locations/delete.ts](https://github.com/SmartThingsCommunity/smartthings-cli/blob/v0.0.0-pre.10/dist/commands/locations/delete.ts)_
 
 ## `smartthings locations:rooms [IDORINDEX]`
 
@@ -1496,7 +1511,7 @@ ALIASES
   $ smartthings rooms
 ```
 
-_See code: [dist/commands/locations/rooms.ts](https://github.com/SmartThingsCommunity/smartthings-cli/blob/v0.0.0-pre.8/dist/commands/locations/rooms.ts)_
+_See code: [dist/commands/locations/rooms.ts](https://github.com/SmartThingsCommunity/smartthings-cli/blob/v0.0.0-pre.10/dist/commands/locations/rooms.ts)_
 
 ## `smartthings locations:rooms:create`
 
@@ -1524,7 +1539,7 @@ ALIASES
   $ smartthings rooms:create
 ```
 
-_See code: [dist/commands/locations/rooms/create.ts](https://github.com/SmartThingsCommunity/smartthings-cli/blob/v0.0.0-pre.8/dist/commands/locations/rooms/create.ts)_
+_See code: [dist/commands/locations/rooms/create.ts](https://github.com/SmartThingsCommunity/smartthings-cli/blob/v0.0.0-pre.10/dist/commands/locations/rooms/create.ts)_
 
 ## `smartthings locations:rooms:delete [ID]`
 
@@ -1547,7 +1562,7 @@ ALIASES
   $ smartthings rooms:delete
 ```
 
-_See code: [dist/commands/locations/rooms/delete.ts](https://github.com/SmartThingsCommunity/smartthings-cli/blob/v0.0.0-pre.8/dist/commands/locations/rooms/delete.ts)_
+_See code: [dist/commands/locations/rooms/delete.ts](https://github.com/SmartThingsCommunity/smartthings-cli/blob/v0.0.0-pre.10/dist/commands/locations/rooms/delete.ts)_
 
 ## `smartthings locations:rooms:update [ID]`
 
@@ -1577,7 +1592,7 @@ ALIASES
   $ smartthings rooms:update
 ```
 
-_See code: [dist/commands/locations/rooms/update.ts](https://github.com/SmartThingsCommunity/smartthings-cli/blob/v0.0.0-pre.8/dist/commands/locations/rooms/update.ts)_
+_See code: [dist/commands/locations/rooms/update.ts](https://github.com/SmartThingsCommunity/smartthings-cli/blob/v0.0.0-pre.10/dist/commands/locations/rooms/update.ts)_
 
 ## `smartthings locations:update [ID]`
 
@@ -1603,7 +1618,7 @@ OPTIONS
   --indent=indent        specify indentation for formatting JSON or YAML output
 ```
 
-_See code: [dist/commands/locations/update.ts](https://github.com/SmartThingsCommunity/smartthings-cli/blob/v0.0.0-pre.8/dist/commands/locations/update.ts)_
+_See code: [dist/commands/locations/update.ts](https://github.com/SmartThingsCommunity/smartthings-cli/blob/v0.0.0-pre.10/dist/commands/locations/update.ts)_
 
 ## `smartthings plugins`
 
@@ -1746,7 +1761,7 @@ OPTIONS
   --indent=indent        specify indentation for formatting JSON or YAML output
 ```
 
-_See code: [dist/commands/presentation.ts](https://github.com/SmartThingsCommunity/smartthings-cli/blob/v0.0.0-pre.8/dist/commands/presentation.ts)_
+_See code: [dist/commands/presentation.ts](https://github.com/SmartThingsCommunity/smartthings-cli/blob/v0.0.0-pre.10/dist/commands/presentation.ts)_
 
 ## `smartthings presentation:device-config VID`
 
@@ -1771,7 +1786,7 @@ OPTIONS
   --indent=indent        specify indentation for formatting JSON or YAML output
 ```
 
-_See code: [dist/commands/presentation/device-config.ts](https://github.com/SmartThingsCommunity/smartthings-cli/blob/v0.0.0-pre.8/dist/commands/presentation/device-config.ts)_
+_See code: [dist/commands/presentation/device-config.ts](https://github.com/SmartThingsCommunity/smartthings-cli/blob/v0.0.0-pre.10/dist/commands/presentation/device-config.ts)_
 
 ## `smartthings presentation:device-config:create`
 
@@ -1795,7 +1810,7 @@ OPTIONS
   --indent=indent        specify indentation for formatting JSON or YAML output
 ```
 
-_See code: [dist/commands/presentation/device-config/create.ts](https://github.com/SmartThingsCommunity/smartthings-cli/blob/v0.0.0-pre.8/dist/commands/presentation/device-config/create.ts)_
+_See code: [dist/commands/presentation/device-config/create.ts](https://github.com/SmartThingsCommunity/smartthings-cli/blob/v0.0.0-pre.10/dist/commands/presentation/device-config/create.ts)_
 
 ## `smartthings presentation:device-config:generate ID`
 
@@ -1824,7 +1839,7 @@ OPTIONS
                                  integrations
 ```
 
-_See code: [dist/commands/presentation/device-config/generate.ts](https://github.com/SmartThingsCommunity/smartthings-cli/blob/v0.0.0-pre.8/dist/commands/presentation/device-config/generate.ts)_
+_See code: [dist/commands/presentation/device-config/generate.ts](https://github.com/SmartThingsCommunity/smartthings-cli/blob/v0.0.0-pre.10/dist/commands/presentation/device-config/generate.ts)_
 
 ## `smartthings rules [IDORINDEX]`
 
@@ -1850,7 +1865,7 @@ OPTIONS
   --indent=indent              specify indentation for formatting JSON or YAML output
 ```
 
-_See code: [dist/commands/rules.ts](https://github.com/SmartThingsCommunity/smartthings-cli/blob/v0.0.0-pre.8/dist/commands/rules.ts)_
+_See code: [dist/commands/rules.ts](https://github.com/SmartThingsCommunity/smartthings-cli/blob/v0.0.0-pre.10/dist/commands/rules.ts)_
 
 ## `smartthings rules:create`
 
@@ -1875,7 +1890,7 @@ OPTIONS
   --indent=indent              specify indentation for formatting JSON or YAML output
 ```
 
-_See code: [dist/commands/rules/create.ts](https://github.com/SmartThingsCommunity/smartthings-cli/blob/v0.0.0-pre.8/dist/commands/rules/create.ts)_
+_See code: [dist/commands/rules/create.ts](https://github.com/SmartThingsCommunity/smartthings-cli/blob/v0.0.0-pre.10/dist/commands/rules/create.ts)_
 
 ## `smartthings rules:delete [ID]`
 
@@ -1895,7 +1910,7 @@ OPTIONS
   -t, --token=token            the auth token to use
 ```
 
-_See code: [dist/commands/rules/delete.ts](https://github.com/SmartThingsCommunity/smartthings-cli/blob/v0.0.0-pre.8/dist/commands/rules/delete.ts)_
+_See code: [dist/commands/rules/delete.ts](https://github.com/SmartThingsCommunity/smartthings-cli/blob/v0.0.0-pre.10/dist/commands/rules/delete.ts)_
 
 ## `smartthings rules:update [ID]`
 
@@ -1922,7 +1937,7 @@ OPTIONS
   --indent=indent              specify indentation for formatting JSON or YAML output
 ```
 
-_See code: [dist/commands/rules/update.ts](https://github.com/SmartThingsCommunity/smartthings-cli/blob/v0.0.0-pre.8/dist/commands/rules/update.ts)_
+_See code: [dist/commands/rules/update.ts](https://github.com/SmartThingsCommunity/smartthings-cli/blob/v0.0.0-pre.10/dist/commands/rules/update.ts)_
 
 ## `smartthings schema [ID]`
 
@@ -1948,7 +1963,39 @@ OPTIONS
   --indent=indent        specify indentation for formatting JSON or YAML output
 ```
 
-_See code: [dist/commands/schema.ts](https://github.com/SmartThingsCommunity/smartthings-cli/blob/v0.0.0-pre.8/dist/commands/schema.ts)_
+_See code: [dist/commands/schema.ts](https://github.com/SmartThingsCommunity/smartthings-cli/blob/v0.0.0-pre.10/dist/commands/schema.ts)_
+
+## `smartthings schema:authorize ARN`
+
+authorize calls to your ST Schema Lambda function from SmartThings
+
+```
+USAGE
+  $ smartthings schema:authorize ARN
+
+ARGUMENTS
+  ARN  the ARN of the AWS Lambda function
+
+OPTIONS
+  -h, --help                   show CLI help
+  -p, --profile=profile        [default: default] configuration profile
+  -t, --token=token            the auth token to use
+  --principal=principal        use this principal instead of the default when authorizing lambda functions
+  --statement-id=statement-id  use this statement id instead of the default when authorizing lambda functions
+
+EXAMPLES
+  $ smartthings apps:authorize arn:aws:lambda:us-east-1:1234567890:function:your-test-app
+
+  Note that this command is the same as running the following with the AWS CLI:
+
+  $ aws lambda add-permission --region us-east-1 \
+       --function-name arn:aws:lambda:us-east-1:1234567890:function:your-test-app \
+       --statement-id smartthings --principal 148790070172 --action lambda:InvokeFunction
+
+  It requires your machine to be configured to run the AWS CLI
+```
+
+_See code: [dist/commands/schema/authorize.ts](https://github.com/SmartThingsCommunity/smartthings-cli/blob/v0.0.0-pre.10/dist/commands/schema/authorize.ts)_
 
 ## `smartthings schema:create`
 
@@ -1959,21 +2006,23 @@ USAGE
   $ smartthings schema:create
 
 OPTIONS
-  -d, --dry-run          produce JSON but don't actually submit
-  -h, --help             show CLI help
-  -i, --input=input      specify input file
-  -j, --json             use JSON format of input and/or output
-  -o, --output=output    specify output file
-  -p, --profile=profile  [default: default] configuration profile
-  -t, --token=token      the auth token to use
-  -y, --yaml             use YAML format of input and/or output
-  --authorize            authorize connector's Lambda functions to be called by SmartThings
-  --compact              use compact table format with no lines between body rows
-  --expanded             use expanded table format with a line between each body row
-  --indent=indent        specify indentation for formatting JSON or YAML output
+  -d, --dry-run                produce JSON but don't actually submit
+  -h, --help                   show CLI help
+  -i, --input=input            specify input file
+  -j, --json                   use JSON format of input and/or output
+  -o, --output=output          specify output file
+  -p, --profile=profile        [default: default] configuration profile
+  -t, --token=token            the auth token to use
+  -y, --yaml                   use YAML format of input and/or output
+  --authorize                  authorize connector's Lambda functions to be called by SmartThings
+  --compact                    use compact table format with no lines between body rows
+  --expanded                   use expanded table format with a line between each body row
+  --indent=indent              specify indentation for formatting JSON or YAML output
+  --principal=principal        use this principal instead of the default when authorizing lambda functions
+  --statement-id=statement-id  use this statement id instead of the default when authorizing lambda functions
 ```
 
-_See code: [dist/commands/schema/create.ts](https://github.com/SmartThingsCommunity/smartthings-cli/blob/v0.0.0-pre.8/dist/commands/schema/create.ts)_
+_See code: [dist/commands/schema/create.ts](https://github.com/SmartThingsCommunity/smartthings-cli/blob/v0.0.0-pre.10/dist/commands/schema/create.ts)_
 
 ## `smartthings schema:delete [ID]`
 
@@ -1992,34 +2041,36 @@ OPTIONS
   -t, --token=token      the auth token to use
 ```
 
-_See code: [dist/commands/schema/delete.ts](https://github.com/SmartThingsCommunity/smartthings-cli/blob/v0.0.0-pre.8/dist/commands/schema/delete.ts)_
+_See code: [dist/commands/schema/delete.ts](https://github.com/SmartThingsCommunity/smartthings-cli/blob/v0.0.0-pre.10/dist/commands/schema/delete.ts)_
 
-## `smartthings schema:update ID`
+## `smartthings schema:update [ID]`
 
 update an ST Schema connector
 
 ```
 USAGE
-  $ smartthings schema:update ID
+  $ smartthings schema:update [ID]
 
 ARGUMENTS
   ID  the app id
 
 OPTIONS
-  -h, --help             show CLI help
-  -i, --input=input      specify input file
-  -j, --json             use JSON format of input and/or output
-  -o, --output=output    specify output file
-  -p, --profile=profile  [default: default] configuration profile
-  -t, --token=token      the auth token to use
-  -y, --yaml             use YAML format of input and/or output
-  --authorize            authorize Lambda functions to be called by SmartThings
-  --compact              use compact table format with no lines between body rows
-  --expanded             use expanded table format with a line between each body row
-  --indent=indent        specify indentation for formatting JSON or YAML output
+  -h, --help                   show CLI help
+  -i, --input=input            specify input file
+  -j, --json                   use JSON format of input and/or output
+  -o, --output=output          specify output file
+  -p, --profile=profile        [default: default] configuration profile
+  -t, --token=token            the auth token to use
+  -y, --yaml                   use YAML format of input and/or output
+  --authorize                  authorize Lambda functions to be called by SmartThings
+  --compact                    use compact table format with no lines between body rows
+  --expanded                   use expanded table format with a line between each body row
+  --indent=indent              specify indentation for formatting JSON or YAML output
+  --principal=principal        use this principal instead of the default when authorizing lambda functions
+  --statement-id=statement-id  use this statement id instead of the default when authorizing lambda functions
 ```
 
-_See code: [dist/commands/schema/update.ts](https://github.com/SmartThingsCommunity/smartthings-cli/blob/v0.0.0-pre.8/dist/commands/schema/update.ts)_
+_See code: [dist/commands/schema/update.ts](https://github.com/SmartThingsCommunity/smartthings-cli/blob/v0.0.0-pre.10/dist/commands/schema/update.ts)_
 <!-- commandsstop -->
 
 # Logging
diff --git a/packages/cli/src/commands/apps.ts b/packages/cli/src/commands/apps.ts
index 99114a488..f32214848 100644
--- a/packages/cli/src/commands/apps.ts
+++ b/packages/cli/src/commands/apps.ts
@@ -1,6 +1,6 @@
 import { flags } from '@oclif/command'
 
-import { App } from '@smartthings/core-sdk'
+import { App, AppType, AppClassification, AppListOptions } from '@smartthings/core-sdk'
 
 import { ListingOutputAPICommand, TableFieldDefinition } from '@smartthings/cli-lib'
 
@@ -40,6 +40,19 @@ export default class AppsList extends ListingOutputAPICommand<App, App> {
 
 	static flags = {
 		...ListingOutputAPICommand.flags,
+		type: flags.string({
+			description: 'filter results by appType, WEBHOOK_SMART_APP, LAMBDA_SMART_APP, API_ONLY',
+			multiple: false,
+		}),
+		classification: flags.string({
+			description: 'filter results by one or more classifications, AUTOMATION, SERVICE, DEVICE, CONNECTED_SERVICE',
+			multiple: true,
+		}),
+		// TODO -- uncomment when implemented
+		// tag: flags.string({
+		// 	description: 'filter results by one or more tags, e.g. --tag=industry:energy',
+		// 	multiple: true,
+		// }),
 		verbose: flags.boolean({
 			description: 'include URLs and ARNs in table output',
 			char: 'v',
@@ -66,8 +79,24 @@ export default class AppsList extends ListingOutputAPICommand<App, App> {
 		}
 
 		const listApps = async (): Promise<App[]> => {
+			const appListOptions: AppListOptions = {}
+			if (flags.type) {
+				appListOptions.appType = AppType[flags.type as keyof typeof AppType]
+			}
+			if (flags.classification) {
+				appListOptions.classification = flags.classification.map(it => AppClassification[it as keyof typeof AppClassification])
+			}
+			// TODO -- uncomment when implemented
+			// if (flags.tag) {
+			// 	appListOptions.tag = flags.tag.reduce((map: {[key: string]: string}, it) => {
+			// 		const pos = it.indexOf(':')
+			// 		map[it.slice(0, pos)] = it.slice(pos+1)
+			// 		return map
+			// 	}, {})
+			// }
+			this.log(JSON.stringify(appListOptions, null, 2))
 			if (flags.verbose) {
-				return this.client.apps.list().then(list => {
+				return this.client.apps.list(appListOptions).then(list => {
 					const objects = list.map(it => {
 						// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
 						return this.client.apps.get((it.appId)!) // TODO appId should not be optional
@@ -86,7 +115,7 @@ export default class AppsList extends ListingOutputAPICommand<App, App> {
 					})
 				})
 			}
-			return this.client.apps.list()
+			return this.client.apps.list(appListOptions)
 		}
 
 		this.processNormally(args.id, listApps, id => this.client.apps.get(id))
diff --git a/packages/cli/src/commands/apps/authorize.ts b/packages/cli/src/commands/apps/authorize.ts
index 1d34b3a80..cbd36d205 100644
--- a/packages/cli/src/commands/apps/authorize.ts
+++ b/packages/cli/src/commands/apps/authorize.ts
@@ -1,22 +1,24 @@
+import { flags } from '@oclif/command'
 import { APICommand } from '@smartthings/cli-lib'
-import {addPermission} from '../../lib/aws-utils'
+import { addPermission } from '../../lib/aws-utils'
+import { lambdaAuthFlags } from '../../lib/common-flags'
 
 
-interface AuthorizeResponse {
-	error?: string
-	functions?: { [key: string]: string }
-}
-
 export default class AppAuthorize extends APICommand {
 	static description = 'authorize calls to your AWS Lambda function from SmartThings'
 
-	static flags = APICommand.flags
+	static flags = {
+		...APICommand.flags,
+		...lambdaAuthFlags,
+	}
 
-	static args = [{
-		name: 'arn',
-		description: 'the ARN of the AWS Lambda function',
-		required: true,
-	}]
+	static args = [
+		{
+			name: 'arn',
+			description: 'the ARN of the AWS Lambda function',
+			required: true,
+		},
+	]
 
 	static examples = [
 		'$ smartthings apps:authorize arn:aws:lambda:us-east-1:1234567890:function:your-test-app',
@@ -34,7 +36,7 @@ export default class AppAuthorize extends APICommand {
 		const { args, argv, flags } = this.parse(AppAuthorize)
 		await super.setup(args, argv, flags)
 
-		addPermission(args.arn).then(async (message) => {
+		addPermission(args.arn, flags.principal, flags['statement-id']).then(async (message) => {
 			this.log(message)
 		}).catch(err => {
 			this.log(`caught error ${err}`)
diff --git a/packages/cli/src/commands/apps/create.ts b/packages/cli/src/commands/apps/create.ts
index f353ee3f5..fe2d9c88b 100644
--- a/packages/cli/src/commands/apps/create.ts
+++ b/packages/cli/src/commands/apps/create.ts
@@ -6,6 +6,7 @@ import { InputOutputAPICommand } from '@smartthings/cli-lib'
 
 import { tableFieldDefinitions } from '../apps'
 import { addPermission } from '../../lib/aws-utils'
+import { lambdaAuthFlags } from '../../lib/common-flags'
 
 
 export default class AppCreateCommand extends InputOutputAPICommand<AppRequest, AppCreationResponse> {
@@ -15,7 +16,9 @@ export default class AppCreateCommand extends InputOutputAPICommand<AppRequest,
 		...InputOutputAPICommand.flags,
 		authorize: flags.boolean({
 			description: 'authorize Lambda functions to be called by SmartThings',
-		})}
+		}),
+		...lambdaAuthFlags,
+	}
 
 	protected buildTableOutput(data: AppCreationResponse): string {
 		return this.tableGenerator.buildTableFromItem(data.app, tableFieldDefinitions)
@@ -30,7 +33,7 @@ export default class AppCreateCommand extends InputOutputAPICommand<AppRequest,
 				if (data.lambdaSmartApp) {
 					if (data.lambdaSmartApp.functions) {
 						const requests = data.lambdaSmartApp.functions.map((it) => {
-							return addPermission(it)
+							return addPermission(it, flags.principal, flags['statement-id'])
 						})
 						await Promise.all(requests)
 					}
diff --git a/packages/cli/src/commands/apps/register.ts b/packages/cli/src/commands/apps/register.ts
index 8b1fe3465..b4a3999fe 100644
--- a/packages/cli/src/commands/apps/register.ts
+++ b/packages/cli/src/commands/apps/register.ts
@@ -1,10 +1,12 @@
-import { App } from '@smartthings/core-sdk'
+import _ from 'lodash'
+
+import {App, AppType} from '@smartthings/core-sdk'
 
 import {SelectingAPICommand} from '@smartthings/cli-lib'
 
 
 export default class AppRegisterCommand extends SelectingAPICommand<App> {
-	static description = 'register the app'
+	static description = 'Send request to app target URL to confirm existence and authorize lifecycle events'
 
 	static flags = SelectingAPICommand.flags
 
@@ -15,14 +17,18 @@ export default class AppRegisterCommand extends SelectingAPICommand<App> {
 
 	primaryKeyName = 'appId'
 	sortKeyName = 'displayName'
+	listTableFieldDefinitions = ['displayName', 'appType', 'appId']
 
 	async run(): Promise<void> {
 		const { args, argv, flags } = this.parse(AppRegisterCommand)
 		await super.setup(args, argv, flags)
 
 		this.processNormally(args.id,
-			async () => await this.client.apps.list(),
+			async () => _.flatten(await Promise.all([
+				this.client.apps.list({appType: AppType.WEBHOOK_SMART_APP}),
+				this.client.apps.list({appType: AppType.API_ONLY}),
+			])),
 			async (id) => { await this.client.apps.register(id) },
-			'app {{id}} registered')
+			'Registration request sent to app {{id}}. Check server log for confirmation URL')
 	}
 }
diff --git a/packages/cli/src/commands/apps/update.ts b/packages/cli/src/commands/apps/update.ts
index 9a022eb03..d15f9022e 100644
--- a/packages/cli/src/commands/apps/update.ts
+++ b/packages/cli/src/commands/apps/update.ts
@@ -6,6 +6,7 @@ import { SelectingInputOutputAPICommand } from '@smartthings/cli-lib'
 
 import { tableFieldDefinitions } from '../apps'
 import { addPermission } from '../../lib/aws-utils'
+import { lambdaAuthFlags } from '../../lib/common-flags'
 
 
 export default class AppUpdateCommand extends SelectingInputOutputAPICommand<AppRequest, App, App> {
@@ -15,7 +16,9 @@ export default class AppUpdateCommand extends SelectingInputOutputAPICommand<App
 		...SelectingInputOutputAPICommand.flags,
 		authorize: flags.boolean({
 			description: 'authorize Lambda functions to be called by SmartThings',
-		})}
+		}),
+		...lambdaAuthFlags,
+	}
 
 	static args = [{
 		name: 'id',
@@ -38,7 +41,7 @@ export default class AppUpdateCommand extends SelectingInputOutputAPICommand<App
 					if (data.lambdaSmartApp) {
 						if (data.lambdaSmartApp.functions) {
 							const requests = data.lambdaSmartApp.functions.map((it) => {
-								return addPermission(it)
+								return addPermission(it, flags.principal, flags['statement-id'])
 							})
 							await Promise.all(requests)
 						}
diff --git a/packages/cli/src/commands/schema/authorize.ts b/packages/cli/src/commands/schema/authorize.ts
new file mode 100644
index 000000000..3206425e9
--- /dev/null
+++ b/packages/cli/src/commands/schema/authorize.ts
@@ -0,0 +1,44 @@
+import { flags } from '@oclif/command'
+import { APICommand } from '@smartthings/cli-lib'
+import { addPermission } from '../../lib/aws-utils'
+import { lambdaAuthFlags } from '../../lib/common-flags'
+
+
+export default class SchemaAppAuthorize extends APICommand {
+	static description = 'authorize calls to your ST Schema Lambda function from SmartThings'
+
+	static flags = {
+		...APICommand.flags,
+		...lambdaAuthFlags,
+	}
+	static args = [
+		{
+			name: 'arn',
+			description: 'the ARN of the AWS Lambda function',
+			required: true,
+		},
+	]
+
+	static examples = [
+		'$ smartthings apps:authorize arn:aws:lambda:us-east-1:1234567890:function:your-test-app',
+		'',
+		'Note that this command is the same as running the following with the AWS CLI:',
+		'',
+		'$ aws lambda add-permission --region us-east-1 \\',
+		'    --function-name arn:aws:lambda:us-east-1:1234567890:function:your-test-app \\',
+		'    --statement-id smartthings --principal 148790070172 --action lambda:InvokeFunction',
+		'',
+		'It requires your machine to be configured to run the AWS CLI',
+	]
+
+	async run(): Promise<void> {
+		const { args, argv, flags } = this.parse(SchemaAppAuthorize)
+		await super.setup(args, argv, flags)
+
+		addPermission(args.arn, flags.principal, flags['statement-id']).then(async (message) => {
+			this.log(message)
+		}).catch(err => {
+			this.log(`caught error ${err}`)
+		})
+	}
+}
diff --git a/packages/cli/src/commands/schema/create.ts b/packages/cli/src/commands/schema/create.ts
index 13217c899..4d2991a5a 100644
--- a/packages/cli/src/commands/schema/create.ts
+++ b/packages/cli/src/commands/schema/create.ts
@@ -5,6 +5,7 @@ import { SchemaAppRequest, SchemaCreateResponse } from '@smartthings/core-sdk'
 import { InputOutputAPICommand } from '@smartthings/cli-lib'
 
 import { addSchemaPermission } from '../../lib/aws-utils'
+import { lambdaAuthFlags } from '../../lib/common-flags'
 
 
 export default class SchemaAppCreateCommand extends InputOutputAPICommand<SchemaAppRequest, SchemaCreateResponse> {
@@ -15,6 +16,7 @@ export default class SchemaAppCreateCommand extends InputOutputAPICommand<Schema
 		authorize: flags.boolean({
 			description: 'authorize connector\'s Lambda functions to be called by SmartThings',
 		}),
+		...lambdaAuthFlags,
 	}
 
 	protected tableFieldDefinitions = ['endpointAppId', 'stClientId', 'stClientSecret']
@@ -27,16 +29,16 @@ export default class SchemaAppCreateCommand extends InputOutputAPICommand<Schema
 			if (flags.authorize) {
 				if (data.hostingType === 'lambda') {
 					if (data.lambdaArn) {
-						addSchemaPermission(data.lambdaArn)
+						addSchemaPermission(data.lambdaArn, flags.principal, flags['statement-id'])
 					}
 					if (data.lambdaArnAP) {
-						addSchemaPermission(data.lambdaArnAP)
+						addSchemaPermission(data.lambdaArnAP, flags.principal, flags['statement-id'])
 					}
 					if (data.lambdaArnCN) {
-						addSchemaPermission(data.lambdaArnCN)
+						addSchemaPermission(data.lambdaArnCN, flags.principal, flags['statement-id'])
 					}
 					if (data.lambdaArnEU) {
-						addSchemaPermission(data.lambdaArnEU)
+						addSchemaPermission(data.lambdaArnEU, flags.principal, flags['statement-id'])
 					}
 				} else {
 					this.logger.error('Authorization is not applicable to web-hook schema connectors')
diff --git a/packages/cli/src/commands/schema/update.ts b/packages/cli/src/commands/schema/update.ts
index 003214bf3..7a25504b4 100644
--- a/packages/cli/src/commands/schema/update.ts
+++ b/packages/cli/src/commands/schema/update.ts
@@ -5,6 +5,7 @@ import { SchemaApp, SchemaAppRequest, Status } from '@smartthings/core-sdk'
 import { SelectingInputOutputAPICommand } from '@smartthings/cli-lib'
 
 import { addSchemaPermission} from '../../lib/aws-utils'
+import { lambdaAuthFlags } from '../../lib/common-flags'
 
 
 export default class SchemaUpdateCommand extends SelectingInputOutputAPICommand<SchemaAppRequest, Status, SchemaApp> {
@@ -15,43 +16,44 @@ export default class SchemaUpdateCommand extends SelectingInputOutputAPICommand<
 		authorize: flags.boolean({
 			description: 'authorize Lambda functions to be called by SmartThings',
 		}),
+		...lambdaAuthFlags,
 	}
 
 	static args = [{
 		name: 'id',
 		description: 'the app id',
-		required: true,
 	}]
 
 	primaryKeyName = 'endpointAppId'
 	sortKeyName = 'appName'
+	listTableFieldDefinitions = ['appName', 'endpointAppId', 'hostingType']
 
 	async run(): Promise<void> {
 		const { args, argv, flags } = this.parse(SchemaUpdateCommand)
 		await super.setup(args, argv, flags)
 
 		this.processNormally(args.id,
-			() => { return this.client.apps.list() },
+			() => { return this.client.schema.list() },
 			async (id, data) => {
 				if (flags.authorize) {
 					if (data.hostingType === 'lambda') {
 						if (data.lambdaArn) {
-							await addSchemaPermission(data.lambdaArn)
+							await addSchemaPermission(data.lambdaArn, flags.principal, flags['statement-id'])
 						}
 						if (data.lambdaArnAP) {
-							await addSchemaPermission(data.lambdaArnAP)
+							await addSchemaPermission(data.lambdaArnAP, flags.principal, flags['statement-id'])
 						}
 						if (data.lambdaArnCN) {
-							await addSchemaPermission(data.lambdaArnCN)
+							await addSchemaPermission(data.lambdaArnCN, flags.principal, flags['statement-id'])
 						}
 						if (data.lambdaArnEU) {
-							await addSchemaPermission(data.lambdaArnEU)
+							await addSchemaPermission(data.lambdaArnEU, flags.principal, flags['statement-id'])
 						}
 					} else {
 						throw Error('Authorization is not applicable to web-hook schema connectors')
 					}
 				}
-				return this.client.schema.update(args.id, data)
+				return this.client.schema.update(id, data)
 			})
 	}
 }
diff --git a/packages/cli/src/lib/aws-utils.ts b/packages/cli/src/lib/aws-utils.ts
index 3fda94639..8881f3242 100644
--- a/packages/cli/src/lib/aws-utils.ts
+++ b/packages/cli/src/lib/aws-utils.ts
@@ -2,7 +2,7 @@ import AWS from 'aws-sdk'
 import {AddPermissionRequest} from 'aws-sdk/clients/lambda'
 
 
-export async function addPermission(arn: string, principal = '906037444270'): Promise<string> {
+export async function addPermission(arn: string, principal = '906037444270', statementId = 'smartthings'): Promise<string> {
 	const segs = arn.split(':')
 	if (segs.length < 7) {
 		return 'Invalid Lambda ARN'
@@ -16,8 +16,8 @@ export async function addPermission(arn: string, principal = '906037444270'): Pr
 		const params: AddPermissionRequest = {
 			Action: 'lambda:InvokeFunction',
 			FunctionName: arn,
-			Principal: principal, // TODO environment dependent
-			StatementId: 'smartthings',
+			Principal: principal,
+			StatementId: statementId,
 		}
 
 		await lambda.addPermission(params).promise()
@@ -30,6 +30,6 @@ export async function addPermission(arn: string, principal = '906037444270'): Pr
 	}
 }
 
-export function addSchemaPermission(arn: string): Promise<string> {
-	return addPermission(arn, '148790070172')
+export function addSchemaPermission(arn: string, principal = '148790070172', statementId = 'smartthings'): Promise<string> {
+	return addPermission(arn, principal, statementId)
 }
diff --git a/packages/cli/src/lib/common-flags.ts b/packages/cli/src/lib/common-flags.ts
new file mode 100644
index 000000000..5d361fe01
--- /dev/null
+++ b/packages/cli/src/lib/common-flags.ts
@@ -0,0 +1,11 @@
+import { flags } from '@oclif/command'
+
+
+export const lambdaAuthFlags = {
+	principal: flags.string({
+		description: 'use this principal instead of the default when authorizing lambda functions',
+	}),
+	'statement-id': flags.string({
+		description: 'use this statement id instead of the default when authorizing lambda functions',
+	}),
+}