diff --git a/doc/source/advanced_deployment/introspection_data.rst b/doc/source/advanced_deployment/introspection_data.rst
index 0c0d33ab..7133099f 100644
--- a/doc/source/advanced_deployment/introspection_data.rst
+++ b/doc/source/advanced_deployment/introspection_data.rst
@@ -1,24 +1,53 @@
 .. _introspection_data:
 
-Accessing additional introspection data
----------------------------------------
+Accessing Introspection Data
+----------------------------
 
 Every introspection run (as described in
-:doc:`../basic_deployment/basic_deployment_cli`) collects a lot of additional
-facts about the hardware and puts them as JSON in Swift. Swift container name
-is ``ironic-inspector`` and can be modified in
-**/etc/ironic-inspector/inspector.conf**. Swift object name is stored under
-``hardware_swift_object`` key in Ironic node extra field.
+:doc:`../basic_deployment/basic_deployment_cli`) collects a lot of facts about
+the hardware and puts them as JSON in Swift. Starting with
+``python-ironic-inspector-client`` version 1.4.0 there is a command to retrieve
+this data::
 
-As an example, to download the swift data for all nodes to a local directory
+    openstack baremetal introspection data save <UUID>
+
+You can provide a ``--file`` argument to save the data in a file instead of
+displaying it.
+
+If you don't have a new enough version of ``python-ironic-inspector-client``,
+you can use cURL to access the API::
+
+    token=$(openstack token issue -f value -c id)
+    curl -H "X-Auth-Token: $token" http://127.0.0.1:5050/v1/introspection/<UUID>/data
+
+Accessing raw additional data
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Extra hardware data can be collected using the python-hardware_ library. If
+you have enabled this, by setting ``inspection_extras`` to ``True`` in your
+``undercloud.conf``, then even more data is available.
+
+The command above will display it in a structured format under the ``extra``
+key in the resulting JSON object. This format is suitable for using in
+the **ironic-inspector** introspection rules (see e.g.
+:ref:`auto-profile-tagging`). However, if you want to access it in its
+original format (list of lists instead of nested objects), you can query
+Swift for it directly.
+
+The Swift container name is ``ironic-inspector``, which can be modified in
+**/etc/ironic-inspector/inspector.conf**. The Swift object is called
+``extra_hardware-<UUID>`` where ``<UUID>`` is a node UUID. In the default
+configuration you have to use the ``service`` tenant to access this object.
+
+As an example, to download the Swift data for all nodes to a local directory
 and use that to collect a list of node mac addresses::
 
     # You will need the ironic-inspector user password
-    # from /etc/ironic-inspector/inspector.conf:
-    export IRONIC_INSPECTOR_PASSWORD=
+    # from the [swift] section of /etc/ironic-inspector/inspector.conf:
+    export IRONIC_INSPECTOR_PASSWORD=xxxxxx
 
     # Download the extra introspection data from swift:
-    for node in $(ironic node-list | grep -v UUID| awk '{print $2}');
+    for node in $(ironic node-list | grep -v UUID | awk '{print $2}');
       do swift -U service:ironic -K $IRONIC_INSPECTOR_PASSWORD download ironic-inspector extra_hardware-$node;
     done
 
@@ -26,3 +55,6 @@ and use that to collect a list of node mac addresses::
     for f in extra_hardware-*;
       do cat $f | jq -r 'map(select(.[0]=="network" and .[2]=="serial"))';
     done
+
+
+.. _python-hardware: https://github.com/redhat-cip/hardware
diff --git a/doc/source/advanced_deployment/profile_matching.rst b/doc/source/advanced_deployment/profile_matching.rst
index c7dad1c7..acd4893f 100644
--- a/doc/source/advanced_deployment/profile_matching.rst
+++ b/doc/source/advanced_deployment/profile_matching.rst
@@ -70,6 +70,8 @@ Finally, to clean all profile information from an available nodes, use::
 Also see :ref:`instackenv` for details on how to set profile in the
 ``instackenv.json`` file.
 
+.. _auto-profile-tagging:
+
 Automated profile tagging
 -------------------------