diff --git a/2016.next.json b/2016.next.json
index 8494940d..60c3c3ea 100644
--- a/2016.next.json
+++ b/2016.next.json
@@ -15,7 +15,6 @@
   "components": {
     "compute": {
       "required": [
-        "identity-v2-tokens-create",
         "identity-v3-tokens-create",
         "compute-auth-create",
         "compute-auth-get",
@@ -82,9 +81,11 @@
         "volumes-v2-metadata",
         "volumes-v2-transfer",
         "volumes-v2-reserve",
-        "volumes-v2-readonly"
+        "volumes-v2-readonly",
+        "identity-v3-api-discovery"
       ],
       "deprecated": [
+        "identity-v2-tokens-create",
         "compute-servers-change"
       ],
       "removed": []
@@ -100,10 +101,11 @@
         "objectstore-object-upload",
         "objectstore-object-versioned",
         "objectstore-temp-url-get",
-        "identity-v2-tokens-create",
         "identity-v3-tokens-create"],
       "advisory": [],
-      "deprecated": [],
+      "deprecated": [
+        "identity-v2-tokens-create"
+      ],
       "removed": []
     }
   },
@@ -1369,10 +1371,10 @@
         "deployed"
       ],
       "admin": false,
-      "status": "required",
+      "status": "deprecated",
       "description": "Auth operations within the Identity API",
       "project": "keystone",
-      "required-since": "2015.05",
+      "required-since": "",
       "tests": {
         "tempest.api.identity.v2.test_tokens.TokensTest.test_create_token": {
           "idempotent_id": "id-65ae3b78-91ff-467b-a705-f6678863b8ec"
@@ -1405,6 +1407,35 @@
         }
       }
     },
+    "identity-v3-api-discovery": {
+        "achievements": [
+          "atomic",
+          "complete",
+          "deployed",
+          "discover",
+          "doc",
+          "foundation",
+          "future",
+          "proximity",
+          "stable"
+        ],
+        "admin": false,
+        "status": "advisory",
+        "description": "API discovery operations within the Identity v3 API",
+        "project": "keystone",
+        "required-since": "",
+        "tests": {
+            "tempest.api.identity.v3.TestApiDiscovery.test_api_version_resources": {
+                "idempotent_id": "b9232f5e-d9e5-4d97-b96c-28d3db4de1bd"
+            },
+            "tempest.api.identity.v3.TestApiDiscovery.test_api_media_types": {
+                "idempotent_id": "657c1970-4722-4189-8831-7325f3bc4265"
+            },
+            "tempest.api.identity.v3.TestApiDiscovery.test_api_version_statuses": {
+                "idempotent_id": "8879a470-abfb-47bb-bb8d-5a7fd279ad1e"
+            }
+        }
+    },
     "images-v2-index": {
       "achievements": [
         "foundation",
diff --git a/working_materials/scoring.txt b/working_materials/scoring.txt
index 030891b4..4b936b8b 100644
--- a/working_materials/scoring.txt
+++ b/working_materials/scoring.txt
@@ -181,3 +181,7 @@ volumes-v2-metadata:               [1,0,0] [1,1,1] [1,1,0] [1,1,0] [1] [66]
 volumes-v2-transfer:               [1,0,0] [1,1,1] [1,1,0] [1,1,0] [1] [66]
 volumes-v2-reserve:                [1,0,0] [1,1,1] [1,1,0] [1,1,0] [1] [66]
 volumes-v2-readonly:               [1,0,0] [1,1,1] [1,1,0] [1,1,0] [1] [66]
+
+Identity
+--------
+identity-v3-api-discovery:   [0,0,1] [1,1,1] [1,1,0] [1,1,1] [1] [74]
diff --git a/working_materials/tabulated_scores.csv b/working_materials/tabulated_scores.csv
index a6aef662..4df75410 100644
--- a/working_materials/tabulated_scores.csv
+++ b/working_materials/tabulated_scores.csv
@@ -58,3 +58,4 @@ volumes-v2-metadata,1,0,0,1,1,1,1,1,0,1,1,0,1,66
 volumes-v2-transfer,1,0,0,1,1,1,1,1,0,1,1,0,1,66
 volumes-v2-reserve,1,0,0,1,1,1,1,1,0,1,1,0,1,66
 volumes-v2-readonly,1,0,0,1,1,1,1,1,0,1,1,0,1,66
+identity-v3-api-discovery,0,0,1,1,1,1,1,1,0,1,1,1,1,74