diff --git a/doc/source/data/glance.csv b/doc/source/data/glance.csv
new file mode 100644
index 0000000000..2985e307c7
--- /dev/null
+++ b/doc/source/data/glance.csv
@@ -0,0 +1,24 @@
+explain,WONTFIX,Describe a specific model.
+image-create,image create,Create a new image.
+image-deactivate,image set --deactivate,Deactivate specified image.
+image-delete,image delete,Delete specified image.
+image-download,image save,Download a specific image.
+image-list,image list,List images you can access.
+image-reactivate,image set --activate,Reactivate specified image.
+image-show,image show,Describe a specific image.
+image-tag-delete,image set --tag <tag>,Delete the tag associated with the given image.
+image-tag-update,image unset --tag <tag>,Update an image with the given tag.
+image-update,image set,Update an existing image.
+image-upload,,Upload data for a specific image.
+location-add,,Add a location (and related metadata) to an image.
+location-delete,,Remove locations (and related metadata) from an image.
+location-update,,Update metadata of an image's location.
+member-create,image add project,Create member for a given image.
+member-delete,image remove project,Delete image member.
+member-list,,Describe sharing permissions by image.
+member-update,image set --accept --reject --status,Update the status of a member for a given image.
+task-create,,Create a new task.
+task-list,,List tasks you can access.
+task-show,,Describe a specific task.
+bash-completion,complete,Prints arguments for bash_completion.
+help,help,Display help about this program or one of its subcommands.
\ No newline at end of file
diff --git a/doc/source/data/keystone.csv b/doc/source/data/keystone.csv
new file mode 100644
index 0000000000..b1364010fa
--- /dev/null
+++ b/doc/source/data/keystone.csv
@@ -0,0 +1,37 @@
+catalog,catalog show,"List service catalog, possibly filtered by service."
+ec2-credentials-create,ec2 credentials create,Create EC2-compatible credentials for user per tenant.
+ec2-credentials-delete,ec2 credentials delete,Delete EC2-compatible credentials.
+ec2-credentials-get,ec2 credentials show,Display EC2-compatible credentials.
+ec2-credentials-list,ec2 credentials list,List EC2-compatible credentials for a user.
+endpoint-create,endpoint create,Create a new endpoint associated with a service.
+endpoint-delete,endpoint delete,Delete a service endpoint.
+endpoint-get,endpoint get,Find endpoint filtered by a specific attribute or service type.
+endpoint-list,endpoint list,List configured service endpoints.
+password-update,user password set,Update own password.
+role-create,role create,Create new role.
+role-delete,role delete,Delete role.
+role-get,role show,Display role details.
+role-list,role list,List all roles.
+service-create,service create,Add service to Service Catalog.
+service-delete,service delete,Delete service from Service Catalog.
+service-get,service show,Display service from Service Catalog.
+service-list,service list,List all services in Service Catalog.
+tenant-create,project create,Create new tenant.
+tenant-delete,project delete,Delete tenant.
+tenant-get,proejct show,Display tenant details.
+tenant-list,project list,List all tenants.
+tenant-update,project set,"Update tenant name, description, enabled status."
+token-get,issue token,Display the current user token.
+user-create,user create,Create new user.
+user-delete,user delete,Delete user.
+user-get,user show,Display user details.
+user-list,user list,List users.
+user-password-update,user set --password,Update user password.
+user-role-add,role add <role> --user --project,Add role to user.
+user-role-list,role assignment list --user --project,List roles granted to a user.
+user-role-remove,role remove <role> --user --project,Remove role from user.
+user-update,user set,"Update user's name, email, and enabled status."
+discover,WONTFIX,"Discover Keystone servers, supported API versions and extensions."
+bootstrap,WONTFIX,"Grants a new role to a new user on a new tenant, after creating each."
+bash-completion,complete,Prints all of the commands and options to stdout.
+help,help,Display help about this program or one of its subcommands.
\ No newline at end of file
diff --git a/doc/source/decoder.rst b/doc/source/decoder.rst
index 23c16ca588..3d07bb6fc6 100644
--- a/doc/source/decoder.rst
+++ b/doc/source/decoder.rst
@@ -15,6 +15,23 @@ shown when necessary.
    :widths: 25, 25, 50
    :file: data/cinder.csv
 
+``glance CLI``
+--------------
+
+.. csv-table::
+   :header: "Glance CLI", "OSC Equivalent", "Description"
+   :widths: 25, 25, 50
+   :file: data/glance.csv
+
+``keystone CLI``
+----------------
+
+.. csv-table::
+   :header: "Keystone CLI", "OSC Equivalent", "Description"
+   :widths: 25, 25, 50
+   :file: data/keystone.csv
+
+
 ``nova CLI``
 ------------