diff --git a/.travis.yml b/.travis.yml
index 6fdbbe27c8c0d..71da8ea5dbb03 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,7 +4,7 @@ before_script:
   - npm install ajv-cli -g
 script:
   - find . -name \*.json  | xargs -I {} jsonlint -q {}
-  - ajv validate -s compat-data.schema.json -d "{api/**/*.json,css/**/*.json,http/**/*.json,javascript/**/*.json}"
+  - ajv validate -s compat-data.schema.json -d "{css/**/*.json,http/**/*.json,javascript/**/*.json}"
   - ajv validate -s webextensions/browser-compat-data.schema.json -d webextensions/browser-compat-data.json
 notifications:
   email: false
diff --git a/compat-data-schema.md b/compat-data-schema.md
new file mode 100644
index 0000000000000..0d8e25f5d9b29
--- /dev/null
+++ b/compat-data-schema.md
@@ -0,0 +1,365 @@
+# The browser-compat-data JSON format
+
+Maintained by the [MDN team at Mozilla](https://wiki.mozilla.org/MDN).
+
+## Browser compatibility information
+MDN needs the compatibility information for each feature of the Web platform. In
+order to make it easier to maintain and easy to reuse by third-party tool, we
+decided to store this data into a set of JSON files, stored in a git repository.
+
+In order to ensure the coherence of the data, we define a JSON schema that
+describes the content of the JSON files storing the info. Before accepting a
+PR, we validate the changes against this schema with _travis-ci_.
+
+This document describes the format in lay-man terms so that a human can create
+a JSON browser-compat-data file without having to decrypt the schema from
+scratch.
+
+__Note:__ The schema tries to capture as many constraints and rules about the
+browser-compat-data JSON format. Nevertheless there are constraints that cannot
+be described inside a schema, and won't be checked by automated tests. We tried
+to mark such cases in the following text with a __Not enforced by the
+schema__ notice.
+
+## The JSON format
+
+### Division in files
+The browser-compat-data schema has been designed so the division in files doesn't
+convey any meaning. That means that browser compatibility information about features
+can be stored in one single large files or being divided in smaller files.
+
+The division in separate files, themselves in different directories is guided
+by making it easy to maintain by humans.
+
+### Schema versioning
+There one single information that is tied to each file, and is mandatory. It is
+the version of schema used inside the file.
+
+    {
+      "version": "1.0.0",
+      "data": {
+        …
+      }
+    }
+
+We are using semantic versioning, so the version is a `string` containing three
+integers separate by a dot (`.`). No whitespace or additional characters are
+allowed. To see detail of the meaing fo the 3 integers, see the
+[Semantic Versioning 2.0.0 specification](http://semver.org/).
+
+The "data" contains a list of _features_, with their identifier, their description,
+their support status, and thir status.
+
+__Note:__ You cannot mix two schemas in the same file. `"version"` is unique in
+a given file.
+
+### Feature identifier
+A _feature_ is a functionality of the platform. It is an entity that can be used
+independently. A _sub-feature_ is a specific value or behavior of a feature. The
+division is a bit arbitrary, but matches the way developers perceive features of
+a platform
+
+* For CSS, an entity like a property, a pseudo-class, a pseudo-element, an
+at-rule, or a descriptor is a feature. A value, a new syntax change, or a
+specific behavior, like if a property applies to a set of elements or another
+are sub-features.
+
+* For HTML, an element or an attribute are features, while specific values of an
+attribute are sub-features.
+
+* For Web APIs or JavaScript, an interface, a method, a property, a constructor
+are features, while arguments or special values of an enumerated type are
+sub-features.
+
+Each feature is identified by a unique hierarchy of strings. E.g the
+`text-align` property is identified by `css.properties.text-align`.
+
+The strings of an identifier are not intended to be displayed and are therefore
+not translatable.
+
+In JSON, this gives:
+
+    "data": {
+      "css": {
+        "properties": {
+          "text-align": {…},
+          …
+        },
+        …
+      },
+      …
+    }
+
+ That way, each feature is uniquely identifier, independently of the file it is
+ defined in.
+
+ The hierarchy of identifiers is not defined inside the schema. It is a
+ convention of the project using the schema.
+
+ In the MDN browser-compat case, it is:
+
+ _Note: this list will evolve as we migrate our data_
+
+     "data": {
+       "css": {
+         "properties": {…}
+         "pseudo-classes": {…}
+         "pseudo-elements": {…}
+         "at-rules": {…}
+       },
+       "html": {
+         "elements": {
+           …,
+           "<element-name>": {
+             …,
+             "<attribute-name>": {…},
+             …
+           }
+         }
+         "global_attributes": {…}  
+       }
+     }
+
+### Feature description
+
+A feature is represented by an identifier containing the `"__compat"` property.
+In this compat property, you'll find the list of sub-features associated to the
+feature.
+
+A feature has at least one sub-feature, representing the basic support. It is
+always named `"basic_support"`.
+
+The basic support feature represents the minimal set of functionality included
+when a feature is qualified of 'supported'. What this represents depends of the
+evolution of the feature over time, both in term of specification and of browser
+support. Another way of seeing it is to consider `"basic_support"` as representing all
+the functionality of the feature that doesn't have its own sub-feature(s).
+
+### Sub-feature
+
+A sub-feature is the basic entity having browser compatibility information. As
+explained in the previous paragraph, any feature has at least one sub-feature
+called `'basic_support'`, but it may many more.
+
+A sub-feature may have three properties.
+
+* __Sub-feature description__ contained in the `"desc"` property. It is a
+`string` that contains a human-readable description of the sub-feature. As it is
+intended to be used as a kind of caption or title for the feature, keep it short.
+the `<code>` and `<a>`, as well as the macros `{{cssxref}}`, `{{HTMLElement}}`,
+`{{htmlattrxref}}`, and `{{domxref}}` can be used. See the localization section
+below for an explanation about how this string will be localized.
+* __Compat information__ contained in the `"support"` property. It contains an
+object listing the compat information for each browser. (See the description
+below.)
+* __Status information__ contained in the `"status"` object. It contains the
+information about the stability of the sub-feature: Is it a functionality that
+is standard? Is it stable? Has it been deprecated and shouldn't be used anymore
+(See the description below.)
+
+### The `"support"` object
+Each sub-feature has support information. For each browser identifier, it
+contains a compat object with the information about versions, prefixes or
+alternate names, as well as notes.
+
+The currently accepted browser identifiers are:
+* `"webview_android"`, Webview, the former stock browser on Android,
+* `"chrome"`, Google Chrome (on desktops),
+* `"chrome_android"`, Google Chrome (on Android),
+* `"edge"`, MS Edge (on Windows),
+* `"edge_mobile"`, MS Edge, the mobile version,
+* `"firefox`", Mozilla Firefox (on desktops),
+* `"firefox_android"`, Firefox for Android, sometimes nicknamed Fennec,
+* `"ie_mobile"`, Microsoft Internet Explorer, the mobile version,
+* `"ie"`, Microsoft Internet Explorer (discontinued)
+* `"opera"`, the Opera browser (desktop), based on Blink since Opera 15,
+* `"opera_android"`, the Opera browser (Android version)
+* `"safari"`, Apple Safari, on Mac OS,
+* `"safari_ios"`, Apple Safari, on iOS,
+* `"servo"`, the experimental Mozilla engine.
+
+No value is mandatory.
+
+Each of these properties contains a `support-statement` object with the
+practical compatibility information for this sub-feature and this browser.
+
+### The `support-statement` object
+This object is the key element of each browser compat information. It is a
+support-statement object. It is an array of `support` objects, but if there
+are only one of them, the array can be ommitted
+
+
+Example of an `support` compat object (with 2 entries):
+
+    {
+      "support": [
+        {
+          "version_added": "6.0"
+        },
+        {
+          "prefix": "-moz-",
+          "version_added": "3.5",
+          "version_removed": "9.0"
+        }
+
+      ]
+    }
+
+Example of a `support` compat object (with 1 entry, array ommitted):
+
+    {
+      "support": { "version_added": "6.0" }
+    }
+
+### Compat information in a `"support"` field.
+Compatibility information is stored in a `"support"` field. It may consist of the
+following properties:
+
+#### `"version_added"`
+Contains a string with the version number the sub-feature has
+been added (and is therefore supported), the Boolean values to indicate the
+sub-feature is supported (`true`, with the additional meaning that the we don't
+know in which version) or not (`false`). A value of `null` indicates that we
+don't have support information for it.
+
+* Support from version 3.5 (included)
+
+      {
+        "version_added": "3.5"
+      }
+
+* Support, but version unknown
+
+      {
+        "version_added": true
+      }
+
+* No support
+
+      {
+        "version_added": false
+      }
+
+* Support unknown (default value)
+
+      {
+        "version_added" : null
+      }
+
+#### `"version_removed"`
+Contains a string with the version number the sub-feature
+stopped to be supported. It may be a Boolean value of (`true` or `false`), or the
+`null` value. If `"version_added"` is set to a Boolean or a `string`, `"version_removed"`
+default value is `false`; if it is `null`, the default value of `"version_removed"`
+is `null` too.
+
+* Removed in version 10 (start in 3.5):
+
+      {
+        "version_added": "3.5",
+        "version_removed": "10"
+      }
+
+* Not removed (default if `"version_added"` is not `null`):
+
+     {
+       "version_added": "3.5",
+       "version_removed": false
+     }
+
+
+#### `"prefix"`
+Contains the prefix to add to the sub-feature name (default to the empty
+string). Note that leading and trailing `-` must be included.
+
+* Prefixed sub-feature:
+
+      {
+        "prefix": "-moz-",
+        "version_added": "3.5"
+      }
+
+#### `"alternative_name"`
+For the cases when prefixing is not enough, contains the whole name of the sub-feature. ( A
+sub-feature may have a completely different name in some older version.
+
+* Prefixed version had a different capitalization
+
+      {
+        "alternative_name": "mozRequestFullScreen",
+        "version_added": "true",
+        "version_removed": "9.0"
+      }
+
+#### `"flags"`
+Is a specific object indicating what kind of flags must be set for this feature
+to work. It consists of three values:
+* `"type"`, an enum that indicates what kind of flag it is: `"preference"` represents
+a flag that the user can set himself on its browser, like in `about:config` on Firefox;
+or `"compile_flag"` that is a flag that has to be set before the compilation of the browser.
+* `"name"`, a `string` representing the flag or preference to modify.
+* `"value_to_set"` representing the actual to set the flag to. It is a string, that may be
+converted to the right type (that is `true` or `false` for Boolean value, or `4` for an
+integer valuie).
+
+#### `partial_implementation`
+Is a `boolean` value indicating if the implementation of the subfeature follows the current
+spec close enough not to create major interoperability problem. It defaults to `false` (no
+interoperability problem expected). If set `true`, it is recommended to add a note indicating
+how it diverges from the standard (implement an old version of the standard, …)
+
+#### `"notes"`
+Is an `array` of zero or more translatable `string` containing
+additional pertinent information. If there are only 1 entry in the array,
+the array can be ommitted
+
+* Indication of an experimental support behind a flag
+
+      {
+        "version_added" : false,
+        "notes": "Experimental implementation available when <code>layout.css.text-align</code> is set to <code>true</code>."
+      }
+
+* Linking to a bug and indicating a restriction
+
+      {
+        "version_added": "3.5",
+        "notes": ["See <a href='https://bugzil.la/123456'>bug 123456</a>.",
+                  "Do not work on {{cssxref('::first-letter)}} pseudo-elements."]
+      }
+
+Each `string` that contains a human-readable description of the sub-feature. The
+`<code>` and `<a>`, as well as the macros `{{cssxref}}`, `{{HTMLElement}}`,
+`{{htmlattrxref}}`, and `{{domxref}}` can be used. See the localization section
+below for an explanation about how this string will be localized.
+
+### Status information
+The status indicates the stability of the feature. It is an object named
+`"status"` and has four mandatory properties:
+* `"experimental"`, a `boolean` value that indicates this functionality is
+intended to be an addition to the Web platform. Some features are added to
+conduct tests. Set to `false`, it means the functionality is mature, and no
+significant incompatible changes is expected in the future.
+* `"standard_track"`, a `boolean` value indicating if the feature is in a
+standard track.
+* `"obsolete`", a `"boolean"` value that indicates if the functionality is only
+kept for compatibility purpose and shouldn't be used anymore. It may be removed
+from the Web platform in the future.
+
+## Localization
+There is no localization happening inside the .json files themselves; l10n is
+handled separately in order to take advantage of existing toolchains.
+
+In the case of MDN, .po files with the translated string will be created. We
+will work on them once the prototype validating the structure of the json will
+be done.
+
+The plan is:
+
+1. Define all source strings as English in the spec, as well as which data elements are plain text, HTML, etc.  Avoiding HTML is a good idea, but being clear about it is necessary if you can't avoid it.
+2. Create a script to extract strings into the standard gettext format
+3. Manage translation using gettext conventions, like Kuma, perhaps even using Pontoon to translate the strings. With gettext, you get fuzzy translations, notifications of changed strings, etc. etc. for free.
+4. Create a second script to export gettext-formatted files to a JSON data structure.
+5. Implement a gettext-like translation in KumaScript (I'm pretty sure this is already done, and multiple times).
+
+1. is done in this document.
diff --git a/compat-data.schema.json b/compat-data.schema.json
index 7b7ce36a12a70..1f32a8bd4a2f7 100644
--- a/compat-data.schema.json
+++ b/compat-data.schema.json
@@ -1,72 +1,133 @@
 {
-  "$schema": "http://json-schema.org/draft-04/schema#",
+  "$schema": "http://json-schema.org/schema#",
 
   "definitions": {
 
-    "support_statement": {
+    "simple_support_statement": {
       "type": "object",
       "properties": {
-        "support": { "type": ["string", "boolean", "null"] },
+        "prefix": { "type": "string" },
+        "alternative_name": { "type": "string" },
+        "flag": { "type": "object",
+          "properties": {
+            "type": { "type": "string", "enum": ["preference", "compile_flag"] },
+            "name": { "type": "string" },
+            "value_to_set": { "type": "string"}
+          },
+          "additionalProperties": false
+        },
+        "partial_implementation": { "type": "boolean" },
+        "version_added": { "type": ["string", "boolean", "null"] },
+        "version_removed": { "type": ["string", "boolean", "null"] },
         "notes": {
-          "type": "array",
-          "items": {
-            "type": "string"
-          }
+          "anyOf": [
+            {
+              "type": "string"
+            },
+            {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            }
+          ]
         }
       },
-      "required": ["support"],
+      "required": ["version_added"],
       "additionalProperties": false
     },
 
+    "array_support_statement": {
+      "type": "array",
+      "items": {
+        "$ref": "#/definitions/simple_support_statement"
+      }
+    },
+
+    "support_statement": {
+      "anyOf": [
+        { "$ref": "#/definitions/simple_support_statement" },
+        { "$ref": "#/definitions/array_support_statement" }
+      ]
+    },
+
     "status_statement": {
       "type": "object",
       "properties": {
         "experimental": { "type": ["string", "boolean"] },
-        "standardized": { "type": ["string", "boolean"] },
-        "stable": { "type": ["string", "boolean"] },
+        "standard_track": { "type": ["string", "boolean"] },
         "obsolete": { "type": ["string", "boolean"] }
       },
-      "required": ["experimental", "standardized", "stable", "obsolete"],
+      "required": ["experimental", "standard_track", "obsolete"],
       "additionalProperties": false
     },
 
-    "feature": {
+    "subfeature": {
       "type": "object",
       "properties": {
-        "Android": { "$ref": "#/definitions/support_statement" },
-        "Android Webview": { "$ref": "#/definitions/support_statement" },
-        "Chrome": { "$ref": "#/definitions/support_statement" },
-        "Chrome for Android": { "$ref": "#/definitions/support_statement" },
-        "Edge": { "$ref": "#/definitions/support_statement" },
-        "Edge Mobile": { "$ref": "#/definitions/support_statement" },
-        "Firefox": { "$ref": "#/definitions/support_statement" },
-        "Firefox for Android": { "$ref": "#/definitions/support_statement" },
-        "IE Mobile": { "$ref": "#/definitions/support_statement" },
-        "Internet Explorer": { "$ref": "#/definitions/support_statement" },
-        "Node.js": { "$ref": "#/definitions/support_statement" },
-        "Opera": { "$ref": "#/definitions/support_statement" },
-        "Opera Mobile": { "$ref": "#/definitions/support_statement" },
-        "Safari": { "$ref": "#/definitions/support_statement" },
-        "Safari Mobile": { "$ref": "#/definitions/support_statement" },
-        "Servo": { "$ref": "#/definitions/support_statement" },
+        "desc": { "type": ["string"] },
+        "support": { "$ref": "#/definitions/compat_block" },
         "status": { "$ref": "#/definitions/status_statement" }
       },
-      "required": ["Chrome", "Opera", "Edge", "Firefox", "Firefox for Android"],
       "additionalProperties": false
     },
 
-    "feature_set": {
+    "compat_block": {
       "type": "object",
       "properties": {
-        "Basic support": { "$ref": "#/definitions/feature" }
+        "webview_android": { "$ref": "#/definitions/support_statement" },
+        "chrome": { "$ref": "#/definitions/support_statement" },
+        "chrome_android": { "$ref": "#/definitions/support_statement" },
+        "edge": { "$ref": "#/definitions/support_statement" },
+        "edge_mobile": { "$ref": "#/definitions/support_statement" },
+        "firefox": { "$ref": "#/definitions/support_statement" },
+        "firefox_android": { "$ref": "#/definitions/support_statement" },
+        "ie_mobile": { "$ref": "#/definitions/support_statement" },
+        "ie": { "$ref": "#/definitions/support_statement" },
+        "opera": { "$ref": "#/definitions/support_statement" },
+        "opera_android": { "$ref": "#/definitions/support_statement" },
+        "safari": { "$ref": "#/definitions/support_statement" },
+        "safari_ios": { "$ref": "#/definitions/support_statement" },
+        "servo": { "$ref": "#/definitions/support_statement" }
       },
-      "required": ["Basic support"],
-      "additionalProperties": { "$ref": "#/definitions/feature" }
+      "additionalProperties": true
+    },
+
+    "subfeature_set": {
+      "type": "object",
+      "properties": {
+        "basic_support": { "$ref": "#/definitions/subfeature" }
+      },
+      "required": ["basic_support"],
+      "additionalProperties": { "$ref": "#/definitions/subfeature" }
+    },
+
+    "identifier": {
+      "type": "object",
+      "properties": {
+        "__compat": { "$ref": "#/definitions/subfeature_set" }
+      },
+      "patternProperties":{
+        "^(?!__compat).*$" : { "$ref": "#/definitions/identifier" }
+      },
+      "additionalProperties": false
+    },
+
+    "compat_data": {
+      "type": "object",
+      "patternProperties": {
+        "^(?!__compat).*$" : { "$ref": "#/definitions/identifier" }
+      },
+      "additionalProperties": false
     }
 
   },
 
   "type": "object",
-  "additionalProperties": { "$ref": "#/definitions/feature_set" }
-
+  "properties": {
+    "version": { "type": "string"},
+    "data": { "$ref" : "#/definitions/compat_data" }
+  },
+  "required": ["version", "data"],
+  "additionalProperties": false
 }
diff --git a/css/properties/background-attachment.json b/css/properties/background-attachment.json
index 0aeaad65859d2..a8f51ee67bd50 100644
--- a/css/properties/background-attachment.json
+++ b/css/properties/background-attachment.json
@@ -1,154 +1,169 @@
 {
-  "background-attachment": {
-    "Basic support": {
-      "Android": {
-        "support": true
-      },
-      "Chrome": {
-        "support": "1.0"
-      },
-      "Chrome for Android": {
-        "support": true
-      },
-      "Edge": {
-        "support": "12"
-      },
-      "Edge Mobile": {
-        "support": true
-      },
-      "Firefox": {
-        "support": "1.0"
-      },
-      "Firefox for Android": {
-        "support": "1.0"
-      },
-      "Internet Explorer": {
-        "support": "4"
-      },
-      "IE Mobile": {
-        "support": true
-      },
-      "Opera": {
-        "support": "3.5"
-      },
-      "Opera Mobile": {
-        "support": "10.0"
-      },
-      "Safari": {
-        "support": "1.0"
-      },
-      "Safari Mobile": {
-        "support": "3.2"
-      },
-      "Servo": {
-        "support": null
-      },
-      "status": {
-        "experimental": false,
-        "standardized": true,
-        "stable": true,
-        "obsolete": false
-      }
-    },
-    "Multiple backgrounds": {
-      "Android": {
-        "support": true
-      },
-      "Chrome": {
-        "support": "1.0"
-      },
-      "Chrome for Android": {
-        "support": true
-      },
-      "Edge": {
-        "support": "12"
-      },
-      "Edge Mobile": {
-        "support": true
-      },
-      "Firefox": {
-        "support": "3.6"
-      },
-      "Firefox for Android": {
-        "support": true
-      },
-      "Internet Explorer": {
-        "support": "9.0"
-      },
-      "IE Mobile": {
-        "support": true
-      },
-      "Opera": {
-        "support": "10.5"
-      },
-      "Opera Mobile": {
-        "support": "10.0"
-      },
-      "Safari": {
-        "support": "1.3"
-      },
-      "Safari Mobile": {
-        "support": "3.2"
-      },
-      "Servo": {
-        "support": null
-      },
-      "status": {
-        "experimental": false,
-        "standardized": true,
-        "stable": true,
-        "obsolete": false
-      }
-    },
-    "local": {
-      "Android": {
-        "support": null
-      },
-      "Chrome": {
-        "support": "1.0"
-      },
-      "Chrome for Android": {
-        "support": true
-      },
-      "Edge": {
-        "support": "12"
-      },
-      "Edge Mobile": {
-        "support": true
-      },
-      "Firefox": {
-        "support": "25"
-      },
-      "Firefox for Android": {
-        "support": "25"
-      },
-      "Internet Explorer": {
-        "support": "9.0"
-      },
-      "IE Mobile": {
-        "support": true
-      },
-      "Opera": {
-        "support": "10.5"
-      },
-      "Opera Mobile": {
-        "support": null
-      },
-      "Safari": {
-        "support": "5.0"
-      },
-      "Safari Mobile": {
-        "support": null
-      },
-      "Servo": {
-        "support": null
-      },
-      "status": {
-        "experimental": false,
-        "standardized": true,
-        "stable": true,
-        "obsolete": false
+  "version": "1.0.0",
+  "data": {
+    "css": {
+      "properties": {
+        "background-attachment": {
+          "__compat": {
+            "basic_support": {
+              "desc": "Basic support",
+              "support": {
+                "webview_android": {
+                  "version_added": true
+                },
+                "chrome": {
+                  "version_added": "1.0"
+                },
+                "chrome_android": {
+                  "version_added": true
+                },
+                "edge": {
+                  "version_added": "12"
+                },
+                "edge_mobile": {
+                  "version_added": true
+                },
+                "firefox": {
+                  "version_added": "1.0"
+                },
+                "firefox_android": {
+                  "version_added": "1.0"
+                },
+                "ie": {
+                  "version_added": "4"
+                },
+                "ie_mobile": {
+                  "version_added": true
+                },
+                "opera": {
+                  "version_added": "3.5"
+                },
+                "opera_mobile": {
+                  "version_added": "10.0"
+                },
+                "safari": {
+                  "version_added": "1.0"
+                },
+                "safari_ios": {
+                  "version_added": "3.2"
+                },
+                "servo": {
+                  "version_added": null
+                }
+              },
+              "status": {
+                "experimental": false,
+                "standard_track": true,
+                "obsolete": false
+              }
+            },
+            "multiple_backgrounds": {
+              "desc": "Multiple backgrounds",
+              "support": {
+                "webview_android": {
+                  "version_added": true
+                },
+                "chrome": {
+                  "version_added": "1.0"
+                },
+                "chrome_android": {
+                  "version_added": true
+                },
+                "edge": {
+                  "version_added": "12"
+                },
+                "edge_mobile": {
+                  "version_added": true
+                },
+                "firefox": {
+                  "version_added": "3.6"
+                },
+                "firefox_android": {
+                  "version_added": true
+                },
+                "ie": {
+                  "version_added": "9.0"
+                },
+                "ie_mobile": {
+                  "version_added": true
+                },
+                "opera": {
+                  "version_added": "10.5"
+                },
+                "opera_android": {
+                  "version_added": "10.0"
+                },
+                "safari": {
+                  "version_added": "1.3"
+                },
+                "safari_ios": {
+                  "version_added": "3.2"
+                },
+                "servo": {
+                  "version_added": null
+                }
+              },
+              "status": {
+                "experimental": false,
+                "standard_track": true,
+                "obsolete": false
+              }
+            },
+            "local": {
+              "desc": "<code>local</code>",
+              "support": {
+                "webview_android": {
+                  "version_added": null
+                },
+                "chrome": {
+                  "version_added": "1.0"
+                },
+                "chrome_android": {
+                  "version_added": true
+                },
+                "edge": {
+                  "version_added": "12"
+                },
+                "edge_mobile": {
+                  "version_added": true
+                },
+                "firefox": {
+                  "version_added": "25"
+                },
+                "firefox_android": {
+                  "version_added": "25"
+                },
+                "ie": {
+                  "version_added": "9.0"
+                },
+                "ie_mobile": {
+                  "version_added": true
+                },
+                "opera": {
+                  "version_added": "10.5"
+                },
+                "opera_android": {
+                  "version_added": null
+                },
+                "safari": {
+                  "version_added": "5.0"
+                },
+                "safari_ios": {
+                  "version_added": null
+                },
+                "servo": {
+                  "version_added": null
+                }
+              },
+              "status": {
+                "experimental": false,
+                "standard_track": true,
+                "obsolete": false
+              }
+            }
+          }
+        }
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/css/properties/background-clip.json b/css/properties/background-clip.json
index 5f441ba194ba9..f25493814b8a0 100644
--- a/css/properties/background-clip.json
+++ b/css/properties/background-clip.json
@@ -1,167 +1,182 @@
 {
-  "background-clip": {
-    "Basic support": {
-      "Android": {
-        "support": "4.1"
-      },
-      "Chrome": {
-        "support": "1.0",
-        "notes": ["Webkit also supports the prefixed version of this property, and in that case, in addition to the current keywords, the alternative synonyms are: <code>padding</code>, <code>border</code>, and <code>content</code>."]
-      },
-      "Chrome for Android": {
-        "support": true
-      },
-      "Edge": {
-        "support": "12"
-      },
-      "Edge Mobile": {
-        "support": true
-      },
-      "Firefox": {
-        "support": "4.0",
-        "notes": ["Gecko supported, from version 1.1 to version 1.9.2, which corresponds to Firefox 1.0 to 3.6 included, a different and prefixed syntax: <code>-moz-background-clip: padding | border</code>."]
-      },
-      "Firefox for Android": {
-        "support": "14.0"
-      },
-      "Internet Explorer": {
-        "support": "9.0",
-        "notes": ["In IE 7 and IE 9 of Internet Explorer, it always behaved like <code>background-clip: padding</code> if <code>overflow: hidden | auto | scroll</code>"]
-      },
-      "IE Mobile": {
-        "support": "7.1"
-      },
-      "Opera": {
-        "support": "10.5"
-      },
-      "Opera Mobile": {
-        "support": "12.1"
-      },
-      "Safari": {
-        "support": "3.0",
-        "notes": ["Webkit also supports the prefixed version of this property, and in that case, in addition to the current keywords, the alternative synonyms are: <code>padding</code>, <code>border</code>, and <code>content</code>."]
-      },
-      "Safari Mobile": {
-        "support": true
-      },
-      "Servo": {
-        "support": null
-      },
-      "status": {
-        "experimental": false,
-        "standardized": true,
-        "stable": true,
-        "obsolete": false
-      }
-    },
-    "content-box": {
-      "Android": {
-        "support": "4.1"
-      },
-      "Chrome": {
-        "support": "1.0"
-      },
-      "Chrome for Android": {
-        "support": true
-      },
-      "Edge": {
-        "support": "12"
-      },
-      "Edge Mobile": {
-        "support": true
-      },
-      "Firefox": {
-        "support": "4.0",
-        "notes": ["Gecko supported, from version 1.1 to version 1.9.2, which corresponds to Firefox 1.0 to 3.6 included, a different and prefixed syntax: <code>-moz-background-clip: padding | border</code>."]
-      },
-      "Firefox for Android": {
-        "support": "14.0"
-      },
-      "Internet Explorer": {
-        "support": "9.0",
-        "notes": ["In IE 7 and IE 9 of Internet Explorer, it always behaved like <code>background-clip: padding</code> if <code>overflow: hidden | auto | scroll</code>"]
-      },
-      "IE Mobile": {
-        "support": "7.1"
-      },
-      "Opera": {
-        "support": "10.5"
-      },
-      "Opera Mobile": {
-        "support": "12.1"
-      },
-      "Safari": {
-        "support": "3.0"
-      },
-      "Safari Mobile": {
-        "support": true
-      },
-      "Servo": {
-        "support": null
-      },
-      "status": {
-        "experimental": false,
-        "standardized": true,
-        "stable": true,
-        "obsolete": false
-      }
-    },
-    "text": {
-      "Android": {
-        "support": null
-      },
-      "Chrome": {
-        "support": true,
-        "notes": ["Support the prefixed version of the property only; according to the <a href=\"https://webkit.org/blog/164/background-clip-text/\">official blog</a>, WebKit does not include text decorations or shadows in the clipping."]
-      },
-      "Chrome for Android": {
-        "support": null
-      },
-      "Edge": {
-        "support": false
-      },
-      "Edge Mobile": {
-        "support": true
-      },
-      "Firefox": {
-        "support": "49.0",
-        "notes": ["In Firefox 48, it was not activated by default and its support could be activated by setting <code>layout.css.background-clip-text.enabled</code> pref to <code>true</code>."]
-      },
-      "Firefox for Android": {
-        "support": "49.0",
-        "notes": ["In Firefox 48, it was not activated by default and its support could be activated by setting <code>layout.css.background-clip-text.enabled</code> pref to <code>true</code>."]
-      },
-      "Internet Explorer": {
-        "support": false
-      },
-      "IE Mobile": {
-        "support": false
-      },
-      "Opera": {
-        "support": true,
-        "notes": ["Support the prefixed version of the property only; according to the <a href=\"https://webkit.org/blog/164/background-clip-text/\">official blog</a>, WebKit does not include text decorations or shadows in the clipping."]
-      },
-      "Opera Mobile": {
-        "support": true,
-        "notes": ["Support the prefixed version of the property only; according to the <a href=\"https://webkit.org/blog/164/background-clip-text/\">official blog</a>, WebKit does not include text decorations or shadows in the clipping."]
-      },
-      "Safari": {
-        "support": true,
-        "notes": ["Support the prefixed version of the property only; according to the <a href=\"https://webkit.org/blog/164/background-clip-text/\">official blog</a>, WebKit does not include text decorations or shadows in the clipping."]
-      },
-      "Safari Mobile": {
-        "support": true,
-        "notes": ["Support the prefixed version of the property only; according to the <a href=\"https://webkit.org/blog/164/background-clip-text/\">official blog</a>, WebKit does not include text decorations or shadows in the clipping."]
-      },
-      "Servo": {
-        "support": null
-      },
-      "status": {
-        "experimental": true,
-        "standardized": true,
-        "stable": true,
-        "obsolete": false
+  "version": "1.0.0",
+  "data": {
+    "css": {
+      "properties": {
+        "background-clip": {
+          "__compat": {
+            "basic_support": {
+              "desc": "Basic support",
+              "support": {
+                "webview_android": {
+                  "version_added": "4.1"
+                },
+                "chrome": {
+                  "version_added": "1.0",
+                  "notes": "Webkit also supports the prefixed version of this property, and in that case, in addition to the current keywords, the alternative synonyms are: <code>padding</code>, <code>border</code>, and <code>content</code>."
+                },
+                "chrome_android": {
+                  "version_added": true
+                },
+                "edge": {
+                  "version_added": "12"
+                },
+                "edge_mobile": {
+                  "version_added": true
+                },
+                "firefox": {
+                  "version_added": "4.0",
+                  "notes": "Gecko supported, from version 1.1 to version 1.9.2, corresponding to Firefox 1.0 to 3.6 included, a different and prefixed syntax: <code>-moz-background-clip: padding | border</code>."
+                },
+                "firefox_android": {
+                  "version_added": "14.0"
+                },
+                "ie": {
+                  "version_added": "9.0",
+                  "notes": "In IE 7 and IE 8 of Internet Explorer, this property always behaved like <code>background-clip: padding</code> when <code>overflow</code> was <code>hidden</code>, <code>auto</code>, or <code>scroll</code>."
+                },
+                "ie_mobile": {
+                  "version_added": "7.1"
+                },
+                "opera": {
+                  "version_added": "10.5"
+                },
+                "opera_android": {
+                  "version_added": "12.1"
+                },
+                "safari": {
+                  "version_added": "3.0",
+                  "notes": "Webkit also supports the prefixed version of this property, and in that case, in addition to the current keywords, the alternative synonyms are: <code>padding</code>, <code>border</code>, and <code>content</code>."
+                },
+                "safari_ios": {
+                  "version_added": true
+                },
+                "servo": {
+                  "version_added": null
+                }
+              },
+              "status": {
+                "experimental": false,
+                "standard_track": true,
+                "obsolete": false
+              }
+            },
+            "content-box": {
+              "desc": "<code>content-box</code>",
+              "support": {
+                "android": {
+                  "version_added": "4.1"
+                },
+                "chrome": {
+                  "version_added": "1.0"
+                },
+                "chrome_android": {
+                  "version_added": true
+                },
+                "edge": {
+                  "version_added": "12"
+                },
+                "edge_mobile": {
+                  "version_added": true
+                },
+                "firefox": {
+                  "version_added": "4.0",
+                  "notes": "Gecko supported, from version 1.1 to version 1.9.2, which corresponds to Firefox 1.0 to 3.6 included, a different and prefixed syntax: <code>-moz-background-clip: padding | border</code>."
+                },
+                "firefox_android": {
+                  "version_added": "14.0"
+                },
+                "ie": {
+                  "version_added": "9.0",
+                  "notes": "In IE 7 and IE 9 of Internet Explorer, it always behaved like <code>background-clip: padding</code> if <code>overflow: hidden | auto | scroll</code>"
+                },
+                "ie_mobile": {
+                  "version_added": "7.1"
+                },
+                "opera": {
+                  "version_added": "10.5"
+                },
+                "opera_android": {
+                  "version_added": "12.1"
+                },
+                "safari": {
+                  "version_added": "3.0"
+                },
+                "safari_ios": {
+                  "version_added": true
+                },
+                "servo": {
+                  "version_added": null
+                }
+              },
+              "status": {
+                "experimental": false,
+                "standard_track": true,
+                "obsolete": false
+              }
+            },
+            "text": {
+              "desc": "<code>text</code>",
+              "support": {
+                "webview_android": {
+                  "version_added": null
+                },
+                "chrome": {
+                  "version_added": true,
+                  "notes": "Support the prefixed version of the property only; according to the <a href=\"https://webkit.org/blog/164/background-clip-text/\">official blog</a>, WebKit does not include text decorations or shadows in the clipping."
+                },
+                "chrome_android": {
+                  "version_added": null
+                },
+                "edge": {
+                  "version_added": false
+                },
+                "edge_mobile": {
+                  "version_added": true
+                },
+                "firefox": {
+                  "version_added": "49.0",
+                  "notes": "In Firefox 48, it was not activated by default and its support could be activated by setting <code>layout.css.background-clip-text.enabled</code> pref to <code>true</code>."
+                },
+                "firefox_android": {
+                  "version_added": "49.0",
+                  "notes": "In Firefox 48, it was not activated by default and its support could be activated by setting <code>layout.css.background-clip-text.enabled</code> pref to <code>true</code>."
+                },
+                "ie": {
+                  "version_added": false
+                },
+                "ie_mobile": {
+                  "version_added": false
+                },
+                "opera": {
+                  "version_added": true,
+                  "notes": "Support the prefixed version of the property only; according to the <a href=\"https://webkit.org/blog/164/background-clip-text/\">official blog</a>, WebKit does not include text decorations or shadows in the clipping."
+                },
+                "opera_android": {
+                  "version_added": true,
+                  "notes": "Support the prefixed version of the property only; according to the <a href=\"https://webkit.org/blog/164/background-clip-text/\">official blog</a>, WebKit does not include text decorations or shadows in the clipping."
+                },
+                "safari": {
+                  "version_added": true,
+                  "notes": "Support the prefixed version of the property only; according to the <a href=\"https://webkit.org/blog/164/background-clip-text/\">official blog</a>, WebKit does not include text decorations or shadows in the clipping."
+                },
+                "safari_ios": {
+                  "version_added": true,
+                  "notes": "Support the prefixed version of the property only; according to the <a href=\"https://webkit.org/blog/164/background-clip-text/\">official blog</a>, WebKit does not include text decorations or shadows in the clipping."
+                },
+                "servo": {
+                  "version_added": null
+                }
+              },
+              "status": {
+                "experimental": true,
+                "standard_track": true,
+                "obsolete": false
+              }
+            }
+          }
+        }
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/css/properties/background-color.json b/css/properties/background-color.json
index dbc9db3846756..6730210996bca 100644
--- a/css/properties/background-color.json
+++ b/css/properties/background-color.json
@@ -1,105 +1,118 @@
 {
-  "background-color": {
-    "Basic support": {
-      "Android": {
-        "support": true
-      },
-      "Chrome": {
-        "support": "1.0"
-      },
-      "Chrome for Android": {
-        "support": true
-      },
-      "Edge": {
-        "support": "12"
-      },
-      "Edge Mobile": {
-        "support": true
-      },
-      "Firefox": {
-        "support": "1.0"
-      },
-      "Firefox for Android": {
-        "support": "1.0"
-      },
-      "Internet Explorer": {
-        "support": "4.0",
-        "notes": ["In Internet Explorer 8 and 9, there is a bug where a computed <code>background-color</code> of <code>transparent</code> causes <code>click</code> events to not get fired on overlaid elements."]
-      },
-      "IE Mobile": {
-        "support": true
-      },
-      "Opera": {
-        "support": "3.5"
-      },
-      "Opera Mobile": {
-        "support": true
-      },
-      "Safari": {
-        "support": "1.0"
-      },
-      "Safari Mobile": {
-        "support": true
-      },
-      "Servo": {
-        "support": null
-      },
-      "status": {
-        "experimental": false,
-        "standardized": true,
-        "stable": true,
-        "obsolete": false
-      }
-    },
-    "Alpha channel for hex value": {
-      "Android": {
-        "support": "52.0"
-      },
-      "Chrome": {
-        "support": "52.0"
-      },
-      "Chrome for Android": {
-        "support": "52.0"
-      },
-      "Edge": {
-        "support": false
-      },
-      "Edge Mobile": {
-        "support": false
-      },
-      "Firefox": {
-        "support": false
-      },
-      "Firefox for Android": {
-        "support": false
-      },
-      "Internet Explorer": {
-        "support": false
-      },
-      "IE Mobile": {
-        "support": false
-      },
-      "Opera": {
-        "support": false
-      },
-      "Opera Mobile": {
-        "support": false
-      },
-      "Safari": {
-        "support": false
-      },
-      "Safari Mobile": {
-        "support": false
-      },
-      "Servo": {
-        "support": false
-      },
-      "status": {
-        "experimental": true,
-        "standardized": true,
-        "stable": true,
-        "obsolete": false
+  "version": "1.0.0",
+  "data": {
+    "css": {
+      "properties": {
+        "background-color": {
+          "__compat": {
+            "basic_support": {
+              "desc": "Basic support",
+              "support": {
+                "webview_android": {
+                  "version_added": true
+                },
+                "chrome": {
+                  "version_added": "1.0"
+                },
+                "chrome_android": {
+                  "version_added": true
+                },
+                "edge": {
+                  "version_added": "12"
+                },
+                "edge_mobile": {
+                  "version_added": true
+                },
+                "firefox": {
+                  "version_added": "1.0"
+                },
+                "firefox_android": {
+                  "version_added": "1.0"
+                },
+                "ie": {
+                  "version_added": "4.0",
+                  "notes": "In Internet Explorer 8 and 9, there is a bug where a computed <code>background-color</code> of <code>transparent</code> causes <code>click</code> events to not get fired on overlaid elements."
+                },
+                "ie_mobile": {
+                  "version_added": true
+                },
+                "opera": {
+                  "version_added": "3.5"
+                },
+                "opera_android": {
+                  "version_added": true
+                },
+                "safari": {
+                  "version_added": "1.0"
+                },
+                "safari_ios": {
+                  "version_added": true
+                },
+                "servo": {
+                  "version_added": null
+                }
+              },
+              "status": {
+                "experimental": false,
+                "standard_track": true,
+                "obsolete": false
+              }
+            },
+            "alpha_ch_for_hex": {
+              "desc": "Alpha channel for hex values",
+              "support": {
+                "webview_android": {
+                  "version_added": "52.0"
+                },
+                "chrome": {
+                  "version_added": "52.0"
+                },
+                "chrome_for_android": {
+                  "version_added": "52.0"
+                },
+                "edge": {
+                  "version_added": false
+                },
+                "edge_mobile": {
+                  "version_added": false
+                },
+                "firefox": {
+                  "version_added": false
+                },
+                "firefox_android": {
+                  "version_added": false
+                },
+                "ie": {
+                  "version_added": false
+                },
+                "ie_mobile": {
+                  "version_added": false
+                },
+                "opera": {
+                  "version_added": false
+                },
+                "opera_android": {
+                  "version_added": false
+                },
+                "safari": {
+                  "version_added": false
+                },
+                "safari_ios": {
+                  "version_added": false
+                },
+                "servo": {
+                  "version_added": false
+                }
+              },
+              "status": {
+                "experimental": true,
+                "standard_track": true,
+                "obsolete": false
+              }
+            }
+          }
+        }
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/css/properties/background-image.json b/css/properties/background-image.json
index 2f176346c26e0..6bedc071c8c80 100644
--- a/css/properties/background-image.json
+++ b/css/properties/background-image.json
@@ -1,369 +1,394 @@
 {
-  "background-image": {
-    "Basic support": {
-      "Android": {
-        "support": true
-      },
-      "Chrome": {
-        "support": "1"
-      },
-      "Chrome for Android": {
-        "support": true
-      },
-      "Edge": {
-        "support": "12"
-      },
-      "Edge Mobile": {
-        "support": true
-      },
-      "Firefox": {
-        "support": "1.0",
-        "notes": ["If the <code>browser.display.use_document_colors</code> user preference in <code>about:config</code> is set to <code>false</code>, background images will not be displayed."]
-      },
-      "Firefox for Android": {
-        "support": true
-      },
-      "Internet Explorer": {
-        "support": "4"
-      },
-      "IE Mobile": {
-        "support": true
-      },
-      "Opera": {
-        "support": "3.5"
-      },
-      "Opera Mobile": {
-        "support": true
-      },
-      "Safari": {
-        "support": "1.0"
-      },
-      "Safari Mobile": {
-        "support": true
-      },
-      "Servo": {
-        "support": null
-      },
-      "status": {
-        "experimental": false,
-        "standardized": true,
-        "stable": true,
-        "obsolete": false
-      }
-    },
-    "Multiple backgrounds": {
-      "Android": {
-        "support": true
-      },
-      "Chrome": {
-        "support": "1.0"
-      },
-      "Chrome for Android": {
-        "support": true
-      },
-      "Edge": {
-        "support": "12"
-      },
-      "Edge Mobile": {
-        "support": true
-      },
-      "Firefox": {
-        "support": "3.6"
-      },
-      "Firefox for Android": {
-        "support": true
-      },
-      "Internet Explorer": {
-        "support": "9.0"
-      },
-      "IE Mobile": {
-        "support": true
-      },
-      "Opera": {
-        "support": true
-      },
-      "Opera Mobile": {
-        "support": true
-      },
-      "Safari": {
-        "support": "1.3"
-      },
-      "Safari Mobile": {
-        "support": true
-      },
-      "Servo": {
-        "support": null
-      },
-      "status": {
-        "experimental": false,
-        "standardized": true,
-        "stable": true,
-        "obsolete": false
-      }
-    },
-    "Gradients": {
-      "Android": {
-        "support": true
-      },
-      "Chrome": {
-        "support": "1.0",
-        "notes": ["Some versions support only experimental gradients prefixed with <code>-webkit</code>"]
-      },
-      "Chrome for Android": {
-        "support": true,
-        "notes": ["Some versions support only experimental gradients prefixed with <code>-webkit</code>"]
-      },
-      "Edge": {
-        "support": "12"
-      },
-      "Edge Mobile": {
-        "support": true
-      },
-      "Firefox": {
-        "support": "3.6",
-        "notes": ["Some versions support only experimental gradients prefixed with <code>-moz</code>"]
-      },
-      "Firefox for Android": {
-        "support": true,
-        "notes": ["Some versions support only experimental gradients prefixed with <code>-moz</code>"]
-      },
-      "Internet Explorer": {
-        "support": "10"
-      },
-      "IE Mobile": {
-        "support": true
-      },
-      "Opera": {
-        "support": "11",
-        "notes": ["Some versions support only experimental gradients prefixed with <code>-o</code>"]
-      },
-      "Opera Mobile": {
-        "support": true,
-        "notes": ["Some versions support only experimental gradients prefixed with <code>-o</code>"]
-      },
-      "Safari": {
-        "support": "4.0",
-        "notes": ["Some versions support only experimental gradients prefixed with <code>-webkit</code>"]
-      },
-      "Safari Mobile": {
-        "support": true,
-        "notes": ["Some versions support only experimental gradients prefixed with <code>-webkit</code>"]
-      },
-      "Servo": {
-        "support": null
-      },
-      "status": {
-        "experimental": false,
-        "standardized": true,
-        "stable": true,
-        "obsolete": false
-      }
-    },
-    "SVG images": {
-      "Android": {
-        "support": false
-      },
-      "Chrome": {
-        "support": "8.0"
-      },
-      "Chrome for Android": {
-        "support": true
-      },
-      "Edge": {
-        "support": "12"
-      },
-      "Edge Mobile": {
-        "support": true
-      },
-      "Firefox": {
-        "support": "4.0"
-      },
-      "Firefox for Android": {
-        "support": true
-      },
-      "Internet Explorer": {
-        "support": "9.0"
-      },
-      "IE Mobile": {
-        "support": true
-      },
-      "Opera": {
-        "support": "9.5"
-      },
-      "Opera Mobile": {
-        "support": true
-      },
-      "Safari": {
-        "support": "5.0",
-        "notes": ["Support of SVG in CSS background is incomplete in the current version of iOS Safari (5.0)."]
-      },
-      "Safari Mobile": {
-        "support": "5.0",
-        "notes": ["Support of SVG in CSS background is incomplete in the current version of iOS Safari (5.0)."]
-      },
-      "Servo": {
-        "support": null
-      },
-      "status": {
-        "experimental": false,
-        "standardized": true,
-        "stable": true,
-        "obsolete": false
-      }
-    },
-    "element": {
-      "Android": {
-        "support": false
-      },
-      "Chrome": {
-        "support": false
-      },
-      "Chrome for Android": {
-        "support": false
-      },
-      "Edge": {
-        "support": false
-      },
-      "Edge Mobile": {
-        "support": false
-      },
-      "Firefox": {
-        "support": true,
-        "notes": ["<code>element()</code> is supported only in its <code>-moz-element()</code> prefixed version"]
-      },
-      "Firefox for Android": {
-        "support": true,
-        "notes": ["<code>element()</code> is supported only in its <code>-moz-element()</code> prefixed version"]
-      },
-      "Internet Explorer": {
-        "support": false
-      },
-      "IE Mobile": {
-        "support": false
-      },
-      "Opera": {
-        "support": false
-      },
-      "Opera Mobile": {
-        "support": false
-      },
-      "Safari": {
-        "support": false
-      },
-      "Safari Mobile": {
-        "support": false
-      },
-      "Servo": {
-        "support": null
-      },
-      "status": {
-        "experimental": true,
-        "standardized": true,
-        "stable": true,
-        "obsolete": false
-      }
-    },
-    "image-rect": {
-      "Android": {
-        "support": false
-      },
-      "Chrome": {
-        "support": false
-      },
-      "Chrome for Android": {
-        "support": false
-      },
-      "Edge": {
-        "support": false
-      },
-      "Edge Mobile": {
-        "support": false
-      },
-      "Firefox": {
-        "support": true,
-        "notes": ["<code>image-rect()</code> is supported only in its <code>-moz-image-rect()</code> prefixed version"]
-      },
-      "Firefox for Android": {
-        "support": true,
-        "notes": ["<code>image-rect()</code> is supported only in its <code>-moz-image-rect()</code> prefixed version"]
-      },
-      "Internet Explorer": {
-        "support": false
-      },
-      "IE Mobile": {
-        "support": false
-      },
-      "Opera": {
-        "support": false
-      },
-      "Opera Mobile": {
-        "support": false
-      },
-      "Safari": {
-        "support": false
-      },
-      "Safari Mobile": {
-        "support": false
-      },
-      "Servo": {
-        "support": null
-      },
-      "status": {
-        "experimental": true,
-        "standardized": true,
-        "stable": true,
-        "obsolete": false
-      }
-    },
-    "Any <image> value": {
-      "Android": {
-        "support": true
-      },
-      "Chrome": {
-        "support": true
-      },
-      "Chrome for Android": {
-        "support": true
-      },
-      "Edge": {
-        "support": null
-      },
-      "Edge Mobile": {
-        "support": null
-      },
-      "Firefox": {
-        "support": false
-      },
-      "Firefox for Android": {
-        "support": false
-      },
-      "Internet Explorer": {
-        "support": null
-      },
-      "IE Mobile": {
-        "support": null
-      },
-      "Opera": {
-        "support": null
-      },
-      "Opera Mobile": {
-        "support": null
-      },
-      "Safari": {
-        "support": null
-      },
-      "Safari Mobile": {
-        "support": null
-      },
-      "Servo": {
-        "support": false
-      },
-      "status": {
-        "experimental": false,
-        "standardized": true,
-        "stable": true,
-        "obsolete": false
+  "version": "1.0.0",
+  "data": {
+    "css": {
+      "properties": {
+        "background-image": {
+          "__compat": {
+            "basic_support": {
+              "desc": "Basic support",
+              "support": {
+                "webview_android": {
+                  "version_added": true
+                },
+                "chrome": {
+                  "version_added": "1"
+                },
+                "chrome_android": {
+                  "version_added": true
+                },
+                "edge": {
+                  "version_added": "12"
+                },
+                "edge_mobile": {
+                  "version_added": true
+                },
+                "firefox": {
+                  "version_added": "1.0",
+                  "notes": ["If the <code>browser.display.use_document_colors</code> user preference in <code>about:config</code> is set to <code>false</code>, background images will not be displayed."]
+                },
+                "firefox_android": {
+                  "version_added": true
+                },
+                "ie": {
+                  "version_added": "4"
+                },
+                "ie_mobile": {
+                  "version_added": true
+                },
+                "opera": {
+                  "version_added": "3.5"
+                },
+                "opera_android": {
+                  "version_added": true
+                },
+                "safari": {
+                  "version_added": "1.0"
+                },
+                "safari_ios": {
+                  "version_added": true
+                },
+                "servo": {
+                  "version_added": null
+                }
+              },
+              "status": {
+                "experimental": false,
+                "standard_track": true,
+                "obsolete": false
+              }
+            },
+            "multiple_backgrounds": {
+              "desc": "Multiple backgrounds",
+              "support": {
+                "webview_android": {
+                  "version_added": true
+                },
+                "chrome": {
+                  "version_added": "1.0"
+                },
+                "chrome_android": {
+                  "version_added": true
+                },
+                "edge": {
+                  "version_added": "12"
+                },
+                "edge_mobile": {
+                  "version_added": true
+                },
+                "firefox": {
+                  "version_added": "3.6"
+                },
+                "firefox_android": {
+                  "version_added": true
+                },
+                "ie": {
+                  "version_added": "9.0"
+                },
+                "ie_mobile": {
+                  "version_added": true
+                },
+                "opera": {
+                  "version_added": true
+                },
+                "opera_android": {
+                  "version_added": true
+                },
+                "safari": {
+                  "version_added": "1.3"
+                },
+                "safari_ios": {
+                  "version_added": true
+                },
+                "servo": {
+                  "version_added": null
+                }
+              },
+              "status": {
+                "experimental": false,
+                "standard_track": true,
+                "obsolete": false
+              }
+            },
+            "gradients": {
+              "desc": "Gradients",
+              "support": {
+                "webview_android": {
+                  "version_added": true
+                },
+                "chrome": {
+                  "version_added": "1.0",
+                  "notes": "Some versions support only experimental gradients prefixed with <code>-webkit</code>."
+                },
+                "chrome_android": {
+                  "version_added": true,
+                  "notes": "Some versions support only experimental gradients prefixed with <code>-webkit</code>."
+                },
+                "edge": {
+                  "version_added": "12"
+                },
+                "edge_mobile": {
+                  "version_added": true
+                },
+                "firefox": {
+                  "version_added": "3.6",
+                  "notes": "Some versions support only experimental gradients prefixed with <code>-moz</code>."
+                },
+                "firefox_android": {
+                  "version_added": true,
+                  "notes": "Some versions support only experimental gradients prefixed with <code>-moz</code>."
+                },
+                "ie": {
+                  "version_added": "10"
+                },
+                "ie_mobile": {
+                  "version_added": true
+                },
+                "opera": {
+                  "version_added": "11",
+                  "notes": "Some versions support only experimental gradients prefixed with <code>-o</code>."
+                },
+                "opera_android": {
+                  "version_added": true,
+                  "notes": "Some versions support only experimental gradients prefixed with <code>-o</code>."
+                },
+                "safari": {
+                  "version_added": "4.0",
+                  "notes": "Some versions support only experimental gradients prefixed with <code>-webkit</code>."
+                },
+                "safari_ios": {
+                  "version_added": true,
+                  "notes": "Some versions support only experimental gradients prefixed with <code>-webkit</code>."
+                },
+                "servo": {
+                  "version_added": null
+                }
+              },
+              "status": {
+                "experimental": false,
+                "standard_track": true,
+                "obsolete": false
+              }
+            },
+            "svg_images": {
+              "desc": "SVG images",
+              "support": {
+                "webview_android": {
+                  "version_added": false
+                },
+                "chrome": {
+                  "version_added": "8.0"
+                },
+                "chrome_android": {
+                  "version_added": true
+                },
+                "edge": {
+                  "version_added": "12"
+                },
+                "edge_mobile": {
+                  "version_added": true
+                },
+                "firefox": {
+                  "version_added": "4.0"
+                },
+                "firefox_android": {
+                  "version_added": true
+                },
+                "ie": {
+                  "version_added": "9.0"
+                },
+                "ie_mobile": {
+                  "version_added": true
+                },
+                "opera": {
+                  "version_added": "9.5"
+                },
+                "opera_android": {
+                  "version_added": true
+                },
+                "safari": {
+                  "version_added": "5.0",
+                  "notes": "Support of SVG in CSS background is incomplete."
+                },
+                "safari_ios": {
+                  "version_added": "5.0",
+                  "notes": ["Support of SVG in CSS background is incomplete."]
+                },
+                "servo": {
+                  "version_added": null
+                }
+              },
+              "status": {
+                "experimental": false,
+                "standard_track": true,
+                "obsolete": false
+              }
+            },
+            "element": {
+              "desc": "<code>element()</code>",
+              "support": {
+                "webview_android": {
+                  "version_added": false
+                },
+                "chrome": {
+                  "version_added": false
+                },
+                "chrome_android": {
+                  "version_added": false
+                },
+                "edge": {
+                  "version_added": false
+                },
+                "edge_mobile": {
+                  "version_added": false
+                },
+                "firefox": {
+                  "version_added": true,
+                  "notes": "<code>element()</code> is supported only in its <code>-moz-element()</code> prefixed version"
+                },
+                "firefox_android": {
+                  "version_added": true,
+                  "notes": "<code>element()</code> is supported only in its <code>-moz-element()</code> prefixed version"
+                },
+                "ie": {
+                  "version_added": false
+                },
+                "ie_mobile": {
+                  "version_added": false
+                },
+                "opera": {
+                  "version_added": false
+                },
+                "opera_android": {
+                  "version_added": false
+                },
+                "safari": {
+                  "version_added": false
+                },
+                "safari_ios": {
+                  "version_added": false
+                },
+                "servo": {
+                  "version_added": null
+                }
+              },
+              "status": {
+                "experimental": true,
+                "standard_track": true,
+                "obsolete": false
+              }
+            },
+            "image-rect": {
+              "desc": "<code>image-rect()</code>",
+              "support": {
+                "webview_android": {
+                  "version_added": false
+                },
+                "chrome": {
+                  "version_added": false
+                },
+                "chrome_android": {
+                  "version_added": false
+                },
+                "edge": {
+                  "version_added": false
+                },
+                "edge_mobile": {
+                  "version_added": false
+                },
+                "firefox": {
+                  "prefix": "-moz-",
+                  "version_added": true,
+                  "notes": ["<code>image-rect()</code> is supported only in its <code>-moz-image-rect()</code> prefixed version."]
+                },
+                "firefox_android": {
+                  "prefix": "-moz-",
+                  "version_added": true,
+                  "notes": ["<code>image-rect()</code> is supported only in its <code>-moz-image-rect()</code> prefixed version."]
+                },
+                "ie": {
+                  "version_added": false
+                },
+                "ie_mobile": {
+                  "version_added": false
+                },
+                "opera": {
+                  "version_added": false
+                },
+                "opera_android": {
+                  "version_added": false
+                },
+                "safari": {
+                  "version_added": false
+                },
+                "safari_ios": {
+                  "version_added": false
+                },
+                "servo": {
+                  "version_added": null
+                }
+              },
+              "status": {
+                "experimental": true,
+                "standard_track": true,
+                "obsolete": false
+              }
+            },
+            "any_image": {
+              "desc": "Any <code>&lt;image&gt;</code> value",
+              "support": {
+                "webview_android": {
+                  "version_added": true
+                },
+                "chrome": {
+                  "version_added": true
+                },
+                "chrome_android": {
+                  "version_added": true
+                },
+                "edge": {
+                  "version_added": null
+                },
+                "edge_mobile": {
+                  "version_added": null
+                },
+                "firefox": {
+                  "version_added": false
+                },
+                "fireox_android": {
+                  "version_added": false
+                },
+                "ie": {
+                  "version_added": null
+                },
+                "ie_mobile": {
+                  "version_added": null
+                },
+                "opera": {
+                  "version_added": null
+                },
+                "opera_android": {
+                  "version_added": null
+                },
+                "safari": {
+                  "version_added": null
+                },
+                "safari_ios": {
+                  "version_added": null
+                },
+                "servo": {
+                  "version_added": false
+                }
+              },
+              "status": {
+                "experimental": false,
+                "standard_track": true,
+                "obsolete": false
+              }
+            }
+          }
+        }
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/css/properties/background-origin.json b/css/properties/background-origin.json
index 20b040a929004..bc3a4b49c653c 100644
--- a/css/properties/background-origin.json
+++ b/css/properties/background-origin.json
@@ -1,111 +1,124 @@
 {
-  "background-origin": {
-    "Basic support": {
-      "Android": {
-        "support": "4.1"
-      },
-      "Chrome": {
-        "support": "1.0",
-        "notes": ["Webkit also supports the prefixed version of this property, and in that case, in addition to the current keywords, the alternative synonyms are: <code>padding</code>, <code>border</code>, and <code>content</code>."]
-      },
-      "Chrome for Android": {
-        "support": true
-      },
-      "Edge": {
-        "support": "12"
-      },
-      "Edge Mobile": {
-        "support": true
-      },
-      "Firefox": {
-        "support": "4.0",
-        "notes": ["Gecko supported, from version 1.1 to version 1.9.2, which corresponds to Firefox 1.0 to 3.6 included, a different and prefixed syntax: <code>-moz-background-clip: padding | border</code>.",
-                  "Since Firefox 49, also supports the <code>-webkit</code> prefixed version of the property."]
-      },
-      "Firefox for Android": {
-        "support": "14.0"
-      },
-      "Internet Explorer": {
-        "support": "9.0",
-        "notes": ["In IE 7 and before, Internet explorer was behaving as if <code>background-origin: border-box</code> was set. In Internet Explorer 8, as if <code>background-origin: padding-box</code>, the regular default value, was set."]
-      },
-      "IE Mobile": {
-        "support": "7.1"
-      },
-      "Opera": {
-        "support": "10.5"
-      },
-      "Opera Mobile": {
-        "support": "12.1"
-      },
-      "Safari": {
-        "support": "3.0",
-        "notes": ["Webkit also supports the prefixed version of this property, and in that case, in addition to the current keywords, the alternative synonyms are: <code>padding</code>, <code>border</code>, and <code>content</code>."]
-      },
-      "Safari Mobile": {
-        "support": true
-      },
-      "Servo": {
-        "support": null
-      },
-      "status": {
-        "experimental": false,
-        "standardized": true,
-        "stable": true,
-        "obsolete": false
-      }
-    },
-    "content-box": {
-      "Android": {
-        "support": "4.1"
-      },
-      "Chrome": {
-        "support": "1.0"
-      },
-      "Chrome for Android": {
-        "support": true
-      },
-      "Edge": {
-        "support": "12"
-      },
-      "Edge Mobile": {
-        "support": true
-      },
-      "Firefox": {
-        "support": "4.0",
-        "notes": ["Gecko supported, from version 1.1 to version 1.9.2, which corresponds to Firefox 1.0 to 3.6 included, a different and prefixed syntax: <code>-moz-background-clip: padding | border</code>."]
-      },
-      "Firefox for Android": {
-        "support": "14.0"
-      },
-      "Internet Explorer": {
-        "support": "9.0",
-        "notes": ["In IE 7 and IE 9 of Internet Explorer, it always behaved like <code>background-clip: padding</code> if <code>overflow: hidden | auto | scroll</code>."]
-      },
-      "IE Mobile": {
-        "support": "7.1"
-      },
-      "Opera": {
-        "support": "10.5"
-      },
-      "Opera Mobile": {
-        "support": "12.1"
-      },
-      "Safari": {
-        "support": "3.0",
-        "notes": ["Webkit also supports the prefixed version of this property, and in that case, in addition to the current keywords, the alternative synonyms are: <code>padding</code>, <code>border</code>, and <code>content</code>."]
-      },
-      "Safari Mobile": {
-        "support": true
-      },
-      "Servo": {
-        "support": null
-      },
-      "status": {
-        "experimental": false,
-        "standardized": true,
-        "stable": true,
-        "obsolete": false
+  "version": "1.0.0",
+  "data": {
+    "css": {
+      "properties" : {
+        "background-origin": {
+          "__compat": {
+            "basic_support": {
+              "desc": "Basic support",
+              "support": {
+                "webview_android": {
+                  "version_added": "4.1"
+                },
+                "chrome": {
+                  "version_added": "1.0",
+                  "notes": "Webkit also supports the prefixed version of this property, and in that case, in addition to the current keywords, the alternative synonyms are: <code>padding</code>, <code>border</code>, and <code>content</code>."
+                },
+                "chrome_android": {
+                  "version_added": true
+                },
+                "edge": {
+                  "version_added": "12"
+                },
+                "edge_mobile": {
+                  "version_added": true
+                },
+                "firefox": {
+                  "version_added": "4.0",
+                  "notes": ["Gecko supported, from version 1.1 to version 1.9.2, which corresponds to Firefox 1.0 to 3.6 included, a different and prefixed syntax: <code>-moz-background-clip: padding | border</code>.",
+                            "Since Firefox 49, also supports the <code>-webkit</code> prefixed version of the property."]
+                },
+                "firefox_android": {
+                  "version_added": "14.0"
+                },
+                "ie": {
+                  "version_added": "9.0",
+                  "notes": "In IE 7 and before, Internet explorer was behaving as if <code>background-origin: border-box</code> was set. In Internet Explorer 8, as if <code>background-origin: padding-box</code>, the regular default value, was set."
+                },
+                "ie_mobile": {
+                  "version_added": "7.1"
+                },
+                "opera": {
+                  "version_added": "10.5"
+                },
+                "opera_android": {
+                  "version_added": "12.1"
+                },
+                "safari": {
+                  "version_added": "3.0",
+                  "notes": "Webkit also supports the prefixed version of this property, and in that case, in addition to the current keywords, the alternative synonyms are: <code>padding</code>, <code>border</code>, and <code>content</code>."
+                },
+                "safari_ios": {
+                  "version_added": true
+                },
+                "servo": {
+                  "version_added": null
+                }
+              },
+              "status": {
+                "experimental": false,
+                "standard_track": true,
+                "obsolete": false
+              }
+            },
+            "content-box": {
+              "desc": "<code>content-box</code>",
+              "support": {
+                "webview_android": {
+                  "version_added": "4.1"
+                },
+                "chrome": {
+                  "version_added": "1.0"
+                },
+                "chrome_android": {
+                  "version_added": true
+                },
+                "edge": {
+                  "version_added": "12"
+                },
+                "edge_mobile": {
+                  "version_added": true
+                },
+                "firefox": {
+                  "version_added": "4.0",
+                  "notes": "Gecko supported, from version 1.1 to version 1.9.2, which corresponds to Firefox 1.0 to 3.6 included, a different and prefixed syntax: <code>-moz-background-clip: padding | border</code>."
+                },
+                "firefox_android": {
+                  "version_added": "14.0"
+                },
+                "ie": {
+                  "version_added": "9.0",
+                  "notes": "In IE 7 and IE 9 of Internet Explorer, it always behaved like <code>background-clip: padding</code> if <code>overflow: hidden | auto | scroll</code>."
+                },
+                "ie_mobile": {
+                  "version_added": "7.1"
+                },
+                "opera": {
+                  "version_added": "10.5"
+                },
+                "opera_android": {
+                  "version_added": "12.1"
+                },
+                "safari": {
+                  "version_added": "3.0",
+                  "notes": "Webkit also supports the prefixed version of this property, and in that case, in addition to the current keywords, the alternative synonyms are: <code>padding</code>, <code>border</code>, and <code>content</code>."
+                },
+                "safari_ios": {
+                  "version_added": true
+                },
+                "servo": {
+                  "version_added": null
+                }
+              },
+              "status": {
+                "experimental": false,
+                "standard_track": true,
+                "obsolete": false
+              }
+            }
+          }
+        }
       }
     }
   }
diff --git a/css/properties/background-position-x.json b/css/properties/background-position-x.json
index 0ec79d2a915cc..36fe01b25fed4 100644
--- a/css/properties/background-position-x.json
+++ b/css/properties/background-position-x.json
@@ -1,104 +1,117 @@
 {
-  "background-position-x": {
-    "Basic support": {
-      "Android": {
-        "support": true
-      },
-      "Chrome": {
-        "support": true
-      },
-      "Chrome for Android": {
-        "support": true
-      },
-      "Edge": {
-        "support": "12"
-      },
-      "Edge Mobile": {
-        "support": true
-      },
-      "Firefox": {
-        "support": "49.0"
-      },
-      "Firefox for Android": {
-        "support": "49.0"
-      },
-      "Internet Explorer": {
-        "support": "6"
-      },
-      "IE Mobile": {
-        "support": null
-      },
-      "Opera": {
-        "support": true
-      },
-      "Opera Mobile": {
-        "support": null
-      },
-      "Safari": {
-        "support": true
-      },
-      "Safari Mobile": {
-        "support": null
-      },
-      "Servo": {
-        "support": null
-      },
-      "status": {
-        "experimental": false,
-        "standardized": true,
-        "stable": true,
-        "obsolete": false
-      }
-    },
-    "Two-value syntax (support for offsets from any edge)": {
-      "Android": {
-        "support": false
-      },
-      "Chrome": {
-        "support": false
-      },
-      "Chrome for Android": {
-        "support": false
-      },
-      "Edge": {
-        "support": "12"
-      },
-      "Edge Mobile": {
-        "support": true
-      },
-      "Firefox": {
-        "support": "49.0"
-      },
-      "Firefox for Android": {
-        "support": "49.0"
-      },
-      "Internet Explorer": {
-        "support": "9.0"
-      },
-      "IE Mobile": {
-        "support": null
-      },
-      "Opera": {
-        "support": false
-      },
-      "Opera Mobile": {
-        "support": false
-      },
-      "Safari": {
-        "support": false
-      },
-      "Safari Mobile": {
-        "support": false
-      },
-      "Servo": {
-        "support": null
-      },
-      "status": {
-        "experimental": false,
-        "standardized": true,
-        "stable": true,
-        "obsolete": false
+  "version": "1.0.0",
+  "data": {
+    "css": {
+      "properties" : {
+        "background-position-x": {
+          "__compat":{
+            "basic_support": {
+              "desc": "Basic support",
+              "support": {
+                "webview_android": {
+                  "version_added": true
+                },
+                "chrome": {
+                  "version_added": true
+                },
+                "chrome_android": {
+                  "version_added": true
+                },
+                "edge": {
+                  "version_added": "12"
+                },
+                "edge_mobile": {
+                  "version_added": true
+                },
+                "firefox": {
+                  "version_added": "49.0"
+                },
+                "firefox_android": {
+                  "version_added": "49.0"
+                },
+                "ie": {
+                  "version_added": "6"
+                },
+                "ie_mobile": {
+                  "version_added": null
+                },
+                "opera": {
+                  "version_added": true
+                },
+                "opera_android": {
+                  "version_added": null
+                },
+                "safari": {
+                  "version_added": true
+                },
+                "safari_ios": {
+                  "version_added": null
+                },
+                "servo": {
+                  "version_added": null
+                }
+              },
+              "status": {
+                "experimental": false,
+                "standard_track": true,
+                "obsolete": false
+              }
+            },
+            "two_value_syntax": {
+              "desc": "Two-value syntax (support for offsets from any edge)",
+              "support": {
+                "webview_android": {
+                  "version_added": false
+                },
+                "chrome": {
+                  "version_added": false
+                },
+                "chrome_android": {
+                  "version_added": false
+                },
+                "edge": {
+                  "version_added": "12"
+                },
+                "edge_mobile": {
+                  "version_added": true
+                },
+                "firefox": {
+                  "version_added": "49.0"
+                },
+                "firefox_android": {
+                  "version_added": "49.0"
+                },
+                "ie": {
+                  "version_added": "9.0"
+                },
+                "ie_mobile": {
+                  "version_added": null
+                },
+                "opera": {
+                  "version_added": false
+                },
+                "opera_android": {
+                  "version_added": false
+                },
+                "safari": {
+                  "version_added": false
+                },
+                "safari_ios": {
+                  "version_added": false
+                },
+                "servo": {
+                  "version_added": null
+                }
+              },
+              "status": {
+                "experimental": false,
+                "standard_track": true,
+                "obsolete": false
+              }
+            }
+          }
+        }
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/css/properties/background-position-y.json b/css/properties/background-position-y.json
index b142b1c1c3353..fdc27418b0d16 100644
--- a/css/properties/background-position-y.json
+++ b/css/properties/background-position-y.json
@@ -1,104 +1,117 @@
 {
-  "background-position-y": {
-    "Basic support": {
-      "Android": {
-        "support": true
-      },
-      "Chrome": {
-        "support": true
-      },
-      "Chrome for Android": {
-        "support": true
-      },
-      "Edge": {
-        "support": "12"
-      },
-      "Edge Mobile": {
-        "support": true
-      },
-      "Firefox": {
-        "support": "49.0"
-      },
-      "Firefox for Android": {
-        "support": "49.0"
-      },
-      "Internet Explorer": {
-        "support": "6"
-      },
-      "IE Mobile": {
-        "support": null
-      },
-      "Opera": {
-        "support": true
-      },
-      "Opera Mobile": {
-        "support": null
-      },
-      "Safari": {
-        "support": true
-      },
-      "Safari Mobile": {
-        "support": null
-      },
-      "Servo": {
-        "support": null
-      },
-      "status": {
-        "experimental": false,
-        "standardized": true,
-        "stable": true,
-        "obsolete": false
-      }
-    },
-    "Two-value syntax (support for offsets from any edge)": {
-      "Android": {
-        "support": false
-      },
-      "Chrome": {
-        "support": false
-      },
-      "Chrome for Android": {
-        "support": false
-      },
-      "Edge": {
-        "support": "12"
-      },
-      "Edge Mobile": {
-        "support": true
-      },
-      "Firefox": {
-        "support": "49.0"
-      },
-      "Firefox for Android": {
-        "support": "49.0"
-      },
-      "Internet Explorer": {
-        "support": "9.0"
-      },
-      "IE Mobile": {
-        "support": null
-      },
-      "Opera": {
-        "support": false
-      },
-      "Opera Mobile": {
-        "support": false
-      },
-      "Safari": {
-        "support": false
-      },
-      "Safari Mobile": {
-        "support": false
-      },
-      "Servo": {
-        "support": null
-      },
-      "status": {
-        "experimental": false,
-        "standardized": true,
-        "stable": true,
-        "obsolete": false
+  "version": "1.0.0",
+  "data": {
+    "css": {
+      "properties" : {
+        "background-position-y": {
+          "__compat": {
+            "basic_support": {
+              "desc": "Basic support",
+              "support": {
+                "webview_android": {
+                  "version_added": true
+                },
+                "chrome": {
+                  "version_added": true
+                },
+                "chrome_android": {
+                  "version_added": true
+                },
+                "edge": {
+                  "version_added": "12"
+                },
+                "edge_mobile": {
+                  "version_added": true
+                },
+                "firefox": {
+                  "version_added": "49.0"
+                },
+                "firefox_android": {
+                  "version_added": "49.0"
+                },
+                "ie": {
+                  "version_added": "6"
+                },
+                "ie_mobile": {
+                  "version_added": null
+                },
+                "opera": {
+                  "version_added": true
+                },
+                "opera_android": {
+                  "version_added": null
+                },
+                "safari": {
+                  "version_added": true
+                },
+                "safari_ios": {
+                  "version_added": null
+                },
+                "servo": {
+                  "version_added": null
+                }
+              },
+              "status": {
+                "experimental": false,
+                "standard_track": true,
+                "obsolete": false
+              }
+            },
+            "2_value_syntax": {
+              "desc": "Two-value syntax (support for offsets from any edge)",
+              "support": {
+                "webview_android": {
+                  "version_added": false
+                },
+                "chrome": {
+                  "version_added": false
+                },
+                "chrome_android": {
+                  "version_added": false
+                },
+                "edge": {
+                  "version_added": "12"
+                },
+                "edge_mobile": {
+                  "version_added": true
+                },
+                "firefox": {
+                  "version_added": "49.0"
+                },
+                "firefox_android": {
+                  "version_added": "49.0"
+                },
+                "ie": {
+                  "version_added": "9.0"
+                },
+                "ie_mobile": {
+                  "version_added": null
+                },
+                "opera": {
+                  "version_added": false
+                },
+                "opera_android": {
+                  "version_added": false
+                },
+                "safari": {
+                  "version_added": false
+                },
+                "safari_ios": {
+                  "version_added": false
+                },
+                "servo": {
+                  "version_added": null
+                }
+              },
+              "status": {
+                "experimental": false,
+                "standard_track": true,
+                "obsolete": false
+              }
+            }
+          }
+        }
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/css/properties/background-position.json b/css/properties/background-position.json
index f1f21d26f9a28..ece0011aa7189 100644
--- a/css/properties/background-position.json
+++ b/css/properties/background-position.json
@@ -1,154 +1,169 @@
 {
-  "background-position": {
-    "Basic support": {
-      "Android": {
-        "support": true
-      },
-      "Chrome": {
-        "support": "1.0"
-      },
-      "Chrome for Android": {
-        "support": true
-      },
-      "Edge": {
-        "support": "12"
-      },
-      "Edge Mobile": {
-        "support": true
-      },
-      "Firefox": {
-        "support": "1.0"
-      },
-      "Firefox for Android": {
-        "support": true
-      },
-      "Internet Explorer": {
-        "support": "4"
-      },
-      "IE Mobile": {
-        "support": true
-      },
-      "Opera": {
-        "support": "3.5"
-      },
-      "Opera Mobile": {
-        "support": true
-      },
-      "Safari": {
-        "support": "1.0"
-      },
-      "Safari Mobile": {
-        "support": true
-      },
-      "Servo": {
-        "support": null
-      },
-      "status": {
-        "experimental": false,
-        "standardized": true,
-        "stable": true,
-        "obsolete": false
-      }
-    },
-    "Multiple backgrounds": {
-      "Android": {
-        "support": true
-      },
-      "Chrome": {
-        "support": "1.0"
-      },
-      "Chrome for Android": {
-        "support": true
-      },
-      "Edge": {
-        "support": "12"
-      },
-      "Edge Mobile": {
-        "support": true
-      },
-      "Firefox": {
-        "support": "3.6"
-      },
-      "Firefox for Android": {
-        "support": true
-      },
-      "Internet Explorer": {
-        "support": "9.0"
-      },
-      "IE Mobile": {
-        "support": true
-      },
-      "Opera": {
-        "support": "10.5"
-      },
-      "Opera Mobile": {
-        "support": true
-      },
-      "Safari": {
-        "support": "1.3"
-      },
-      "Safari Mobile": {
-        "support": true
-      },
-      "Servo": {
-        "support": null
-      },
-      "status": {
-        "experimental": false,
-        "standardized": true,
-        "stable": true,
-        "obsolete": false
-      }
-    },
-    "Four-value syntax (support for offsets from any edge)": {
-      "Android": {
-        "support": true
-      },
-      "Chrome": {
-        "support": "25.0"
-      },
-      "Chrome for Android": {
-        "support": true
-      },
-      "Edge": {
-        "support": "12"
-      },
-      "Edge Mobile": {
-        "support": true
-      },
-      "Firefox": {
-        "support": "13.0"
-      },
-      "Firefox for Android": {
-        "support": "13.0"
-      },
-      "Internet Explorer": {
-        "support": "9.0"
-      },
-      "IE Mobile": {
-        "support": true
-      },
-      "Opera": {
-        "support": "10.5"
-      },
-      "Opera Mobile": {
-        "support": true
-      },
-      "Safari": {
-        "support": "7.0"
-      },
-      "Safari Mobile": {
-        "support": true
-      },
-      "Servo": {
-        "support": null
-      },
-      "status": {
-        "experimental": false,
-        "standardized": true,
-        "stable": true,
-        "obsolete": false
+  "version": "1.0.0",
+  "data": {
+    "css": {
+      "properties" : {
+        "background-position": {
+          "__compat": {
+            "basic_support": {
+              "desc": "Basic support",
+              "support": {
+                "webview_android": {
+                  "version_added": true
+                },
+                "chrome": {
+                  "version_added": "1.0"
+                },
+                "chrome_android": {
+                  "version_added": true
+                },
+                "edge": {
+                  "version_added": "12"
+                },
+                "edge_mobile": {
+                  "version_added": true
+                },
+                "firefox": {
+                  "version_added": "1.0"
+                },
+                "firefox_android": {
+                  "version_added": true
+                },
+                "ie": {
+                  "version_added": "4"
+                },
+                "ie_mobile": {
+                  "version_added": true
+                },
+                "opera": {
+                  "version_added": "3.5"
+                },
+                "opera_android": {
+                  "version_added": true
+                },
+                "safari": {
+                  "version_added": "1.0"
+                },
+                "safari_ios": {
+                  "version_added": true
+                },
+                "servo": {
+                  "version_added": null
+                }
+              },
+              "status": {
+                "experimental": false,
+                "standard_track": true,
+                "obsolete": false
+              }
+            },
+            "multiple_backgrounds": {
+              "desc": "Multiple backgrounds",
+              "support": {
+                "webview_android": {
+                  "version_added": true
+                },
+                "chrome": {
+                  "version_added": "1.0"
+                },
+                "chrome_android": {
+                  "version_added": true
+                },
+                "edge": {
+                  "version_added": "12"
+                },
+                "edge_mobile": {
+                  "version_added": true
+                },
+                "firefox": {
+                  "version_added": "3.6"
+                },
+                "firefox_android": {
+                  "version_added": true
+                },
+                "ie": {
+                  "version_added": "9.0"
+                },
+                "ie_mobile": {
+                  "version_added": true
+                },
+                "opera": {
+                  "version_added": "10.5"
+                },
+                "opera_android": {
+                  "version_added": true
+                },
+                "safari": {
+                  "version_added": "1.3"
+                },
+                "safari_ios": {
+                  "version_added": true
+                },
+                "servo": {
+                  "version_added": null
+                }
+              },
+              "status": {
+                "experimental": false,
+                "standard_track": true,
+                "obsolete": false
+              }
+            },
+            "4_value_syntax": {
+              "desc": "Four-value syntax (support for offsets from any edge)",
+              "support": {
+                "webview_android": {
+                  "version_added": true
+                },
+                "chrome": {
+                  "version_added": "25.0"
+                },
+                "chrome_android": {
+                  "version_added": true
+                },
+                "edge": {
+                  "version_added": "12"
+                },
+                "edge_mobile": {
+                  "version_added": true
+                },
+                "firefox": {
+                  "version_added": "13.0"
+                },
+                "firefox_android": {
+                  "version_added": "13.0"
+                },
+                "ie": {
+                  "version_added": "9.0"
+                },
+                "ie_mobile": {
+                  "version_added": true
+                },
+                "opera": {
+                  "version_added": "10.5"
+                },
+                "opera_android": {
+                  "version_added": true
+                },
+                "safari": {
+                  "version_added": "7.0"
+                },
+                "safari_ios": {
+                  "version_added": true
+                },
+                "servo": {
+                  "version_added": null
+                }
+              },
+              "status": {
+                "experimental": false,
+                "standard_track": true,
+                "obsolete": false
+              }
+            }
+          }
+        }
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/css/properties/background-repeat.json b/css/properties/background-repeat.json
index a4df484789f14..2f0fe7ef7ae15 100644
--- a/css/properties/background-repeat.json
+++ b/css/properties/background-repeat.json
@@ -1,204 +1,221 @@
 {
-  "background-repeat": {
-    "Basic support": {
-      "Android": {
-        "support": null
-      },
-      "Chrome": {
-        "support": "1.0"
-      },
-      "Chrome for Android": {
-        "support": null
-      },
-      "Edge": {
-        "support": "12"
-      },
-      "Edge Mobile": {
-        "support": true
-      },
-      "Firefox": {
-        "support": "1.0"
-      },
-      "Firefox for Android": {
-        "support": "1.0"
-      },
-      "Internet Explorer": {
-        "support": "4"
-      },
-      "IE Mobile": {
-        "support": null
-      },
-      "Opera": {
-        "support": "3.5"
-      },
-      "Opera Mobile": {
-        "support": null
-      },
-      "Safari": {
-        "support": "1.0"
-      },
-      "Safari Mobile": {
-        "support": null
-      },
-      "Servo": {
-        "support": null
-      },
-      "status": {
-        "experimental": false,
-        "standardized": true,
-        "stable": true,
-        "obsolete": false
-      }
-    },
-    "Multiple backgrounds": {
-      "Android": {
-        "support": null
-      },
-      "Chrome": {
-        "support": "1.0"
-      },
-      "Chrome for Android": {
-        "support": null
-      },
-      "Edge": {
-        "support": "12"
-      },
-      "Edge Mobile": {
-        "support": true
-      },
-      "Firefox": {
-        "support": "3.6"
-      },
-      "Firefox for Android": {
-        "support": true
-      },
-      "Internet Explorer": {
-        "support": "9"
-      },
-      "IE Mobile": {
-        "support": null
-      },
-      "Opera": {
-        "support": "10.5"
-      },
-      "Opera Mobile": {
-        "support": null
-      },
-      "Safari": {
-        "support": "1.3"
-      },
-      "Safari Mobile": {
-        "support": null
-      },
-      "Servo": {
-        "support": null
-      },
-      "status": {
-        "experimental": false,
-        "standardized": true,
-        "stable": true,
-        "obsolete": false
-      }
-    },
-    "Two-value syntax (different values for x & y directions)": {
-      "Android": {
-        "support": null
-      },
-      "Chrome": {
-        "support": true
-      },
-      "Chrome for Android": {
-        "support": null
-      },
-      "Edge": {
-        "support": "12"
-      },
-      "Edge Mobile": {
-        "support": true
-      },
-      "Firefox": {
-        "support": "13.0"
-      },
-      "Firefox for Android": {
-        "support": "13.0"
-      },
-      "Internet Explorer": {
-        "support": "9.0"
-      },
-      "IE Mobile": {
-        "support": null
-      },
-      "Opera": {
-        "support": true
-      },
-      "Opera Mobile": {
-        "support": null
-      },
-      "Safari": {
-        "support": true
-      },
-      "Safari Mobile": {
-        "support": null
-      },
-      "Servo": {
-        "support": null
-      },
-      "status": {
-        "experimental": false,
-        "standardized": true,
-        "stable": true,
-        "obsolete": false
-      }
-    },
-    "round and space keywords": {
-      "Android": {
-        "support": null
-      },
-      "Chrome": {
-        "support": true
-      },
-      "Chrome for Android": {
-        "support": null
-      },
-      "Edge": {
-        "support": "12"
-      },
-      "Edge Mobile": {
-        "support": true
-      },
-      "Firefox": {
-        "support": "49.0"
-      },
-      "Firefox for Android": {
-        "support": "49.0"
-      },
-      "Internet Explorer": {
-        "support": "9.0"
-      },
-      "IE Mobile": {
-        "support": null
-      },
-      "Opera": {
-        "support": "10.5"
-      },
-      "Opera Mobile": {
-        "support": null
-      },
-      "Safari": {
-        "support": true
-      },
-      "Safari Mobile": {
-        "support": null
-      },
-      "Servo": {
-        "support": null
-      },
-      "status": {
-        "experimental": false,
-        "standardized": true,
-        "stable": true,
-        "obsolete": false
+  "version": "1.0.0",
+  "data": {
+    "css": {
+      "properties" : {
+        "background-repeat": {
+          "__compat":{
+            "basic_support": {
+              "desc": "Basic support",
+              "support": {
+                "webview_android": {
+                  "version_added": null
+                },
+                "chrome": {
+                  "version_added": "1.0"
+                },
+                "chrome_android": {
+                  "version_added": null
+                },
+                "edge": {
+                  "version_added": "12"
+                },
+                "edge_mobile": {
+                  "version_added": true
+                },
+                "firefox": {
+                  "version_added": "1.0"
+                },
+                "firefox_android": {
+                  "version_added": "1.0"
+                },
+                "ie": {
+                  "version_added": "4"
+                },
+                "ie_mobile": {
+                  "version_added": null
+                },
+                "opera": {
+                  "version_added": "3.5"
+                },
+                "opera_android": {
+                  "version_added": null
+                },
+                "safari": {
+                  "version_added": "1.0"
+                },
+                "safari_ios": {
+                  "version_added": null
+                },
+                "servo": {
+                  "version_added": null
+                }
+              },
+              "status": {
+                "experimental": false,
+                "standard_track": true,
+                "obsolete": false
+              }
+            },
+            "multiple_backgrounds": {
+              "desc": "Multiple backgrounds",
+              "support": {
+                "webview_android": {
+                  "version_added": null
+                },
+                "chrome": {
+                  "version_added": "1.0"
+                },
+                "chrome_android": {
+                  "version_added": null
+                },
+                "edge": {
+                  "version_added": "12"
+                },
+                "edge_mobile": {
+                  "version_added": true
+                },
+                "firefox": {
+                  "version_added": "3.6"
+                },
+                "firefox_android": {
+                  "version_added": true
+                },
+                "ie": {
+                  "version_added": "9"
+                },
+                "ie_mobile": {
+                  "version_added": null
+                },
+                "opera": {
+                  "version_added": "10.5"
+                },
+                "opera_android": {
+                  "version_added": null
+                },
+                "safari": {
+                  "version_added": "1.3"
+                },
+                "safari_ios": {
+                  "version_added": null
+                },
+                "servo": {
+                  "version_added": null
+                }
+              },
+              "status": {
+                "experimental": false,
+                "standard_track": true,
+                "obsolete": false
+              }
+            },
+            "2-value": {
+              "desc": "Two-value syntax (different values for x & y directions)",
+              "support": {
+                "webview_android": {
+                  "version_added": null
+                },
+                "chrome": {
+                  "version_added": true
+                },
+                "chrome_android": {
+                  "version_added": null
+                },
+                "edge": {
+                  "version_added": "12"
+                },
+                "edge_mobile": {
+                  "version_added": true
+                },
+                "firefox": {
+                  "version_added": "13.0"
+                },
+                "firefox_android": {
+                  "version_added": "13.0"
+                },
+                "ie": {
+                  "version_added": "9.0"
+                },
+                "ie_mobile": {
+                  "version_added": null
+                },
+                "opera": {
+                  "version_added": true
+                },
+                "opera_android": {
+                  "version_added": null
+                },
+                "safari": {
+                  "version_added": true
+                },
+                "safari_ios": {
+                  "version_added": null
+                },
+                "servo": {
+                  "version_added": null
+                }
+              },
+              "status": {
+                "experimental": false,
+                "standard_track": true,
+                "obsolete": false
+              }
+            },
+            "round_space": {
+              "desc": "<code>round</code> and <code>space</code> keywords",
+              "support": {
+                "webview_android": {
+                  "version_added": null
+                },
+                "chrome": {
+                  "version_added": true
+                },
+                "chrome_android": {
+                  "version_added": null
+                },
+                "edge": {
+                  "version_added": "12"
+                },
+                "edge_mobile": {
+                  "version_added": true
+                },
+                "firefox": {
+                  "version_added": "49.0"
+                },
+                "firefox_android": {
+                  "version_added": "49.0"
+                },
+                "ie": {
+                  "version_added": "9.0"
+                },
+                "ie_mobile": {
+                  "version_added": null
+                },
+                "opera": {
+                  "version_added": "10.5"
+                },
+                "opera_android": {
+                  "version_added": null
+                },
+                "safari": {
+                  "version_added": true
+                },
+                "safari_ios": {
+                  "version_added": null
+                },
+                "servo": {
+                  "version_added": null
+                }
+              },
+              "status": {
+                "experimental": false,
+                "standard_track": true,
+                "obsolete": false
+              }
+            }
+          }
+        }
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/css/properties/background-size.json b/css/properties/background-size.json
index b286ed419808c..566279aa1bbf7 100644
--- a/css/properties/background-size.json
+++ b/css/properties/background-size.json
@@ -1,164 +1,211 @@
 {
-  "background-size": {
-    "Basic support": {
-      "Android": {
-        "support": "2.3"
-      },
-      "Chrome": {
-        "support": "3.0",
-        "notes": ["Version 1.0 and later also implement this property prefixed with <code>-webkit</code>.",
-                  "WebKit-based browsers originally implemented an older draft of CSS3 <code>background-size</code> in which an omitted second value is treated as duplicating the first value; this draft does not include the <code>contain</code> or <code>cover</code> keywords."]
-      },
-      "Chrome for Android": {
-        "support": true
-      },
-      "Edge": {
-        "support": "12"
-      },
-      "Edge Mobile": {
-        "support": true
-      },
-      "Firefox": {
-        "support": "4.0",
-        "notes": ["Firefox 3.6 and later also implement this property prefixed with <code>-moz</code>.",
-                  "Firefox 49 and later also implement this property prefixed with <code>-webkit</code>."]
-      },
-      "Firefox for Android": {
-        "support": "4.0",
-        "notes": ["Firefox for Android 1.0 and later also implement this property prefixed with <code>-moz</code>.",
-                  "Firefox for Android 49 and later also implement this property prefixed with <code>-webkit</code>."]
-      },
-      "Internet Explorer": {
-        "support": "9.0"
-      },
-      "IE Mobile": {
-        "support": true
-      },
-      "Opera": {
-        "support": "10",
-        "notes": ["Opera 9.5 and later also implement this property prefixed with <code>-o</code>.",
-                  "Opera 9.5's computation of the background positioning area is incorrect for fixed backgrounds. Opera 9.5 also interprets the two-value form as a horizontal scaling factor and, from appearances, a vertical clipping dimension. This has been fixed in Opera 10."]
-      },
-      "Opera Mobile": {
-        "support": true
-      },
-      "Safari": {
-        "support": "4.1",        
-        "notes": ["Version 3.0 and later also implement this property prefixed with <code>-webkit</code>.",
-                  "WebKit-based browsers originally implemented an older draft of CSS3 <code>background-size</code> in which an omitted second value is treated as duplicating the first value; this draft does not include the <code>contain</code> or <code>cover</code> keywords."]
-      },
-      "Safari Mobile": {
-        "support": true
-      },
-      "Servo": {
-        "support": null
-      },
-      "status": {
-        "experimental": false,
-        "standardized": true,
-        "stable": true,
-        "obsolete": false
-      }
-    },
-    "contain and cover": {
-      "Android": {
-        "support": null
-      },
-      "Chrome": {
-        "support": "3.0"
-      },
-      "Chrome for Android": {
-        "support": null
-      },
-      "Edge": {
-        "support": "12"
-      },
-      "Edge Mobile": {
-        "support": true
-      },
-      "Firefox": {
-        "support": "3.6"
-      },
-      "Firefox for Android": {
-        "support": true
-      },
-      "Internet Explorer": {
-        "support": "9"
-      },
-      "IE Mobile": {
-        "support": "10.0"
-      },
-      "Opera": {
-        "support": "10.0"
-      },
-      "Opera Mobile": {
-        "support": null
-      },
-      "Safari": {
-        "support": "4.1"
-      },
-      "Safari Mobile": {
-        "support": true
-      },
-      "Servo": {
-        "support": null
-      },
-      "status": {
-        "experimental": false,
-        "standardized": true,
-        "stable": true,
-        "obsolete": false
-      }
-    },
-    "SVG image as background": {
-      "Android": {
-        "support": null
-      },
-      "Chrome": {
-        "support": "44.0"
-      },
-      "Chrome for Android": {
-        "support": null
-      },
-      "Edge": {
-        "support": "12"
-      },
-      "Edge Mobile": {
-        "support": true
-      },
-      "Firefox": {
-        "support": "8.0"
-      },
-      "Firefox for Android": {
-        "support": "8.0"
-      },
-      "Internet Explorer": {
-        "support": "9.0"
-      },
-      "IE Mobile": {
-        "support": null
-      },
-      "Opera": {
-        "support": "31.0"
-      },
-      "Opera Mobile": {
-        "support": true
-      },
-      "Safari": {
-        "support": null
-      },
-      "Safari Mobile": {
-        "support": null
-      },
-      "Servo": {
-        "support": null
-      },
-      "status": {
-        "experimental": false,
-        "standardized": true,
-        "stable": true,
-        "obsolete": false
+  "version": "1.0.0",
+  "data": {
+    "css": {
+      "properties" : {
+        "background-size": {
+          "__compat": {
+            "basic_support": {
+              "desc": "Basic support",
+              "support": {
+                "webview_android": {
+                  "version_added": "2.3"
+                },
+                "chrome":  [
+                  {
+                    "prefix": "-webkit-",
+                    "version_added": "1.0",
+                    "notes": "WebKit-based browsers originally implemented an older draft of CSS3 <code>background-size</code> in which an omitted second value is treated as duplicating the first value; this draft does not include the <code>contain</code> or <code>cover</code> keywords."
+                  },
+                  {
+                    "version_added": "3.0",
+                    "notes": "WebKit-based browsers originally implemented an older draft of CSS3 <code>background-size</code> in which an omitted second value is treated as duplicating the first value; this draft does not include the <code>contain</code> or <code>cover</code> keywords."
+                  }
+                ],
+                "chrome_android": {
+                  "version_added": true
+                },
+                "edge": {
+                  "version_added": "12"
+                },
+                "edge_mobile": {
+                  "version_added": true
+                },
+                "firefox": [
+                  {
+                    "prefix": "-moz-",
+                    "version_added": "3.6"
+                  },
+                  {
+                    "prefix": "-webkit-",
+                    "version_added": "49"
+                  },
+                  {
+                    "version_added": "4.0"
+                  }
+                ],
+                "firefox_android": [
+                  {
+                    "prefix": "-moz-",
+                    "version_added": "1.0"
+                  },
+                  {
+                    "prefix": "-webkit-",
+                    "version_added": "49"
+                  },
+                  {
+                    "version_added": "4.0"
+                  }
+                ],
+                "ie": {
+                  "version_added": "9.0"
+                },
+                "ie_mobile": {
+                  "version_added": true
+                },
+                "opera": [
+                  {
+                    "prefix": "-o-",
+                    "version_added": "9.5",
+                    "notes": "Opera 9.5's computation of the background positioning area is incorrect for fixed backgrounds. Opera 9.5 also interprets the two-value form as a horizontal scaling factor and, from appearances, a vertical clipping dimension. This has been fixed in Opera 10."
+                  },
+                  {
+                    "version_added": "10"
+                  }
+                ],
+                "opera_android": {
+                  "version_added": true
+                },
+                "safari": [
+                  {
+                    "prefix": "-webkit-",
+                    "version_added": "3.0",
+                    "notes": "WebKit-based browsers originally implemented an older draft of CSS3 <code>background-size</code> in which an omitted second value is treated as duplicating the first value; this draft does not include the <code>contain</code> or <code>cover</code> keywords."
+                  },
+                  {
+                    "version_added": "4.1"
+                  }
+                ],
+                "safari_ios": {
+                  "version_added": true
+                },
+                "servo": {
+                  "version_added": null
+                }
+              },
+              "status": {
+                "experimental": false,
+                "standard_track": true,
+                "obsolete": false
+              }
+            },
+            "contain_and_cover": {
+              "desc": "<contain> and <cover>",
+              "support": {
+                "webview_android": {
+                  "version_added": null
+                },
+                "chrome": {
+                  "version_added": "3.0"
+                },
+                "chrome_android": {
+                  "version_added": null
+                },
+                "edge": {
+                  "version_added": "12"
+                },
+                "edge_mobile": {
+                  "version_added": true
+                },
+                "firefox": {
+                  "version_added": "3.6"
+                },
+                "firefox_android": {
+                  "version_added": true
+                },
+                "ie": {
+                  "version_added": "9"
+                },
+                "ie_mobile": {
+                  "version_added": "10.0"
+                },
+                "opera": {
+                  "version_added": "10.0"
+                },
+                "opera_android": {
+                  "version_added": null
+                },
+                "safari": {
+                  "version_added": "4.1"
+                },
+                "safari_ios": {
+                  "version_added": true
+                },
+                "servo": {
+                  "version_added": null
+                }
+              },
+              "status": {
+                "experimental": false,
+                "standard_track": true,
+                "obsolete": false
+              }
+            },
+            "SVG_image_as_background": {
+              "desc": "SVG image as background",
+              "support": {
+                "webview_android": {
+                  "version_added": null
+                },
+                "chrome": {
+                  "version_added": "44.0"
+                },
+                "chrome_android": {
+                  "version_added": null
+                },
+                "edge": {
+                  "version_added": "12"
+                },
+                "edge_mobile": {
+                  "version_added": true
+                },
+                "firefox": {
+                  "version_added": "8.0"
+                },
+                "firefox_android": {
+                  "version_added": "8.0"
+                },
+                "ie": {
+                  "version_added": "9.0"
+                },
+                "ie_mobile": {
+                  "version_added": null
+                },
+                "opera": {
+                  "version_added": "31.0"
+                },
+                "opera_android": {
+                  "version_added": true
+                },
+                "safari": {
+                  "version_added": null
+                },
+                "safari_ios": {
+                  "version_added": null
+                },
+                "servo": {
+                  "version_added": null
+                }
+              },
+              "status": {
+                "experimental": false,
+                "standard_track": true,
+                "obsolete": false
+              }
+            }
+          }
+        }
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/css/properties/background.json b/css/properties/background.json
index 88821539b48fe..492ec02a242f4 100644
--- a/css/properties/background.json
+++ b/css/properties/background.json
@@ -1,304 +1,325 @@
 {
-  "background": {
-    "Basic support": {
-      "Android": {
-        "support": "2.1"
-      },
-      "Chrome": {
-        "support": "1.0"
-      },
-      "Chrome for Android": {
-        "support": null
-      },
-      "Edge": {
-        "support": "12"
-      },
-      "Edge Mobile": {
-        "support": true
-      },
-      "Firefox": {
-        "support": "1.0"
-      },
-      "Firefox for Android": {
-        "support": "1.0"
-      },
-      "Internet Explorer": {
-        "support": "4"
-      },
-      "IE Mobile": {
-        "support": "10.0"
-      },
-      "Opera": {
-        "support": "3.5"
-      },
-      "Opera Mobile": {
-        "support": "5.0"
-      },
-      "Safari": {
-        "support": "1.0"
-      },
-      "Safari Mobile": {
-        "support": "3.2"
-      },
-      "Servo": {
-        "support": null
-      },
-      "status": {
-        "experimental": false,
-        "standardized": true,
-        "stable": true,
-        "obsolete": false
-      }
-    },
-    "Multiple backgrounds": {
-      "Android": {
-        "support": "2.1"
-      },
-      "Chrome": {
-        "support": "1.0"
-      },
-      "Chrome for Android": {
-        "support": null
-      },
-      "Edge": {
-        "support": "12"
-      },
-      "Edge Mobile": {
-        "support": true
-      },
-      "Firefox": {
-        "support": "3.6"
-      },
-      "Firefox for Android": {
-        "support": "1.0"
-      },
-      "Internet Explorer": {
-        "support": "9"
-      },
-      "IE Mobile": {
-        "support": "10.0"
-      },
-      "Opera": {
-        "support": "10.5"
-      },
-      "Opera Mobile": {
-        "support": null
-      },
-      "Safari": {
-        "support": "1.3"
-      },
-      "Safari Mobile": {
-        "support": "3.2"
-      },
-      "Servo": {
-        "support": null
-      },
-      "status": {
-        "experimental": false,
-        "standardized": true,
-        "stable": true,
-        "obsolete": false
-      }
-    },
-    "SVG image as background": {
-      "Android": {
-        "support": "3.0"
-      },
-      "Chrome": {
-        "support": "31.0"
-      },
-      "Chrome for Android": {
-        "support": null
-      },
-      "Edge": {
-        "support": "12"
-      },
-      "Edge Mobile": {
-        "support": true
-      },
-      "Firefox": {
-        "support": "9.0"
-      },
-      "Firefox for Android": {
-        "support": "4.0"
-      },
-      "Internet Explorer": {
-        "support": "9.0"
-      },
-      "IE Mobile": {
-        "support": "10.0"
-      },
-      "Opera": {
-        "support": "21.0"
-      },
-      "Opera Mobile": {
-        "support": true
-      },
-      "Safari": {
-        "support": "5.1"
-      },
-      "Safari Mobile": {
-        "support": "4.2"
-      },
-      "Servo": {
-        "support": null
-      },
-      "status": {
-        "experimental": false,
-        "standardized": true,
-        "stable": true,
-        "obsolete": false
-      }
-    },
-    "background-size": {
-      "Android": {
-        "support": "3.0"
-      },
-      "Chrome": {
-        "support": "21.0"
-      },
-      "Chrome for Android": {
-        "support": null
-      },
-      "Edge": {
-        "support": "12"
-      },
-      "Edge Mobile": {
-        "support": true
-      },
-      "Firefox": {
-        "support": "9.0"
-      },
-      "Firefox for Android": {
-        "support": "18.0"
-      },
-      "Internet Explorer": {
-        "support": "9.0"
-      },
-      "IE Mobile": {
-        "support": "10.0"
-      },
-      "Opera": {
-        "support": "21.0"
-      },
-      "Opera Mobile": {
-        "support": true
-      },
-      "Safari": {
-        "support": "5.1"
-      },
-      "Safari Mobile": {
-        "support": "4.0"
-      },
-      "Servo": {
-        "support": null
-      },
-      "status": {
-        "experimental": false,
-        "standardized": true,
-        "stable": true,
-        "obsolete": false
-      }
-    },
-    "background-origin": {
-      "Android": {
-        "support": "3.0"
-      },
-      "Chrome": {
-        "support": "21.0"
-      },
-      "Chrome for Android": {
-        "support": null
-      },
-      "Edge": {
-        "support": "12"
-      },
-      "Edge Mobile": {
-        "support": true
-      },
-      "Firefox": {
-        "support": "22.0"
-      },
-      "Firefox for Android": {
-        "support": "22.0"
-      },
-      "Internet Explorer": {
-        "support": "9.0"
-      },
-      "IE Mobile": {
-        "support": "10.0"
-      },
-      "Opera": {
-        "support": "21.0"
-      },
-      "Opera Mobile": {
-        "support": false
-      },
-      "Safari": {
-        "support": "5.1"
-      },
-      "Safari Mobile": {
-        "support": "4.0"
-      },
-      "Servo": {
-        "support": null
-      },
-      "status": {
-        "experimental": false,
-        "standardized": true,
-        "stable": true,
-        "obsolete": false
-      }
-    },
-    "background-clip": {
-      "Android": {
-        "support": "3.0"
-      },
-      "Chrome": {
-        "support": "21.0"
-      },
-      "Chrome for Android": {
-        "support": null
-      },
-      "Edge": {
-        "support": "12"
-      },
-      "Edge Mobile": {
-        "support": true
-      },
-      "Firefox": {
-        "support": "22.0"
-      },
-      "Firefox for Android": {
-        "support": "22.0"
-      },
-      "Internet Explorer": {
-        "support": "9.0"
-      },
-      "IE Mobile": {
-        "support": "10.0"
-      },
-      "Opera": {
-        "support": "21.0"
-      },
-      "Opera Mobile": {
-        "support": false
-      },
-      "Safari": {
-        "support": "5.1"
-      },
-      "Safari Mobile": {
-        "support": "4.0"
-      },
-      "Servo": {
-        "support": null
-      },
-      "status": {
-        "experimental": false,
-        "standardized": true,
-        "stable": true,
-        "obsolete": false
+  "version": "1.0.0",
+  "data": {
+    "css": {
+      "properties" : {
+        "background": {
+          "__compat": {
+            "basic_support": {
+              "desc": "Basic support",
+              "support": {
+                "webview_android": {
+                  "version_added": "2.1"
+                },
+                "chrome": {
+                  "version_added": "1.0"
+                },
+                "chrome_android": {
+                  "version_added": null
+                },
+                "edge": {
+                  "version_added": "12"
+                },
+                "edge_mobile": {
+                  "version_added": true
+                },
+                "firefox": {
+                  "version_added": "1.0"
+                },
+                "firefox_android": {
+                  "version_added": "1.0"
+                },
+                "ie": {
+                  "version_added": "4"
+                },
+                "ie_mobile": {
+                  "version_added": "10.0"
+                },
+                "opera": {
+                  "version_added": "3.5"
+                },
+                "opera_android": {
+                  "version_added": "5.0"
+                },
+                "safari": {
+                  "version_added": "1.0"
+                },
+                "safari_ios": {
+                  "version_added": "3.2"
+                },
+                "servo": {
+                  "version_added": null
+                }
+              },
+              "status": {
+                "experimental": false,
+                "standard_track": true,
+                "obsolete": false
+              }
+            },
+            "multiple_backgrounds": {
+              "desc": "Multiple backgrounds",
+              "support": {
+                "webview_android": {
+                  "version_added": "2.1"
+                },
+                "chrome": {
+                  "version_added": "1.0"
+                },
+                "chrome_android": {
+                  "version_added": null
+                },
+                "edge": {
+                  "version_added": "12"
+                },
+                "edge_mobile": {
+                  "version_added": true
+                },
+                "firefox": {
+                  "version_added": "3.6"
+                },
+                "firefox_android": {
+                  "version_added": "1.0"
+                },
+                "ie": {
+                  "version_added": "9"
+                },
+                "ie_mobile": {
+                  "version_added": "10.0"
+                },
+                "opera": {
+                  "version_added": "10.5"
+                },
+                "opera_android": {
+                  "version_added": null
+                },
+                "safari": {
+                  "version_added": "1.3"
+                },
+                "safari_ios": {
+                  "version_added": "3.2"
+                },
+                "servo": {
+                  "version_added": null
+                }
+              },
+              "status": {
+                "experimental": false,
+                "standard_track": true,
+                "obsolete": false
+              }
+            },
+            "SVG_image_as_background": {
+              "desc": "SVG image as background",
+              "support": {
+                "webview_android": {
+                  "version_added": "3.0"
+                },
+                "chrome": {
+                  "version_added": "31.0"
+                },
+                "chrome_android": {
+                  "version_added": null
+                },
+                "edge": {
+                  "version_added": "12"
+                },
+                "edge_mobile": {
+                  "version_added": true
+                },
+                "firefox": {
+                  "version_added": "9.0"
+                },
+                "firefox_android": {
+                  "version_added": "4.0"
+                },
+                "ie": {
+                  "version_added": "9.0"
+                },
+                "ie_mobile": {
+                  "version_added": "10.0"
+                },
+                "opera": {
+                  "version_added": "21.0"
+                },
+                "opera_android": {
+                  "version_added": true
+                },
+                "safari": {
+                  "version_added": "5.1"
+                },
+                "safari_ios": {
+                  "version_added": "4.2"
+                },
+                "servo": {
+                  "version_added": null
+                }
+              },
+              "status": {
+                "experimental": false,
+                "standard_track": true,
+                "obsolete": false
+              }
+            },
+            "background-size": {
+              "desc": "Values of <code>background-size</code> longhand",
+              "support": {
+                "webview_android": {
+                  "version_added": "3.0"
+                },
+                "chrome": {
+                  "version_added": "21.0"
+                },
+                "chrome_android": {
+                  "version_added": null
+                },
+                "edge": {
+                  "version_added": "12"
+                },
+                "edge_mobile": {
+                  "version_added": true
+                },
+                "firefox": {
+                  "version_added": "9.0"
+                },
+                "firefox_android": {
+                  "version_added": "18.0"
+                },
+                "ie": {
+                  "version_added": "9.0"
+                },
+                "ie_mobile": {
+                  "version_added": "10.0"
+                },
+                "opera": {
+                  "version_added": "21.0"
+                },
+                "opera_android": {
+                  "version_added": true
+                },
+                "safari": {
+                  "version_added": "5.1"
+                },
+                "safari_ios": {
+                  "version_added": "4.0"
+                },
+                "servo": {
+                  "version_added": null
+                }
+              },
+              "status": {
+                "experimental": false,
+                "standard_track": true,
+                "obsolete": false
+              }
+            },
+            "background-origin": {
+              "desc": "Values of <code>background-origin</code> longhand",
+              "support": {
+                "webview_android": {
+                  "version_added": "3.0"
+                },
+                "chrome": {
+                  "version_added": "21.0"
+                },
+                "chrome_android": {
+                  "version_added": null
+                },
+                "edge": {
+                  "version_added": "12"
+                },
+                "edge_mobile": {
+                  "version_added": true
+                },
+                "firefox": {
+                  "version_added": "22.0"
+                },
+                "firefox_android": {
+                  "version_added": "22.0"
+                },
+                "ie": {
+                  "version_added": "9.0"
+                },
+                "ie_mobile": {
+                  "version_added": "10.0"
+                },
+                "opera": {
+                  "version_added": "21.0"
+                },
+                "opera_android": {
+                  "version_added": false
+                },
+                "safari": {
+                  "version_added": "5.1"
+                },
+                "safari_ios": {
+                  "version_added": "4.0"
+                },
+                "servo": {
+                  "version_added": null
+                }
+              },
+              "status": {
+                "experimental": false,
+                "standard_track": true,
+                "obsolete": false
+              }
+            },
+            "background-clip": {
+              "desc": "Values of <code>background-clip</code> longhand",
+              "support": {
+                "webview_android": {
+                  "version_added": "3.0"
+                },
+                "chrome": {
+                  "version_added": "21.0"
+                },
+                "chrome_android": {
+                  "version_added": null
+                },
+                "edge": {
+                  "version_added": "12"
+                },
+                "edge_mobile": {
+                  "version_added": true
+                },
+                "firefox": {
+                  "version_added": "22.0"
+                },
+                "firefox_android": {
+                  "version_added": "22.0"
+                },
+                "ie": {
+                  "version_added": "9.0"
+                },
+                "ie_mobile": {
+                  "version_added": "10.0"
+                },
+                "opera": {
+                  "version_added": "21.0"
+                },
+                "opera_android": {
+                  "version_added": false
+                },
+                "safari": {
+                  "version_added": "5.1"
+                },
+                "safari_ios": {
+                  "version_added": "4.0"
+                },
+                "servo": {
+                  "version_added": null
+                }
+              },
+              "status": {
+                "experimental": false,
+                "standard_track": true,
+                "obsolete": false
+              }
+            }
+          }
+        }
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/css/properties/text-align-last.json b/css/properties/text-align-last.json
new file mode 100644
index 0000000000000..d8336a2c2c6f7
--- /dev/null
+++ b/css/properties/text-align-last.json
@@ -0,0 +1,103 @@
+{
+  "version": "1.0.0",
+  "data": {
+    "css": {
+      "properties" : {
+        "text-align-last": {
+          "__compat": {
+            "basic_support": {
+              "desc": "Basic support",
+              "support": {
+                "webview_android": {
+                  "version_added": false
+                },
+                "chrome": [
+                  {
+                    "version_added": "35.0",
+                    "version_removed": "47.0",
+                    "flag": {
+                      "type": "preference",
+                      "name": "Enable Experimental Web Platform Features",
+                      "value_to_set": "true"
+                    }
+                  },
+                  {
+                    "version_added": "47.0"
+                  }
+                ],
+                "chrome_android": [
+                  {
+                    "version_added": "35.0",
+                    "version_removed": "47.0",
+                    "flag": {
+                      "type": "preference",
+                      "name": "Enable Experimental Web Platform Features",
+                      "value_to_set": "true"
+                    }
+                  },
+                  {
+                    "version_added": "47.0"
+                  }
+                ],
+                "edge": {
+                  "version_added": true
+                },
+                "edge_mobile": {
+                  "version_added": true
+                },
+                "firefox": [
+                	{
+                		"prefix": "-moz-",
+                		"version_added": "12.0",
+                		"version_removed": "53.0"
+                	},
+                	{
+                		"version_added": "49.0"
+                	}
+                ],
+                "firefox_android": [
+                	{
+                		"prefix": "-moz-",
+                		"version_added": "12.0",
+                		"version_removed": "53.0"
+                	},
+                	{
+                		"version_added": "49.0"
+                	}
+                ],
+                "ie": {
+                  "version_added": false
+                },
+                "ie_mobile": {
+                  "version_added": false
+                },
+                "opera": {
+                  "version_added": true
+                },
+                "opera_android": {
+                  "version_added": true
+                },
+                "safari": {
+                  "version_added": false,
+                  "notes": "See Webkit bug 76173."
+                },
+                "safari_ios": {
+                  "version_added": false,
+                  "notes": "See Webkit bug 76173."
+                },
+                "servo": {
+                  "version_added": null
+                }
+              },
+              "status": {
+                "experimental": true,
+                "standard_track": true,
+                "obsolete": false
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/css/pseudo-classes/any-link.json b/css/pseudo-classes/any-link.json
new file mode 100644
index 0000000000000..d38c5ee47c741
--- /dev/null
+++ b/css/pseudo-classes/any-link.json
@@ -0,0 +1,84 @@
+{
+	"version": "1.0.0",
+  "data": {
+  	"css": {
+  		"pseudo-classes" : {
+  			":any-link": {
+  				"__compat":{
+  					"basic_support": {
+  						"desc": "Basic support",
+  						"support": {
+  							"webview_android": {
+  								"prefix": "-webkit-",
+  								"version_added": true
+  							},
+  							"chrome": {
+  								"prefix": "-webkit-",
+  								"version_added": true
+  							},
+  							"chrome_android": {
+  								"prefix": "-webkit-",
+  								"version_added": true
+  							},
+  							"edge": {
+  								"version_added": false
+  							},
+  							"edge_mobile": {
+  								"version_added": false
+  							},
+  							"firefox": [
+  								{
+  									"prefix": "-moz-",
+  									"version_added": true
+  								},
+  								{
+  									"version_added": "50.0"
+  								}
+  							],
+  							"firefox_android": [
+  								{
+  									"prefix": "-moz-",
+  									"version_added": true
+  								},
+  								{
+  									"version_added": "50.0"
+  								}
+                ],
+  							"ie": {
+  								"version_added": false
+  							},
+  							"ie_mobile": {
+  								"version_added": false
+  							},
+  							"opera": {
+  								"prefix": "-webkit-",
+  								"version_added": true
+  							},
+  							"opera_android": {
+  								"prefix": "-webkit-",
+  								"version_added": true
+  							},
+  							"safari": {
+  								"prefix": "-webkit-",
+  								"version_added": true
+  							},
+  							"safari_ios": {
+  								"prefix": "-webkit-",
+  								"version_added": true
+  							},
+  							"servo": {
+  								"version_added": null
+  							}
+  						},
+  						"status": {
+  							"experimental": false,
+  							"standard_track": true,
+  							"obsolete": false
+  						}
+  					}
+  				}
+  			}
+  		}
+  	}
+  }
+}
diff --git a/http/headers/accept-charset.json b/http/headers/accept-charset.json
index bdd1f27a9663b..31f0b060804cf 100644
--- a/http/headers/accept-charset.json
+++ b/http/headers/accept-charset.json
@@ -1,53 +1,64 @@
 {
-  "Accept-Charset": {
-    "Basic support": {
-      "Android": {
-        "support": true
-      },
-      "Chrome": {
-        "support": true
-      },
-      "Chrome for Android": {
-        "support": true
-      },
-      "Edge": {
-        "support": true
-      },
-      "Edge Mobile": {
-        "support": true
-      },
-      "Firefox": {
-        "support": true
-      },
-      "Firefox for Android": {
-        "support": true
-      },
-      "Internet Explorer": {
-        "support": true
-      },
-      "IE Mobile": {
-        "support": true
-      },
-      "Opera": {
-        "support": true
-      },
-      "Opera Mobile": {
-        "support": true
-      },
-      "Safari": {
-        "support": true
-      },
-      "Safari Mobile": {
-        "support": true
-      },
-      "Servo": {
-        "support": true
-      },
-      "status": {
-        "experimental": false,
-        "standardized": true,
-        "stable": true,
-        "obsolete": false
+  "version": "1.0.0",
+  "data": {
+    "http": {
+      "headers": {
+        "Accept-Charset": {
+          "__compat": {
+            "basic_support": {
+              "desc": "Basic support",
+              "support": {
+                "webview_android": {
+                  "version_added": true
+                },
+                "chrome": {
+                  "version_added": true
+                },
+                "chrome_android": {
+                  "version_added": true
+                },
+                "edge": {
+                  "version_added": true
+                },
+                "edge_mobile": {
+                  "version_added": true
+                },
+                "firefox": {
+                  "version_added": true
+                },
+                "firefox_android": {
+                  "version_added": true
+                },
+                "ie": {
+                  "version_added": true
+                },
+                "ie_mobile": {
+                  "version_added": true
+                },
+                "opera": {
+                  "version_added": true
+                },
+                "opera_android": {
+                  "version_added": true
+                },
+                "safari": {
+                  "version_added": true
+                },
+                "safari_ios": {
+                  "version_added": true
+                },
+                "servo": {
+                  "version_added": true
+                }
+              },
+              "status": {
+                "experimental": false,
+                "standard_track": true,
+                "obsolete": false
+              }
+            }
+          }
+        }
       }
     }
   }
diff --git a/http/headers/accept-encoding.json b/http/headers/accept-encoding.json
index 06b429f782ec4..6d15753c62851 100644
--- a/http/headers/accept-encoding.json
+++ b/http/headers/accept-encoding.json
@@ -1,53 +1,64 @@
 {
-  "Accept-Encoding": {
-    "Basic support": {
-      "Android": {
-        "support": true
-      },
-      "Chrome": {
-        "support": true
-      },
-      "Chrome for Android": {
-        "support": true
-      },
-      "Edge": {
-        "support": true
-      },
-      "Edge Mobile": {
-        "support": true
-      },
-      "Firefox": {
-        "support": true
-      },
-      "Firefox for Android": {
-        "support": true
-      },
-      "Internet Explorer": {
-        "support": true
-      },
-      "IE Mobile": {
-        "support": true
-      },
-      "Opera": {
-        "support": true
-      },
-      "Opera Mobile": {
-        "support": true
-      },
-      "Safari": {
-        "support": true
-      },
-      "Safari Mobile": {
-        "support": true
-      },
-      "Servo": {
-        "support": true
-      },
-      "status": {
-        "experimental": false,
-        "standardized": true,
-        "stable": true,
-        "obsolete": false
+  "version": "1.0.0",
+  "data": {
+    "http": {
+      "headers": {
+        "Accept-Encoding": {
+          "__compat": {
+            "basic_support": {
+              "desc": "Basic support",
+              "support": {
+                "webview_android": {
+                  "version_added": true
+                },
+                "chrome": {
+                  "version_added": true
+                },
+                "chrome_android": {
+                  "version_added": true
+                },
+                "edge": {
+                  "version_added": true
+                },
+                "edge_mobile": {
+                  "version_added": true
+                },
+                "firefox": {
+                  "version_added": true
+                },
+                "firefox_android": {
+                  "version_added": true
+                },
+                "ie": {
+                  "version_added": true
+                },
+                "ie_mobile": {
+                  "version_added": true
+                },
+                "opera": {
+                  "version_added": true
+                },
+                "opera_android": {
+                  "version_added": true
+                },
+                "safari": {
+                  "version_added": true
+                },
+                "safari_ios": {
+                  "version_added": true
+                },
+                "servo": {
+                  "version_added": true
+                }
+              },
+              "status": {
+                "experimental": false,
+                "standard_track": true,
+                "obsolete": false
+              }
+            }
+          }
+        }
       }
     }
   }
diff --git a/http/headers/accept-language.json b/http/headers/accept-language.json
index 74174bced07bb..54ad60215faa5 100644
--- a/http/headers/accept-language.json
+++ b/http/headers/accept-language.json
@@ -1,53 +1,64 @@
 {
-  "Accept-Language": {
-    "Basic support": {
-      "Android": {
-        "support": true
-      },
-      "Chrome": {
-        "support": true
-      },
-      "Chrome for Android": {
-        "support": true
-      },
-      "Edge": {
-        "support": true
-      },
-      "Edge Mobile": {
-        "support": true
-      },
-      "Firefox": {
-        "support": true
-      },
-      "Firefox for Android": {
-        "support": true
-      },
-      "Internet Explorer": {
-        "support": true
-      },
-      "IE Mobile": {
-        "support": true
-      },
-      "Opera": {
-        "support": true
-      },
-      "Opera Mobile": {
-        "support": true
-      },
-      "Safari": {
-        "support": true
-      },
-      "Safari Mobile": {
-        "support": true
-      },
-      "Servo": {
-        "support": true
-      },
-      "status": {
-        "experimental": false,
-        "standardized": true,
-        "stable": true,
-        "obsolete": false
+  "version": "1.0.0",
+  "data": {
+    "http": {
+      "headers": {
+        "Accept-Language": {
+          "__compat": {
+            "basic_support": {
+              "desc": "Basic support",
+              "support": {
+                "webview_android": {
+                  "version_added": true
+                },
+                "chrome": {
+                  "version_added": true
+                },
+                "chrome_android": {
+                  "version_added": true
+                },
+                "edge": {
+                  "version_added": true
+                },
+                "edge_mobile": {
+                  "version_added": true
+                },
+                "firefox": {
+                  "version_added": true
+                },
+                "firefox_android": {
+                  "version_added": true
+                },
+                "ie": {
+                  "version_added": true
+                },
+                "ie_mobile": {
+                  "version_added": true
+                },
+                "opera": {
+                  "version_added": true
+                },
+                "opera_android": {
+                  "version_added": true
+                },
+                "safari": {
+                  "version_added": true
+                },
+                "safari_ios": {
+                  "version_added": true
+                },
+                "servo": {
+                  "version_added": true
+                }
+              },
+              "status": {
+                "experimental": false,
+                "standard_track": true,
+                "obsolete": false
+              }
+            }
+          }
+        }
       }
     }
   }
diff --git a/http/headers/accept-ranges.json b/http/headers/accept-ranges.json
index db4eee1fb2550..70559a6d2a996 100644
--- a/http/headers/accept-ranges.json
+++ b/http/headers/accept-ranges.json
@@ -1,53 +1,64 @@
 {
-  "Accept-Ranges": {
-    "Basic support": {
-      "Android": {
-        "support": true
-      },
-      "Chrome": {
-        "support": true
-      },
-      "Chrome for Android": {
-        "support": true
-      },
-      "Edge": {
-        "support": true
-      },
-      "Edge Mobile": {
-        "support": true
-      },
-      "Firefox": {
-        "support": true
-      },
-      "Firefox for Android": {
-        "support": true
-      },
-      "Internet Explorer": {
-        "support": true
-      },
-      "IE Mobile": {
-        "support": true
-      },
-      "Opera": {
-        "support": true
-      },
-      "Opera Mobile": {
-        "support": true
-      },
-      "Safari": {
-        "support": true
-      },
-      "Safari Mobile": {
-        "support": true
-      },
-      "Servo": {
-        "support": true
-      },
-      "status": {
-        "experimental": false,
-        "standardized": true,
-        "stable": true,
-        "obsolete": false
+  "version": "1.0.0",
+  "data": {
+    "http": {
+      "headers": {
+        "Accept-Ranges": {
+          "__compat": {
+            "basic_support": {
+              "desc": "Basic support",
+              "status": {
+                "webview_android": {
+                  "version_added": true
+                },
+                "chrome": {
+                  "version_added": true
+                },
+                "chrome_android": {
+                  "version_added": true
+                },
+                "edge": {
+                  "version_added": true
+                },
+                "edge_mobile": {
+                  "version_added": true
+                },
+                "firefox": {
+                  "version_added": true
+                },
+                "firefox_android": {
+                  "version_added": true
+                },
+                "ie": {
+                  "version_added": true
+                },
+                "ie_mobile": {
+                  "version_added": true
+                },
+                "opera": {
+                  "version_added": true
+                },
+                "opera_android": {
+                  "version_added": true
+                },
+                "safari": {
+                  "version_added": true
+                },
+                "safari_ios": {
+                  "version_added": true
+                },
+                "servo": {
+                  "version_added": true
+                }
+              },
+              "status": {
+                "experimental": false,
+                "standard_track": true,
+                "obsolete": false
+              }
+            }
+          }
+        }
       }
     }
   }
diff --git a/http/headers/accept.json b/http/headers/accept.json
index 22950c34e3dd7..a6a10d7d7b7fc 100644
--- a/http/headers/accept.json
+++ b/http/headers/accept.json
@@ -1,53 +1,64 @@
 {
-  "Accept": {
-    "Basic support": {
-      "Android": {
-        "support": true
-      },
-      "Chrome": {
-        "support": true
-      },
-      "Chrome for Android": {
-        "support": true
-      },
-      "Edge": {
-        "support": true
-      },
-      "Edge Mobile": {
-        "support": true
-      },
-      "Firefox": {
-        "support": true
-      },
-      "Firefox for Android": {
-        "support": true
-      },
-      "Internet Explorer": {
-        "support": true
-      },
-      "IE Mobile": {
-        "support": true
-      },
-      "Opera": {
-        "support": true
-      },
-      "Opera Mobile": {
-        "support": true
-      },
-      "Safari": {
-        "support": true
-      },
-      "Safari Mobile": {
-        "support": true
-      },
-      "Servo": {
-        "support": true
-      },
-      "status": {
-        "experimental": false,
-        "standardized": true,
-        "stable": true,
-        "obsolete": false
+  "version": "1.0.0",
+  "data": {
+    "http": {
+      "headers": {
+        "Accept": {
+          "__compat": {
+            "basic_support": {
+              "desc": "Basic support",
+              "support": {
+                "webview_android": {
+                  "version_added": true
+                },
+                "chrome": {
+                  "version_added": true
+                },
+                "chrome_android": {
+                  "version_added": true
+                },
+                "edge": {
+                  "version_added": true
+                },
+                "edge_mobile": {
+                  "version_added": true
+                },
+                "firefox": {
+                  "version_added": true
+                },
+                "firefox_android": {
+                  "version_added": true
+                },
+                "ie": {
+                  "version_added": true
+                },
+                "ie_mobile": {
+                  "version_added": true
+                },
+                "opera": {
+                  "version_added": true
+                },
+                "opera_android": {
+                  "version_added": true
+                },
+                "safari": {
+                  "version_added": true
+                },
+                "safari_ios": {
+                  "version_added": true
+                },
+                "servo": {
+                  "version_added": true
+                }
+              },
+              "status": {
+                "experimental": false,
+                "standard_track": true,
+                "obsolete": false
+              }
+            }
+          }
+        }
       }
     }
   }
diff --git a/http/headers/access-control-allow-credentials.json b/http/headers/access-control-allow-credentials.json
index 9000989792a2f..26386b135af32 100644
--- a/http/headers/access-control-allow-credentials.json
+++ b/http/headers/access-control-allow-credentials.json
@@ -1,53 +1,64 @@
 {
-  "Access-Control-Allow-Credentials": {
-    "Basic support": {
-      "Android": {
-        "support": "2.1"
-      },
-      "Chrome": {
-        "support": "4"
-      },
-      "Chrome for Android": {
-        "support": true
-      },
-      "Edge": {
-        "support": "12"
-      },
-      "Edge Mobile": {
-        "support": true
-      },
-      "Firefox": {
-        "support": "3.5"
-      },
-      "Firefox for Android": {
-        "support": "1.0"
-      },
-      "Internet Explorer": {
-        "support": "10"
-      },
-      "IE Mobile": {
-        "support": true
-      },
-      "Opera": {
-        "support": "12"
-      },
-      "Opera Mobile": {
-        "support": "12"
-      },
-      "Safari": {
-        "support": "4"
-      },
-      "Safari Mobile": {
-        "support": "3.2"
-      },
-      "Servo": {
-        "support": null
-      },
-      "status": {
-        "experimental": false,
-        "standardized": true,
-        "stable": true,
-        "obsolete": false
+  "version": "1.0.0",
+  "data": {
+    "http": {
+      "headers": {
+        "Access-Control-Allow-Credentials": {
+          "__compat": {
+            "basic_support": {
+              "desc": "Basic support",
+              "support": {
+                "webview_android": {
+                  "version_added": "2.1"
+                },
+                "chrome": {
+                  "version_added": "4"
+                },
+                "chrome_android": {
+                  "version_added": true
+                },
+                "edge": {
+                  "version_added": "12"
+                },
+                "edge_mobile": {
+                  "version_added": true
+                },
+                "firefox": {
+                  "version_added": "3.5"
+                },
+                "firefox_android": {
+                  "version_added": "1.0"
+                },
+                "ie": {
+                  "version_added": "10"
+                },
+                "ie_mobile": {
+                  "version_added": true
+                },
+                "opera": {
+                  "version_added": "12"
+                },
+                "opera_android": {
+                  "version_added": "12"
+                },
+                "safari": {
+                  "version_added": "4"
+                },
+                "safari_ios": {
+                  "version_added": "3.2"
+                },
+                "servo": {
+                  "version_added": null
+                }
+              },
+              "status": {
+                "experimental": false,
+                "standard_track": true,
+                "obsolete": false
+              }
+            }
+          }
+        }
       }
     }
   }
diff --git a/http/headers/access-control-allow-headers.json b/http/headers/access-control-allow-headers.json
index 6370a5de895b8..4b80f6d2f31c6 100644
--- a/http/headers/access-control-allow-headers.json
+++ b/http/headers/access-control-allow-headers.json
@@ -1,53 +1,64 @@
 {
-  "Access-Control-Allow-Headers": {
-    "Basic support": {
-      "Android": {
-        "support": "2.1"
-      },
-      "Chrome": {
-        "support": "4"
-      },
-      "Chrome for Android": {
-        "support": true
-      },
-      "Edge": {
-        "support": "12"
-      },
-      "Edge Mobile": {
-        "support": true
-      },
-      "Firefox": {
-        "support": "3.5"
-      },
-      "Firefox for Android": {
-        "support": "1.0"
-      },
-      "Internet Explorer": {
-        "support": "10"
-      },
-      "IE Mobile": {
-        "support": true
-      },
-      "Opera": {
-        "support": "12"
-      },
-      "Opera Mobile": {
-        "support": "12"
-      },
-      "Safari": {
-        "support": "4"
-      },
-      "Safari Mobile": {
-        "support": "3.2"
-      },
-      "Servo": {
-        "support": null
-      },
-      "status": {
-        "experimental": false,
-        "standardized": true,
-        "stable": true,
-        "obsolete": false
+  "version": "1.0.0",
+  "data": {
+    "http": {
+      "headers": {
+        "Access-Control-Allow-Headers": {
+          "__compat": {
+            "basic_support": {
+              "desc": "Basic support",
+              "status": {
+                "webview_android": {
+                  "version_added": "2.1"
+                },
+                "chrome": {
+                  "version_added": "4"
+                },
+                "chrome_android": {
+                  "version_added": true
+                },
+                "edge": {
+                  "version_added": "12"
+                },
+                "edge_mobile": {
+                  "version_added": true
+                },
+                "firefox": {
+                  "version_added": "3.5"
+                },
+                "firefox_android": {
+                  "version_added": "1.0"
+                },
+                "ie": {
+                  "version_added": "10"
+                },
+                "ie_mobile": {
+                  "version_added": true
+                },
+                "opera": {
+                  "version_added": "12"
+                },
+                "opera_android": {
+                  "version_added": "12"
+                },
+                "safari": {
+                  "version_added": "4"
+                },
+                "safari_ios": {
+                  "version_added": "3.2"
+                },
+                "servo": {
+                  "version_added": null
+                }
+              },
+              "status": {
+                "experimental": false,
+                "standard_track": true,
+                "obsolete": false
+              }
+            }
+          }
+        }
       }
     }
   }
diff --git a/http/headers/access-control-allow-methods.json b/http/headers/access-control-allow-methods.json
index aff67ee20e9e0..a8be44b677343 100644
--- a/http/headers/access-control-allow-methods.json
+++ b/http/headers/access-control-allow-methods.json
@@ -1,53 +1,64 @@
 {
-  "Access-Control-Allow-Methods": {
-    "Basic support": {
-      "Android": {
-        "support": "2.1"
-      },
-      "Chrome": {
-        "support": "4"
-      },
-      "Chrome for Android": {
-        "support": true
-      },
-      "Edge": {
-        "support": "12"
-      },
-      "Edge Mobile": {
-        "support": true
-      },
-      "Firefox": {
-        "support": "3.5"
-      },
-      "Firefox for Android": {
-        "support": "1.0"
-      },
-      "Internet Explorer": {
-        "support": "10"
-      },
-      "IE Mobile": {
-        "support": true
-      },
-      "Opera": {
-        "support": "12"
-      },
-      "Opera Mobile": {
-        "support": "12"
-      },
-      "Safari": {
-        "support": "4"
-      },
-      "Safari Mobile": {
-        "support": "3.2"
-      },
-      "Servo": {
-        "support": null
-      },
-      "status": {
-        "experimental": false,
-        "standardized": true,
-        "stable": true,
-        "obsolete": false
+  "version": "1.0.0",
+  "data": {
+    "http": {
+      "headers": {
+        "Access-Control-Allow-Methods": {
+          "__compat": {
+            "basic_support": {
+              "desc": "Basic support",
+              "support": {
+                "webview_android": {
+                  "version_added": "2.1"
+                },
+                "chrome": {
+                  "version_added": "4"
+                },
+                "chrome_android": {
+                  "version_added": true
+                },
+                "edge": {
+                  "version_added": "12"
+                },
+                "edge_mobile": {
+                  "version_added": true
+                },
+                "firefox": {
+                  "version_added": "3.5"
+                },
+                "firefox_android": {
+                  "version_added": "1.0"
+                },
+                "ie": {
+                  "version_added": "10"
+                },
+                "ie_mobile": {
+                  "version_added": true
+                },
+                "opera": {
+                  "version_added": "12"
+                },
+                "opera_android": {
+                  "version_added": "12"
+                },
+                "safari": {
+                  "version_added": "4"
+                },
+                "safari_ios": {
+                  "version_added": "3.2"
+                },
+                "servo": {
+                  "version_added": null
+                }
+              },
+              "status": {
+                "experimental": false,
+                "standard_track": true,
+                "obsolete": false
+              }
+            }
+          }
+        }
       }
     }
   }
diff --git a/http/headers/access-control-allow-origin.json b/http/headers/access-control-allow-origin.json
index 86a1940c663cc..31e8d128a6cc1 100644
--- a/http/headers/access-control-allow-origin.json
+++ b/http/headers/access-control-allow-origin.json
@@ -1,53 +1,64 @@
 {
-  "Access-Control-Allow-Origin": {
-    "Basic support": {
-      "Android": {
-        "support": "2.1"
-      },
-      "Chrome": {
-        "support": "4"
-      },
-      "Chrome for Android": {
-        "support": true
-      },
-      "Edge": {
-        "support": "12"
-      },
-      "Edge Mobile": {
-        "support": true
-      },
-      "Firefox": {
-        "support": "3.5"
-      },
-      "Firefox for Android": {
-        "support": "1.0"
-      },
-      "Internet Explorer": {
-        "support": "10"
-      },
-      "IE Mobile": {
-        "support": true
-      },
-      "Opera": {
-        "support": "12"
-      },
-      "Opera Mobile": {
-        "support": "12"
-      },
-      "Safari": {
-        "support": "4"
-      },
-      "Safari Mobile": {
-        "support": "3.2"
-      },
-      "Servo": {
-        "support": null
-      },
-      "status": {
-        "experimental": false,
-        "standardized": true,
-        "stable": true,
-        "obsolete": false
+  "version": "1.0.0",
+  "data": {
+    "http": {
+      "headers": {
+        "Access-Control-Allow-Origin": {
+          "__compat": {
+            "basic_support": {
+              "desc": "Basic support",
+              "support": {
+                "webview_android": {
+                  "version_added": "2.1"
+                },
+                "chrome": {
+                  "version_added": "4"
+                },
+                "chrome_android": {
+                  "version_added": true
+                },
+                "edge": {
+                  "version_added": "12"
+                },
+                "edge_mobile": {
+                  "version_added": true
+                },
+                "firefox": {
+                  "version_added": "3.5"
+                },
+                "firefox_android": {
+                  "version_added": "1.0"
+                },
+                "ie": {
+                  "version_added": "10"
+                },
+                "ie_mobile": {
+                  "version_added": true
+                },
+                "opera": {
+                  "version_added": "12"
+                },
+                "opera_android": {
+                  "version_added": "12"
+                },
+                "safari": {
+                  "version_added": "4"
+                },
+                "safari_ios": {
+                  "version_added": "3.2"
+                },
+                "servo": {
+                  "version_added": null
+                }
+              },
+              "status": {
+                "experimental": false,
+                "standard_track": true,
+                "obsolete": false
+              }
+            }
+          }
+        }
       }
     }
   }
diff --git a/http/headers/access-control-expose-headers.json b/http/headers/access-control-expose-headers.json
index 14abb417ce3ba..b48461c0b5aee 100644
--- a/http/headers/access-control-expose-headers.json
+++ b/http/headers/access-control-expose-headers.json
@@ -1,53 +1,64 @@
 {
-  "Access-Control-Expose-Headers": {
-    "Basic support": {
-      "Android": {
-        "support": "2.1"
-      },
-      "Chrome": {
-        "support": "4"
-      },
-      "Chrome for Android": {
-        "support": true
-      },
-      "Edge": {
-        "support": "12"
-      },
-      "Edge Mobile": {
-        "support": true
-      },
-      "Firefox": {
-        "support": "3.5"
-      },
-      "Firefox for Android": {
-        "support": "1.0"
-      },
-      "Internet Explorer": {
-        "support": "10"
-      },
-      "IE Mobile": {
-        "support": true
-      },
-      "Opera": {
-        "support": "12"
-      },
-      "Opera Mobile": {
-        "support": "12"
-      },
-      "Safari": {
-        "support": "4"
-      },
-      "Safari Mobile": {
-        "support": "3.2"
-      },
-      "Servo": {
-        "support": null
-      },
-      "status": {
-        "experimental": false,
-        "standardized": true,
-        "stable": true,
-        "obsolete": false
+  "version": "1.0.0",
+  "data": {
+    "http": {
+      "headers": {
+        "Access-Control-Expose-Headers": {
+          "__compat": {
+            "basic_support": {
+              "desc": "Basic support",
+              "support": {
+                "webview_android": {
+                  "version_added": "2.1"
+                },
+                "chrome": {
+                  "version_added": "4"
+                },
+                "chrome_android": {
+                  "version_added": true
+                },
+                "edge": {
+                  "version_added": "12"
+                },
+                "edge_mobile": {
+                  "version_added": true
+                },
+                "firefox": {
+                  "version_added": "3.5"
+                },
+                "firefox_android": {
+                  "version_added": "1.0"
+                },
+                "ie": {
+                  "version_added": "10"
+                },
+                "ie_mobile": {
+                  "version_added": true
+                },
+                "opera": {
+                  "version_added": "12"
+                },
+                "opera_android": {
+                  "version_added": "12"
+                },
+                "safari": {
+                  "version_added": "4"
+                },
+                "safari_ios": {
+                  "version_added": "3.2"
+                },
+                "servo": {
+                  "version_added": null
+                }
+              },
+              "status": {
+                "experimental": false,
+                "standard_track": true,
+                "obsolete": false
+              }
+            }
+          }
+        }
       }
     }
   }
diff --git a/http/headers/access-control-max-age.json b/http/headers/access-control-max-age.json
index 6ba7ce820a657..fcd64b402c376 100644
--- a/http/headers/access-control-max-age.json
+++ b/http/headers/access-control-max-age.json
@@ -1,53 +1,64 @@
 {
-  "Access-Control-Max-Age": {
-    "Basic support": {
-      "Android": {
-        "support": "2.1"
-      },
-      "Chrome": {
-        "support": "4"
-      },
-      "Chrome for Android": {
-        "support": true
-      },
-      "Edge": {
-        "support": "12"
-      },
-      "Edge Mobile": {
-        "support": true
-      },
-      "Firefox": {
-        "support": "3.5"
-      },
-      "Firefox for Android": {
-        "support": "1.0"
-      },
-      "Internet Explorer": {
-        "support": "10"
-      },
-      "IE Mobile": {
-        "support": true
-      },
-      "Opera": {
-        "support": "12"
-      },
-      "Opera Mobile": {
-        "support": "12"
-      },
-      "Safari": {
-        "support": "4"
-      },
-      "Safari Mobile": {
-        "support": "3.2"
-      },
-      "Servo": {
-        "support": null
-      },
-      "status": {
-        "experimental": false,
-        "standardized": true,
-        "stable": true,
-        "obsolete": false
+  "version": "1.0.0",
+  "data": {
+    "http": {
+      "headers": {
+        "Access-Control-Max-Age": {
+          "__compat": {
+            "basic_support": {
+              "desc": "Basic support",
+              "support": {
+                "webview_android": {
+                  "version_added": "2.1"
+                },
+                "chrome": {
+                  "version_added": "4"
+                },
+                "chrome_android": {
+                  "version_added": true
+                },
+                "edge": {
+                  "version_added": "12"
+                },
+                "edge_mobile": {
+                  "version_added": true
+                },
+                "firefox": {
+                  "version_added": "3.5"
+                },
+                "firefox_android": {
+                  "version_added": "1.0"
+                },
+                "ie": {
+                  "version_added": "10"
+                },
+                "ie_mobile": {
+                  "version_added": true
+                },
+                "opera": {
+                  "version_added": "12"
+                },
+                "opera_android": {
+                  "version_added": "12"
+                },
+                "safari": {
+                  "version_added": "4"
+                },
+                "safari_ios": {
+                  "version_added": "3.2"
+                },
+                "servo": {
+                  "version_added": null
+                }
+              },
+              "status": {
+                "experimental": false,
+                "standard_track": true,
+                "obsolete": false
+              }
+            }
+          }
+        }
       }
     }
   }
diff --git a/http/headers/access-control-request-headers.json b/http/headers/access-control-request-headers.json
index a737cbbcf8817..bc5de19990e67 100644
--- a/http/headers/access-control-request-headers.json
+++ b/http/headers/access-control-request-headers.json
@@ -1,53 +1,64 @@
 {
-  "Access-Control-Request-Headers": {
-    "Basic support": {
-      "Android": {
-        "support": "2.1"
-      },
-      "Chrome": {
-        "support": "4"
-      },
-      "Chrome for Android": {
-        "support": true
-      },
-      "Edge": {
-        "support": "12"
-      },
-      "Edge Mobile": {
-        "support": true
-      },
-      "Firefox": {
-        "support": "3.5"
-      },
-      "Firefox for Android": {
-        "support": "1.0"
-      },
-      "Internet Explorer": {
-        "support": "10"
-      },
-      "IE Mobile": {
-        "support": true
-      },
-      "Opera": {
-        "support": "12"
-      },
-      "Opera Mobile": {
-        "support": "12"
-      },
-      "Safari": {
-        "support": "4"
-      },
-      "Safari Mobile": {
-        "support": "3.2"
-      },
-      "Servo": {
-        "support": null
-      },
-      "status": {
-        "experimental": false,
-        "standardized": true,
-        "stable": true,
-        "obsolete": false
+  "version": "1.0.0",
+  "data": {
+    "http": {
+      "headers": {
+        "Access-Control-Request-Headers": {
+          "__compat": {
+            "basic_support": {
+              "desc": "Basic support",
+              "support": {
+                "webview_android": {
+                  "version_added": "2.1"
+                },
+                "chrome": {
+                  "version_added": "4"
+                },
+                "chrome_android": {
+                  "version_added": true
+                },
+                "edge": {
+                  "version_added": "12"
+                },
+                "edge_mobile": {
+                  "version_added": true
+                },
+                "firefox": {
+                  "version_added": "3.5"
+                },
+                "firefox_android": {
+                  "version_added": "1.0"
+                },
+                "ie": {
+                  "version_added": "10"
+                },
+                "ie_mobile": {
+                  "version_added": true
+                },
+                "opera": {
+                  "version_added": "12"
+                },
+                "opera_android": {
+                  "version_added": "12"
+                },
+                "safari": {
+                  "version_added": "4"
+                },
+                "safari_ios": {
+                  "version_added": "3.2"
+                },
+                "servo": {
+                  "version_added": null
+                }
+              },
+              "status": {
+                "experimental": false,
+                "standard_track": true,
+                "obsolete": false
+              }
+            }
+          }
+        }
       }
     }
   }
diff --git a/http/headers/access-control-request-method.json b/http/headers/access-control-request-method.json
index e778c77555e65..a45eb5b70cf9c 100644
--- a/http/headers/access-control-request-method.json
+++ b/http/headers/access-control-request-method.json
@@ -1,53 +1,64 @@
 {
-  "Access-Control-Request-Method": {
-    "Basic support": {
-      "Android": {
-        "support": "2.1"
-      },
-      "Chrome": {
-        "support": "4"
-      },
-      "Chrome for Android": {
-        "support": true
-      },
-      "Edge": {
-        "support": "12"
-      },
-      "Edge Mobile": {
-        "support": true
-      },
-      "Firefox": {
-        "support": "3.5"
-      },
-      "Firefox for Android": {
-        "support": "1.0"
-      },
-      "Internet Explorer": {
-        "support": "10"
-      },
-      "IE Mobile": {
-        "support": true
-      },
-      "Opera": {
-        "support": "12"
-      },
-      "Opera Mobile": {
-        "support": "12"
-      },
-      "Safari": {
-        "support": "4"
-      },
-      "Safari Mobile": {
-        "support": "3.2"
-      },
-      "Servo": {
-        "support": null
-      },
-      "status": {
-        "experimental": false,
-        "standardized": true,
-        "stable": true,
-        "obsolete": false
+  "version": "1.0.0",
+  "data": {
+    "http": {
+      "headers": {
+        "Access-Control-Request-Method": {
+          "__compat": {
+            "basic_support": {
+              "desc": "Basic support",
+              "support": {
+                "webview_android": {
+                  "version_added": "2.1"
+                },
+                "chrome": {
+                  "version_added": "4"
+                },
+                "chrome_android": {
+                  "version_added": true
+                },
+                "edge": {
+                  "version_added": "12"
+                },
+                "edge_mobile": {
+                  "version_added": true
+                },
+                "firefox": {
+                  "version_added": "3.5"
+                },
+                "firefox_android": {
+                  "version_added": "1.0"
+                },
+                "ie": {
+                  "version_added": "10"
+                },
+                "ie_mobile": {
+                  "version_added": true
+                },
+                "opera": {
+                  "version_added": "12"
+                },
+                "opera_android": {
+                  "version_added": "12"
+                },
+                "safari": {
+                  "version_added": "4"
+                },
+                "safari_ios": {
+                  "version_added": "3.2"
+                },
+                "servo": {
+                  "version_added": null
+                }
+              },
+              "status": {
+                "experimental": false,
+                "standard_track": true,
+                "obsolete": false
+              }
+            }
+          }
+        }
       }
     }
   }
diff --git a/http/headers/age.json b/http/headers/age.json
index b6a28abc3969e..32e9b7a7b15cd 100644
--- a/http/headers/age.json
+++ b/http/headers/age.json
@@ -1,53 +1,64 @@
 {
-  "Age": {
-    "Basic support": {
-      "Android": {
-        "support": true
-      },
-      "Chrome": {
-        "support": true
-      },
-      "Chrome for Android": {
-        "support": true
-      },
-      "Edge": {
-        "support": true
-      },
-      "Edge Mobile": {
-        "support": true
-      },
-      "Firefox": {
-        "support": true
-      },
-      "Firefox for Android": {
-        "support": true
-      },
-      "Internet Explorer": {
-        "support": true
-      },
-      "IE Mobile": {
-        "support": true
-      },
-      "Opera": {
-        "support": true
-      },
-      "Opera Mobile": {
-        "support": true
-      },
-      "Safari": {
-        "support": true
-      },
-      "Safari Mobile": {
-        "support": true
-      },
-      "Servo": {
-        "support": true
-      },
-      "status": {
-        "experimental": false,
-        "standardized": true,
-        "stable": true,
-        "obsolete": false
+  "version": "1.0.0",
+  "data": {
+    "http": {
+      "headers": {
+        "Age": {
+          "__compat": {
+            "basic_support": {
+              "desc": "Basic support",
+              "support": {
+                "webview_android": {
+                  "version_added": true
+                },
+                "chrome": {
+                  "version_added": true
+                },
+                "chrome_android": {
+                  "version_added": true
+                },
+                "edge": {
+                  "version_added": true
+                },
+                "edge_mobile": {
+                  "version_added": true
+                },
+                "firefox": {
+                  "version_added": true
+                },
+                "firefox_android": {
+                  "version_added": true
+                },
+                "ie": {
+                  "version_added": true
+                },
+                "ie_mobile": {
+                  "version_added": true
+                },
+                "opera": {
+                  "version_added": true
+                },
+                "opera_android": {
+                  "version_added": true
+                },
+                "safari": {
+                  "version_added": true
+                },
+                "safari_ios": {
+                  "version_added": true
+                },
+                "servo": {
+                  "version_added": true
+                }
+              },
+              "status": {
+                "experimental": false,
+                "standard_track": true,
+                "obsolete": false
+              }
+            }
+          }
+        }
       }
     }
   }
diff --git a/http/headers/cache-control.json b/http/headers/cache-control.json
index d224af5ee9480..6b405db4edae8 100644
--- a/http/headers/cache-control.json
+++ b/http/headers/cache-control.json
@@ -1,208 +1,225 @@
 {
-  "Cache-Control": {
-    "Basic support": {
-      "Android": {
-        "support": true
-      },
-      "Chrome": {
-        "support": true
-      },
-      "Chrome for Android": {
-        "support": true
-      },
-      "Edge": {
-        "support": true
-      },
-      "Edge Mobile": {
-        "support": true
-      },
-      "Firefox": {
-        "support": true
-      },
-      "Firefox for Android": {
-        "support": true
-      },
-      "Internet Explorer": {
-        "support": true
-      },
-      "IE Mobile": {
-        "support": true
-      },
-      "Opera": {
-        "support": true
-      },
-      "Opera Mobile": {
-        "support": true
-      },
-      "Safari": {
-        "support": true
-      },
-      "Safari Mobile": {
-        "support": true
-      },
-      "Servo": {
-        "support": true
-      },
-      "status": {
-        "experimental": false,
-        "standardized": true,
-        "stable": true,
-        "obsolete": false
-      }
-    },
-    "immutable": {
-      "Android": {
-        "support": false
-      },
-      "Chrome": {
-        "support": false
-      },
-      "Chrome for Android": {
-        "support": false
-      },
-      "Edge": {
-        "support": false
-      },
-      "Edge Mobile": {
-        "support": false
-      },
-      "Firefox": {
-        "support": "49.0"
-      },
-      "Firefox for Android": {
-        "support": false
-      },
-      "Internet Explorer": {
-        "support": false
-      },
-      "IE Mobile": {
-        "support": false
-      },
-      "Opera": {
-        "support": false
-      },
-      "Opera Mobile": {
-        "support": false
-      },
-      "Safari": {
-        "support": false,
-        "notes": ["See <a href=\"https://bugs.webkit.org/show_bug.cgi?id=167497\">WebKit bug 167497</a>."]
-      },
-      "Safari Mobile": {
-        "support": false
-      },
-      "Servo": {
-        "support": null
-      },
-      "status": {
-        "experimental": true,
-        "standardized": false,
-        "stable": false,
-        "obsolete": false
-      }
-    },
-    "stale-while-revalidate": {
-      "Android": {
-        "support": false
-      },
-      "Chrome": {
-        "support": false,
-        "notes": ["See <a href=\"https://code.google.com/p/chromium/issues/detail?id=348877\">Chromium bug 348877</a>."]
-      },
-      "Chrome for Android": {
-        "support": false
-      },
-      "Edge": {
-        "support": false
-      },
-      "Edge Mobile": {
-        "support": false
-      },
-      "Firefox": {
-        "support": false,
-        "notes": ["See <a href=\"https://bugzilla.mozilla.org/show_bug.cgi?id=995651\">Bugzilla bug 995651</a>."]
-      },
-      "Firefox for Android": {
-        "support": false
-      },
-      "Internet Explorer": {
-        "support": false
-      },
-      "IE Mobile": {
-        "support": false
-      },
-      "Opera": {
-        "support": false
-      },
-      "Opera Mobile": {
-        "support": false
-      },
-      "Safari": {
-        "support": false
-      },
-      "Safari Mobile": {
-        "support": false
-      },
-      "Servo": {
-        "support": false
-      },
-      "status": {
-        "experimental": true,
-        "standardized": false,
-        "stable": false,
-        "obsolete": false
-      }
-    },
-    "stale-if-error": {
-      "Android": {
-        "support": false
-      },
-      "Chrome": {
-        "support": false,
-        "notes": ["See <a href=\"https://code.google.com/p/chromium/issues/detail?id=348877\">Chromium bug 348877</a>."]
-      },
-      "Chrome for Android": {
-        "support": false
-      },
-      "Edge": {
-        "support": false
-      },
-      "Edge Mobile": {
-        "support": false
-      },
-      "Firefox": {
-        "support": false,
-        "notes": ["See <a href=\"https://bugzilla.mozilla.org/show_bug.cgi?id=995651\">Bugzilla bug 995651</a>."]
-      },
-      "Firefox for Android": {
-        "support": false
-      },
-      "Internet Explorer": {
-        "support": false
-      },
-      "IE Mobile": {
-        "support": false
-      },
-      "Opera": {
-        "support": false
-      },
-      "Opera Mobile": {
-        "support": false
-      },
-      "Safari": {
-        "support": false
-      },
-      "Safari Mobile": {
-        "support": false
-      },
-      "Servo": {
-        "support": false
-      },
-      "status": {
-        "experimental": true,
-        "standardized": false,
-        "stable": false,
-        "obsolete": false
+  "version": "1.0.0",
+  "data": {
+    "http": {
+      "headers": {
+        "Cache-Control": {
+          "__compat": {
+            "basic_support": {
+              "desc": "Basic support",
+              "status": {
+                "webview_android": {
+                  "version_added": true
+                },
+                "chrome": {
+                  "version_added": true
+                },
+                "chrome_android": {
+                  "version_added": true
+                },
+                "edge": {
+                  "version_added": true
+                },
+                "edge_mobile": {
+                  "version_added": true
+                },
+                "firefox": {
+                  "version_added": true
+                },
+                "firefox_android": {
+                  "version_added": true
+                },
+                "ie": {
+                  "version_added": true
+                },
+                "ie_mobile": {
+                  "version_added": true
+                },
+                "opera": {
+                  "version_added": true
+                },
+                "opera_android": {
+                  "version_added": true
+                },
+                "safari": {
+                  "version_added": true
+                },
+                "safari_ios": {
+                  "version_added": true
+                },
+                "servo": {
+                  "version_added": true
+                }
+              },
+              "status": {
+                "experimental": false,
+                "standard_track": true,
+                "obsolete": false
+              }
+            },
+            "immutable": {
+              "desc": "<code>immutable</code>",
+              "status": {
+                "webview_android": {
+                  "version_added": false
+                },
+                "chrome": {
+                  "version_added": false
+                },
+                "chrome_android": {
+                  "version_added": false
+                },
+                "edge": {
+                  "version_added": false
+                },
+                "edge_mobile": {
+                  "version_added": false
+                },
+                "firefox": {
+                  "version_added": "49.0"
+                },
+                "firefox_android": {
+                  "version_added": false
+                },
+                "ie": {
+                  "version_added": false
+                },
+                "ie_mobile": {
+                  "version_added": false
+                },
+                "opera": {
+                  "version_added": false
+                },
+                "opera_android": {
+                  "version_added": false
+                },
+                "safari": {
+                  "version_added": false,
+                  "notes": "See WebKit <a href=\"https://bugs.webkit.org/show_bug.cgi?id=167497\">bug 167497</a>."
+                },
+                "safari_ios": {
+                  "version_added": false
+                },
+                "servo": {
+                  "version_added": null
+                }
+              },
+              "status": {
+                "experimental": true,
+                "standard_track": false,
+                "obsolete": false
+              }
+            },
+            "stale-while-revalidate": {
+              "desc": "<code>stale-while-revalidate</code>",
+              "status": {
+                "webview_android": {
+                  "version_added": false
+                },
+                "chrome": {
+                  "version_added": false,
+                  "notes": "See Chromium <a href=\"https://code.google.com/p/chromium/issues/detail?id=348877\">bug 348877</a>."
+                },
+                "chrome_android": {
+                  "version_added": false
+                },
+                "edge": {
+                  "version_added": false
+                },
+                "edge_mobile": {
+                  "version_added": false
+                },
+                "firefox": {
+                  "version_added": false,
+                  "notes": "See Bugzilla <a href=\"https://bugzilla.mozilla.org/show_bug.cgi?id=995651\">bug 995651</a>."
+                },
+                "firefox_android": {
+                  "version_added": false
+                },
+                "ie": {
+                  "version_added": false
+                },
+                "ie_mobile": {
+                  "version_added": false
+                },
+                "opera": {
+                  "version_added": false
+                },
+                "opera_android": {
+                  "version_added": false
+                },
+                "safari": {
+                  "version_added": false
+                },
+                "safari_ios": {
+                  "version_added": false
+                },
+                "servo": {
+                  "version_added": false
+                }
+              },
+              "status": {
+                "experimental": true,
+                "standard_track": false,
+                "obsolete": false
+              }
+            },
+            "stale-if-error": {
+              "desc": "stale-if-error",
+              "status": {
+                "webview_android": {
+                  "version_added": false
+                },
+                "chrome": {
+                  "version_added": false,
+                  "notes": "See Chromium <a href=\"https://code.google.com/p/chromium/issues/detail?id=348877\">bug 348877</a>."
+                },
+                "chrome_android": {
+                  "version_added": false
+                },
+                "edge": {
+                  "version_added": false
+                },
+                "edge_mobile": {
+                  "version_added": false
+                },
+                "firefox": {
+                  "version_added": false,
+                  "notes": "See Bugzilla <a href=\"https://bugzilla.mozilla.org/show_bug.cgi?id=995651\">bug 995651</a>."
+                },
+                "firefox_android": {
+                  "version_added": false
+                },
+                "ie": {
+                  "version_added": false
+                },
+                "ie_mobile": {
+                  "version_added": false
+                },
+                "opera": {
+                  "version_added": false
+                },
+                "opera_android": {
+                  "version_added": false
+                },
+                "safari": {
+                  "version_added": false
+                },
+                "safari_ios": {
+                  "version_added": false
+                },
+                "servo": {
+                  "version_added": false
+                }
+              },
+              "status": {
+                "experimental": true,
+                "standard_track": false,
+                "obsolete": false
+              }
+            }
+          }
+        }
       }
     }
   }
diff --git a/http/headers/connection.json b/http/headers/connection.json
index cc749065bd367..42c156d6de8d4 100644
--- a/http/headers/connection.json
+++ b/http/headers/connection.json
@@ -1,53 +1,64 @@
 {
-  "Connection": {
-    "Basic support": {
-      "Android": {
-        "support": true
-      },
-      "Chrome": {
-        "support": true
-      },
-      "Chrome for Android": {
-        "support": true
-      },
-      "Edge": {
-        "support": true
-      },
-      "Edge Mobile": {
-        "support": true
-      },
-      "Firefox": {
-        "support": true
-      },
-      "Firefox for Android": {
-        "support": true
-      },
-      "Internet Explorer": {
-        "support": true
-      },
-      "IE Mobile": {
-        "support": true
-      },
-      "Opera": {
-        "support": true
-      },
-      "Opera Mobile": {
-        "support": true
-      },
-      "Safari": {
-        "support": true
-      },
-      "Safari Mobile": {
-        "support": true
-      },
-      "Servo": {
-        "support": true
-      },
-      "status": {
-        "experimental": false,
-        "standardized": true,
-        "stable": true,
-        "obsolete": false
+  "version": "1.0.0",
+  "data": {
+    "http": {
+      "headers": {
+        "Connection": {
+          "__compat": {
+            "basic_support": {
+              "desc": "Basic support",
+              "support": {
+                "webview_android": {
+                  "version_added": true
+                },
+                "chrome": {
+                  "version_added": true
+                },
+                "chrome_android": {
+                  "version_added": true
+                },
+                "edge": {
+                  "version_added": true
+                },
+                "edge_mobile": {
+                  "version_added": true
+                },
+                "firefox": {
+                  "version_added": true
+                },
+                "firefox_android": {
+                  "version_added": true
+                },
+                "ie": {
+                  "version_added": true
+                },
+                "ie_mobile": {
+                  "version_added": true
+                },
+                "opera": {
+                  "version_added": true
+                },
+                "opera_android": {
+                  "version_added": true
+                },
+                "safari": {
+                  "version_added": true
+                },
+                "safari_ios": {
+                  "version_added": true
+                },
+                "servo": {
+                  "version_added": true
+                }
+              },
+              "status": {
+                "experimental": false,
+                "standard_track": true,
+                "obsolete": false
+              }
+            }
+          }
+        }
       }
     }
   }
diff --git a/http/headers/content-disposition.json b/http/headers/content-disposition.json
index 319033e363141..2085d26b3c922 100644
--- a/http/headers/content-disposition.json
+++ b/http/headers/content-disposition.json
@@ -1,53 +1,64 @@
 {
-  "Content-Disposition": {
-    "Basic support": {
-      "Android": {
-        "support": true
-      },
-      "Chrome": {
-        "support": true
-      },
-      "Chrome for Android": {
-        "support": true
-      },
-      "Edge": {
-        "support": true
-      },
-      "Edge Mobile": {
-        "support": true
-      },
-      "Firefox": {
-        "support": true
-      },
-      "Firefox for Android": {
-        "support": true
-      },
-      "Internet Explorer": {
-        "support": true
-      },
-      "IE Mobile": {
-        "support": true
-      },
-      "Opera": {
-        "support": true
-      },
-      "Opera Mobile": {
-        "support": true
-      },
-      "Safari": {
-        "support": true
-      },
-      "Safari Mobile": {
-        "support": true
-      },
-      "Servo": {
-        "support": true
-      },
-      "status": {
-        "experimental": false,
-        "standardized": true,
-        "stable": true,
-        "obsolete": false
+  "version": "1.0.0",
+  "data": {
+    "http": {
+      "headers": {
+        "Content-Disposition": {
+          "__compat": {
+            "basic_support": {
+              "desc": "Basic support",
+              "support": {
+                "webview_android": {
+                  "version_added": true
+                },
+                "chrome": {
+                  "version_added": true
+                },
+                "chrome_android": {
+                  "version_added": true
+                },
+                "edge": {
+                  "version_added": true
+                },
+                "edge_mobile": {
+                  "version_added": true
+                },
+                "firefox": {
+                  "version_added": true
+                },
+                "firefox_android": {
+                  "version_added": true
+                },
+                "ie": {
+                  "version_added": true
+                },
+                "ie_mobile": {
+                  "version_added": true
+                },
+                "opera": {
+                  "version_added": true
+                },
+                "opera_android": {
+                  "version_added": true
+                },
+                "safari": {
+                  "version_added": true
+                },
+                "safari_ios": {
+                  "version_added": true
+                },
+                "servo": {
+                  "version_added": true
+                }
+              },
+              "status": {
+                "experimental": false,
+                "standard_track": true,
+                "obsolete": false
+              }
+            }
+          }
+        }
       }
     }
   }
diff --git a/http/headers/content-encoding.json b/http/headers/content-encoding.json
index 06e7ce387c10c..50a3947c1310a 100644
--- a/http/headers/content-encoding.json
+++ b/http/headers/content-encoding.json
@@ -1,103 +1,116 @@
 {
-  "Content-Encoding": {
-    "Basic support": {
-      "Android": {
-        "support": true
-      },
-      "Chrome": {
-        "support": true
-      },
-      "Chrome for Android": {
-        "support": true
-      },
-      "Edge": {
-        "support": true
-      },
-      "Edge Mobile": {
-        "support": true
-      },
-      "Firefox": {
-        "support": true
-      },
-      "Firefox for Android": {
-        "support": true
-      },
-      "Internet Explorer": {
-        "support": true
-      },
-      "IE Mobile": {
-        "support": true
-      },
-      "Opera": {
-        "support": true
-      },
-      "Opera Mobile": {
-        "support": true
-      },
-      "Safari": {
-        "support": true
-      },
-      "Safari Mobile": {
-        "support": true
-      },
-      "Servo": {
-        "support": true
-      },
-      "status": {
-        "experimental": false,
-        "standardized": true,
-        "stable": true,
-        "obsolete": false
-      }
-    },
-    "br": {
-      "Android": {
-        "support": "51"
-      },
-      "Chrome": {
-        "support": "50"
-      },
-      "Chrome for Android": {
-        "support": "51"
-      },
-      "Edge": {
-        "support": false
-      },
-      "Edge Mobile": {
-        "support": false
-      },
-      "Firefox": {
-        "support": "44.0"
-      },
-      "Firefox for Android": {
-        "support": "44.0"
-      },
-      "Internet Explorer": {
-        "support": false
-      },
-      "IE Mobile": {
-        "support": false
-      },
-      "Opera": {
-        "support": "36.0"
-      },
-      "Opera Mobile": {
-        "support": false
-      },
-      "Safari": {
-        "support": false
-      },
-      "Safari Mobile": {
-        "support": false
-      },
-      "Servo": {
-        "support": null
-      },
-      "status": {
-        "experimental": true,
-        "standardized": false,
-        "stable": false,
-        "obsolete": false
+  "version": "1.0.0",
+  "data": {
+    "http": {
+      "headers": {
+        "Content-Encoding": {
+          "__compat": {
+            "basic_support": {
+              "desc": "Basic support",
+              "support": {
+                "webview_android": {
+                  "version_added": true
+                },
+                "chrome": {
+                  "version_added": true
+                },
+                "chrome_android": {
+                  "version_added": true
+                },
+                "edge": {
+                  "version_added": true
+                },
+                "edge_mobile": {
+                  "version_added": true
+                },
+                "firefox": {
+                  "version_added": true
+                },
+                "firefox_android": {
+                  "version_added": true
+                },
+                "ie": {
+                  "version_added": true
+                },
+                "ie_mobile": {
+                  "version_added": true
+                },
+                "opera": {
+                  "version_added": true
+                },
+                "opera_android": {
+                  "version_added": true
+                },
+                "safari": {
+                  "version_added": true
+                },
+                "safari_ios": {
+                  "version_added": true
+                },
+                "servo": {
+                  "version_added": true
+                }
+              },
+              "status": {
+                "experimental": false,
+                "standard_track": true,
+                "obsolete": false
+              }
+            },
+            "br": {
+              "desc": "<code>br</code>",
+              "support": {
+                "webview_android": {
+                  "version_added": "51"
+                },
+                "chrome": {
+                  "version_added": "50"
+                },
+                "chrome_android": {
+                  "version_added": "51"
+                },
+                "edge": {
+                  "version_added": false
+                },
+                "edge_mobile": {
+                  "version_added": false
+                },
+                "firefox": {
+                  "version_added": "44.0"
+                },
+                "firefox_android": {
+                  "version_added": "44.0"
+                },
+                "ie": {
+                  "version_added": false
+                },
+                "ie_mobile": {
+                  "version_added": false
+                },
+                "opera": {
+                  "version_added": "36.0"
+                },
+                "opera_android": {
+                  "version_added": false
+                },
+                "safari": {
+                  "version_added": false
+                },
+                "safari_ios": {
+                  "version_added": false
+                },
+                "servo": {
+                  "version_added": null
+                }
+              },
+              "status": {
+                "experimental": true,
+                "standard_track": false,
+                "obsolete": false
+              }
+            }
+          }
+        }
       }
     }
   }
diff --git a/http/headers/content-language.json b/http/headers/content-language.json
index 39b71a6f047da..ed3d3ad13b7dc 100644
--- a/http/headers/content-language.json
+++ b/http/headers/content-language.json
@@ -1,53 +1,64 @@
 {
-  "Content-Language": {
-    "Basic support": {
-      "Android": {
-        "support": true
-      },
-      "Chrome": {
-        "support": true
-      },
-      "Chrome for Android": {
-        "support": true
-      },
-      "Edge": {
-        "support": true
-      },
-      "Edge Mobile": {
-        "support": true
-      },
-      "Firefox": {
-        "support": true
-      },
-      "Firefox for Android": {
-        "support": true
-      },
-      "Internet Explorer": {
-        "support": true
-      },
-      "IE Mobile": {
-        "support": true
-      },
-      "Opera": {
-        "support": true
-      },
-      "Opera Mobile": {
-        "support": true
-      },
-      "Safari": {
-        "support": true
-      },
-      "Safari Mobile": {
-        "support": true
-      },
-      "Servo": {
-        "support": true
-      },
-      "status": {
-        "experimental": false,
-        "standardized": true,
-        "stable": true,
-        "obsolete": false
+  "version": "1.0.0",
+  "data": {
+    "http": {
+      "headers": {
+        "Content-Language": {
+          "__compat": {
+              "basic_support": {
+                "desc": "Basic support",
+                "support": {
+                  "webview_android": {
+                  "version_added": true
+                },
+                "chrome": {
+                  "version_added": true
+                },
+                "chrome_android": {
+                  "version_added": true
+                },
+                "edge": {
+                  "version_added": true
+                },
+                "edge_mobile": {
+                  "version_added": true
+                },
+                "firefox": {
+                  "version_added": true
+                },
+                "firefox_android": {
+                  "version_added": true
+                },
+                "ie": {
+                  "version_added": true
+                },
+                "ie_mobile": {
+                  "version_added": true
+                },
+                "opera": {
+                  "version_added": true
+                },
+                "opera_android": {
+                  "version_added": true
+                },
+                "safari": {
+                  "version_added": true
+                },
+                "safari_ios": {
+                  "version_added": true
+                },
+                "servo": {
+                  "version_added": true
+                }
+              },
+              "status": {
+                "experimental": false,
+                "standard_track": true,
+                "obsolete": false
+              }
+            }
+          }
+        }
       }
     }
   }
diff --git a/http/headers/content-length.json b/http/headers/content-length.json
index 21fb69d98f6e7..07b338cc15d37 100644
--- a/http/headers/content-length.json
+++ b/http/headers/content-length.json
@@ -1,53 +1,64 @@
 {
-  "Content-Length": {
-    "Basic support": {
-      "Android": {
-        "support": true
-      },
-      "Chrome": {
-        "support": true
-      },
-      "Chrome for Android": {
-        "support": true
-      },
-      "Edge": {
-        "support": true
-      },
-      "Edge Mobile": {
-        "support": true
-      },
-      "Firefox": {
-        "support": true
-      },
-      "Firefox for Android": {
-        "support": true
-      },
-      "Internet Explorer": {
-        "support": true
-      },
-      "IE Mobile": {
-        "support": true
-      },
-      "Opera": {
-        "support": true
-      },
-      "Opera Mobile": {
-        "support": true
-      },
-      "Safari": {
-        "support": true
-      },
-      "Safari Mobile": {
-        "support": true
-      },
-      "Servo": {
-        "support": true
-      },
-      "status": {
-        "experimental": false,
-        "standardized": true,
-        "stable": true,
-        "obsolete": false
+  "version": "1.0.0",
+  "data": {
+    "http": {
+      "headers": {
+        "Content-Length": {
+          "__compat": {
+            "basic_support": {
+              "desc": "Basic support",
+              "support": {
+                "webview_android": {
+                  "version_added": true
+                },
+                "chrome": {
+                  "version_added": true
+                },
+                "chrome_android": {
+                  "version_added": true
+                },
+                "edge": {
+                  "version_added": true
+                },
+                "edge_mobile": {
+                  "version_added": true
+                },
+                "firefox": {
+                  "version_added": true
+                },
+                "firefox_android": {
+                  "version_added": true
+                },
+                "ie": {
+                  "version_added": true
+                },
+                "ie_mobile": {
+                  "version_added": true
+                },
+                "opera": {
+                  "version_added": true
+                },
+                "opera_android": {
+                  "version_added": true
+                },
+                "safari": {
+                  "version_added": true
+                },
+                "safari_ios": {
+                  "version_added": true
+                },
+                "servo": {
+                  "version_added": true
+                }
+              },
+              "status": {
+                "experimental": false,
+                "standard_track": true,
+                "obsolete": false
+              }
+            }
+          }
+        }
       }
     }
   }
diff --git a/http/headers/content-location.json b/http/headers/content-location.json
index ad47c66c41195..4bc0f3ad34ad8 100644
--- a/http/headers/content-location.json
+++ b/http/headers/content-location.json
@@ -1,53 +1,64 @@
 {
-  "Content-Location": {
-    "Basic support": {
-      "Android": {
-        "support": true
-      },
-      "Chrome": {
-        "support": true
-      },
-      "Chrome for Android": {
-        "support": true
-      },
-      "Edge": {
-        "support": true
-      },
-      "Edge Mobile": {
-        "support": true
-      },
-      "Firefox": {
-        "support": true
-      },
-      "Firefox for Android": {
-        "support": true
-      },
-      "Internet Explorer": {
-        "support": true
-      },
-      "IE Mobile": {
-        "support": true
-      },
-      "Opera": {
-        "support": true
-      },
-      "Opera Mobile": {
-        "support": true
-      },
-      "Safari": {
-        "support": true
-      },
-      "Safari Mobile": {
-        "support": true
-      },
-      "Servo": {
-        "support": true
-      },
-      "status": {
-        "experimental": false,
-        "standardized": true,
-        "stable": true,
-        "obsolete": false
+  "version": "1.0.0",
+  "data": {
+  "http": {
+      "headers": {
+        "Content-Location": {
+          "__compat": {
+            "basic_support": {
+              "desc": "Basic support",
+              "support": {
+                "webview_android": {
+                  "version_added": true
+                },
+                "chrome": {
+                  "version_added": true
+                },
+                "chrome_android": {
+                  "version_added": true
+                },
+                "edge": {
+                  "version_added": true
+                },
+                "edge_mobile": {
+                  "version_added": true
+                },
+                "firefox": {
+                  "version_added": true
+                },
+                "firefox_android": {
+                  "version_added": true
+                },
+                "ie": {
+                  "version_added": true
+                },
+                "ie_mobile": {
+                  "version_added": true
+                },
+                "opera": {
+                  "version_added": true
+                },
+                "opera_android": {
+                  "version_added": true
+                },
+                "safari": {
+                  "version_added": true
+                },
+                "safari_ios": {
+                  "version_added": true
+                },
+                "servo": {
+                  "version_added": true
+                }
+              },
+              "status": {
+                "experimental": false,
+                "standard_track": true,
+                "obsolete": false
+              }
+            }
+          }
+        }
       }
     }
   }
diff --git a/http/headers/content-range.json b/http/headers/content-range.json
index b7b5a883b1739..cd9682b710d70 100644
--- a/http/headers/content-range.json
+++ b/http/headers/content-range.json
@@ -1,53 +1,64 @@
 {
-  "Content-Range": {
-    "Basic support": {
-      "Android": {
-        "support": true
-      },
-      "Chrome": {
-        "support": true
-      },
-      "Chrome for Android": {
-        "support": true
-      },
-      "Edge": {
-        "support": true
-      },
-      "Edge Mobile": {
-        "support": true
-      },
-      "Firefox": {
-        "support": true
-      },
-      "Firefox for Android": {
-        "support": true
-      },
-      "Internet Explorer": {
-        "support": true
-      },
-      "IE Mobile": {
-        "support": true
-      },
-      "Opera": {
-        "support": true
-      },
-      "Opera Mobile": {
-        "support": true
-      },
-      "Safari": {
-        "support": true
-      },
-      "Safari Mobile": {
-        "support": true
-      },
-      "Servo": {
-        "support": true
-      },
-      "status": {
-        "experimental": false,
-        "standardized": true,
-        "stable": true,
-        "obsolete": false
+  "version": "1.0.0",
+  "data": {
+    "http": {
+      "headers": {
+        "Content-Range": {
+          "__compat": {
+            "basic_support": {
+              "desc": "Basic support",
+              "status": {
+                "webview_android": {
+                  "version_added": true
+                },
+                "chrome": {
+                  "version_added": true
+                },
+                "chrome_android": {
+                  "version_added": true
+                },
+                "edge": {
+                  "version_added": true
+                },
+                "edge_mobile": {
+                  "version_added": true
+                },
+                "firefox": {
+                  "version_added": true
+                },
+                "firefox_android": {
+                  "version_added": true
+                },
+                "ie": {
+                  "version_added": true
+                },
+                "ie_mobile": {
+                  "version_added": true
+                },
+                "opera": {
+                  "version_added": true
+                },
+                "opera_android": {
+                  "version_added": true
+                },
+                "safari": {
+                  "version_added": true
+                },
+                "safari_ios": {
+                  "version_added": true
+                },
+                "servo": {
+                  "version_added": true
+                }
+              },
+              "status": {
+                "experimental": false,
+                "standard_track": true,
+                "obsolete": false
+              }
+            }
+          }
+        }
       }
     }
   }
diff --git a/http/headers/content-security-policy-report-only.json b/http/headers/content-security-policy-report-only.json
index a2ff9a0bbf33d..41e7b6107ecff 100644
--- a/http/headers/content-security-policy-report-only.json
+++ b/http/headers/content-security-policy-report-only.json
@@ -1,53 +1,64 @@
 {
-  "Content-Security-Policy-Report-Only": {
-    "Basic support": {
-      "Android": {
-        "support": "4.4"
-      },
-      "Chrome": {
-        "support": "25"
-      },
-      "Chrome for Android": {
-        "support": true
-      },
-      "Edge": {
-        "support": "14"
-      },
-      "Edge Mobile": {
-        "support": true
-      },
-      "Firefox": {
-        "support": "23.0"
-      },
-      "Firefox for Android": {
-        "support": "23.0"
-      },
-      "Internet Explorer": {
-        "support": "10"
-      },
-      "IE Mobile": {
-        "support": null
-      },
-      "Opera": {
-        "support": "15"
-      },
-      "Opera Mobile": {
-        "support": null
-      },
-      "Safari": {
-        "support": "7"
-      },
-      "Safari Mobile": {
-        "support": "7.1"
-      },
-      "Servo": {
-        "support": null
-      },
-      "status": {
-        "experimental": false,
-        "standardized": true,
-        "stable": true,
-        "obsolete": false
+  "version": "1.0.0",
+  "data": {
+    "http": {
+      "headers": {
+        "Content-Security-Policy-Report-Only": {
+          "__compat": {
+            "basic_support": {
+              "desc": "Basic support",
+              "support": {
+                "webview_android": {
+                  "version_added": "4.4"
+                },
+                "chrome": {
+                  "version_added": "25"
+                },
+                "chrome_android": {
+                  "version_added": true
+                },
+                "edge": {
+                  "version_added": "14"
+                },
+                "edge_mobile": {
+                  "version_added": true
+                },
+                "firefox": {
+                  "version_added": "23.0"
+                },
+                "firefox_android": {
+                  "version_added": "23.0"
+                },
+                "ie": {
+                  "version_added": "10"
+                },
+                "ie_mobile": {
+                  "version_added": null
+                },
+                "opera": {
+                  "version_added": "15"
+                },
+                "opera_android": {
+                  "version_added": null
+                },
+                "safari": {
+                  "version_added": "7"
+                },
+                "safari_ios": {
+                  "version_added": "7.1"
+                },
+                "servo": {
+                  "version_added": null
+                }
+              },
+              "status": {
+                "experimental": false,
+                "standard_track": true,
+                "obsolete": false
+              }
+            }
+          }
+        }
       }
     }
   }
diff --git a/http/headers/content-security-policy.json b/http/headers/content-security-policy.json
index 1984fcafbe412..98a98971ac631 100644
--- a/http/headers/content-security-policy.json
+++ b/http/headers/content-security-policy.json
@@ -1,1521 +1,1639 @@
 {
-  "Content-Security-Policy": {
-    "Basic support": {
-      "Android": {
-        "support": "4.4"
-      },
-      "Chrome": {
-        "support": "25",
-        "notes": ["Implemented as X-Webkit-CSP header in Chrome 14."]
-      },
-      "Chrome for Android": {
-        "support": true
-      },
-      "Edge": {
-        "support": "14"
-      },
-      "Edge Mobile": {
-        "support": true
-      },
-      "Firefox": {
-        "support": "23.0",
-        "notes": ["Implemented as X-Content-Security-Policy header in Firefox 4."]
-      },
-      "Firefox for Android": {
-        "support": "23.0"
-      },
-      "Internet Explorer": {
-        "support": "10",
-        "notes": ["Implemented as X-Content-Security-Policy header, only supporting 'sandbox' directive."]
-      },
-      "IE Mobile": {
-        "support": null
-      },
-      "Opera": {
-        "support": "15"
-      },
-      "Opera Mobile": {
-        "support": null
-      },
-      "Safari": {
-        "support": "7",
-        "notes": ["Implemented as X-Webkit-CSP header in Safari 6."]
-      },
-      "Safari Mobile": {
-        "support": "7.1",
-        "notes": ["Implemented as X-Webkit-CSP header in iOS 5.1."]
-      },
-      "Servo": {
-        "support": null
-      },
-      "status": {
-        "experimental": false,
-        "standardized": true,
-        "stable": true,
-        "obsolete": false
-      }
-    },
-    "Meta element support": {
-      "Android": {
-        "support": true
-      },
-      "Chrome": {
-        "support": true
-      },
-      "Chrome for Android": {
-        "support": true
-      },
-      "Edge": {
-        "support": true
-      },
-      "Edge Mobile": {
-        "support": true
-      },
-      "Firefox": {
-        "support": "45.0"
-      },
-      "Firefox for Android": {
-        "support": "45.0"
-      },
-      "Internet Explorer": {
-        "support": false
-      },
-      "IE Mobile": {
-        "support": false
-      },
-      "Opera": {
-        "support": true
-      },
-      "Opera Mobile": {
-        "support": true
-      },
-      "Safari": {
-        "support": true
-      },
-      "Safari Mobile": {
-        "support": true
-      },
-      "Servo": {
-        "support": null
-      },
-      "status": {
-        "experimental": false,
-        "standardized": true,
-        "stable": true,
-        "obsolete": false
-      }
-    },
-    "Worker support": {
-      "Android": {
-        "support": null
-      },
-      "Chrome": {
-        "support": true
-      },
-      "Chrome for Android": {
-        "support": true
-      },
-      "Edge": {
-        "support": true
-      },
-      "Edge Mobile": {
-        "support": true
-      },
-      "Firefox": {
-        "support": "50.0"
-      },
-      "Firefox for Android": {
-        "support": "50.0"
-      },
-      "Internet Explorer": {
-        "support": false
-      },
-      "IE Mobile": {
-        "support": false
-      },
-      "Opera": {
-        "support": null
-      },
-      "Opera Mobile": {
-        "support": null
-      },
-      "Safari": {
-        "support": false
-      },
-      "Safari Mobile": {
-        "support": false
-      },
-      "Servo": {
-        "support": null
-      },
-      "status": {
-        "experimental": false,
-        "standardized": true,
-        "stable": true,
-        "obsolete": false
-      }
-    }
-  },
-  "base-uri": {
-    "Basic support": {
-      "Android": {
-        "support": null
-      },
-      "Chrome": {
-        "support": "40"
-      },
-      "Chrome for Android": {
-        "support": true
-      },
-      "Edge": {
-        "support": false
-      },
-      "Edge Mobile": {
-        "support": false
-      },
-      "Firefox": {
-        "support": "35.0"
-      },
-      "Firefox for Android": {
-        "support": "35.0"
-      },
-      "Internet Explorer": {
-        "support": false
-      },
-      "IE Mobile": {
-        "support": false
-      },
-      "Opera": {
-        "support": "27"
-      },
-      "Opera Mobile": {
-        "support": null
-      },
-      "Safari": {
-        "support": "10"
-      },
-      "Safari Mobile": {
-        "support": "9.3"
-      },
-      "Servo": {
-        "support": null
-      },
-      "status": {
-        "experimental": false,
-        "standardized": true,
-        "stable": true,
-        "obsolete": false
-      }
-    }
-  },
-  "block-all-mixed-content": {
-    "Basic support": {
-      "Android": {
-        "support": null
-      },
-      "Chrome": {
-        "support": true
-      },
-      "Chrome for Android": {
-        "support": true
-      },
-      "Edge": {
-        "support": null
-      },
-      "Edge Mobile": {
-        "support": null
-      },
-      "Firefox": {
-        "support": "48.0"
-      },
-      "Firefox for Android": {
-        "support": "48.0"
-      },
-      "Internet Explorer": {
-        "support": false
-      },
-      "IE Mobile": {
-        "support": false
-      },
-      "Opera": {
-        "support": true
-      },
-      "Opera Mobile": {
-        "support": null
-      },
-      "Safari": {
-        "support": null
-      },
-      "Safari Mobile": {
-        "support": null
-      },
-      "Servo": {
-        "support": null
-      },
-      "status": {
-        "experimental": false,
-        "standardized": true,
-        "stable": true,
-        "obsolete": false
-      }
-    }
-  },
-  "child-src": {
-    "Basic support": {
-      "Android": {
-        "support": null
-      },
-      "Chrome": {
-        "support": "40"
-      },
-      "Chrome for Android": {
-        "support": true
-      },
-      "Edge": {
-        "support": false
-      },
-      "Edge Mobile": {
-        "support": false
-      },
-      "Firefox": {
-        "support": "45.0"
-      },
-      "Firefox for Android": {
-        "support": "45.0"
-      },
-      "Internet Explorer": {
-        "support": false
-      },
-      "IE Mobile": {
-        "support": false
-      },
-      "Opera": {
-        "support": "27"
-      },
-      "Opera Mobile": {
-        "support": null
-      },
-      "Safari": {
-        "support": "10"
-      },
-      "Safari Mobile": {
-        "support": "9.3"
-      },
-      "Servo": {
-        "support": null
-      },
-      "status": {
-        "experimental": false,
-        "standardized": true,
-        "stable": true,
-        "obsolete": false
-      }
-    }
-  },
-  "connect-src": {
-    "Basic support": {
-      "Android": {
-        "support": "4.4"
-      },
-      "Chrome": {
-        "support": "25"
-      },
-      "Chrome for Android": {
-        "support": true
-      },
-      "Edge": {
-        "support": "14"
-      },
-      "Edge Mobile": {
-        "support": true
-      },
-      "Firefox": {
-        "support": "23.0",
-        "notes": ["Prior to Firefox 50, ping attributes of &lt;a&gt; elements weren't covered by connect-src."]
-      },
-      "Firefox for Android": {
-        "support": "23.0"
-      },
-      "Internet Explorer": {
-        "support": false
-      },
-      "IE Mobile": {
-        "support": false
-      },
-      "Opera": {
-        "support": "15"
-      },
-      "Opera Mobile": {
-        "support": null
-      },
-      "Safari": {
-        "support": "7"
-      },
-      "Safari Mobile": {
-        "support": "7.1"
-      },
-      "Servo": {
-        "support": null
-      },
-      "status": {
-        "experimental": false,
-        "standardized": true,
-        "stable": true,
-        "obsolete": false
-      }
-    }
-  },
-  "default-src": {
-    "Basic support": {
-      "Android": {
-        "support": "4.4"
-      },
-      "Chrome": {
-        "support": "25"
-      },
-      "Chrome for Android": {
-        "support": true
-      },
-      "Edge": {
-        "support": "14"
-      },
-      "Edge Mobile": {
-        "support": true
-      },
-      "Firefox": {
-        "support": "23.0"
-      },
-      "Firefox for Android": {
-        "support": "23.0"
-      },
-      "Internet Explorer": {
-        "support": false
-      },
-      "IE Mobile": {
-        "support": false
-      },
-      "Opera": {
-        "support": "15"
-      },
-      "Opera Mobile": {
-        "support": null
-      },
-      "Safari": {
-        "support": "7"
-      },
-      "Safari Mobile": {
-        "support": "7.1"
-      },
-      "Servo": {
-        "support": null
-      },
-      "status": {
-        "experimental": false,
-        "standardized": true,
-        "stable": true,
-        "obsolete": false
-      }
-    }
-  },
-  "disown-opener": {
-    "Basic support": {
-      "Android": {
-        "support": false
-      },
-      "Chrome": {
-        "support": false
-      },
-      "Chrome for Android": {
-        "support": false
-      },
-      "Edge": {
-        "support": false
-      },
-      "Edge Mobile": {
-        "support": false
-      },
-      "Firefox": {
-        "support": false
-      },
-      "Firefox for Android": {
-        "support": false
-      },
-      "Internet Explorer": {
-        "support": false
-      },
-      "IE Mobile": {
-        "support": false
-      },
-      "Opera": {
-        "support": false
-      },
-      "Opera Mobile": {
-        "support": false
-      },
-      "Safari": {
-        "support": false
-      },
-      "Safari Mobile": {
-        "support": false
-      },
-      "Servo": {
-        "support": null
-      },
-      "status": {
-        "experimental": true,
-        "standardized": true,
-        "stable": true,
-        "obsolete": false
-      }
-    }
-  },
-  "font-src": {
-    "Basic support": {
-      "Android": {
-        "support": "4.4"
-      },
-      "Chrome": {
-        "support": "25"
-      },
-      "Chrome for Android": {
-        "support": true
-      },
-      "Edge": {
-        "support": "14"
-      },
-      "Edge Mobile": {
-        "support": true
-      },
-      "Firefox": {
-        "support": "23.0"
-      },
-      "Firefox for Android": {
-        "support": "23.0"
-      },
-      "Internet Explorer": {
-        "support": false
-      },
-      "IE Mobile": {
-        "support": false
-      },
-      "Opera": {
-        "support": "15"
-      },
-      "Opera Mobile": {
-        "support": null
-      },
-      "Safari": {
-        "support": "7"
-      },
-      "Safari Mobile": {
-        "support": "7.1"
-      },
-      "Servo": {
-        "support": null
-      },
-      "status": {
-        "experimental": false,
-        "standardized": true,
-        "stable": true,
-        "obsolete": false
-      }
-    }
-  },
-  "form-action": {
-    "Basic support": {
-      "Android": {
-        "support": null
-      },
-      "Chrome": {
-        "support": "40"
-      },
-      "Chrome for Android": {
-        "support": true
-      },
-      "Edge": {
-        "support": false
-      },
-      "Edge Mobile": {
-        "support": false
-      },
-      "Firefox": {
-        "support": "36.0"
-      },
-      "Firefox for Android": {
-        "support": "36.0"
-      },
-      "Internet Explorer": {
-        "support": false
-      },
-      "IE Mobile": {
-        "support": false
-      },
-      "Opera": {
-        "support": "27"
-      },
-      "Opera Mobile": {
-        "support": null
-      },
-      "Safari": {
-        "support": "10"
-      },
-      "Safari Mobile": {
-        "support": "9.3"
-      },
-      "Servo": {
-        "support": null
-      },
-      "status": {
-        "experimental": false,
-        "standardized": true,
-        "stable": true,
-        "obsolete": false
-      }
-    }
-  },
-  "frame-ancestors": {
-    "Basic support": {
-      "Android": {
-        "support": null
-      },
-      "Chrome": {
-        "support": "40"
-      },
-      "Chrome for Android": {
-        "support": true
-      },
-      "Edge": {
-        "support": false
-      },
-      "Edge Mobile": {
-        "support": false
-      },
-      "Firefox": {
-        "support": "33.0"
-      },
-      "Firefox for Android": {
-        "support": "33.0"
-      },
-      "Internet Explorer": {
-        "support": false
-      },
-      "IE Mobile": {
-        "support": false
-      },
-      "Opera": {
-        "support": "26"
-      },
-      "Opera Mobile": {
-        "support": null
-      },
-      "Safari": {
-        "support": "10"
-      },
-      "Safari Mobile": {
-        "support": "9.3"
-      },
-      "Servo": {
-        "support": null
-      },
-      "status": {
-        "experimental": false,
-        "standardized": true,
-        "stable": true,
-        "obsolete": false
-      }
-    }
-  },
-  "frame-src": {
-    "Basic support": {
-      "Android": {
-        "support": "4.4"
-      },
-      "Chrome": {
-        "support": "25"
-      },
-      "Chrome for Android": {
-        "support": true
-      },
-      "Edge": {
-        "support": "14"
-      },
-      "Edge Mobile": {
-        "support": true
-      },
-      "Firefox": {
-        "support": "23.0"
-      },
-      "Firefox for Android": {
-        "support": "23.0"
-      },
-      "Internet Explorer": {
-        "support": false
-      },
-      "IE Mobile": {
-        "support": false
-      },
-      "Opera": {
-        "support": "15"
-      },
-      "Opera Mobile": {
-        "support": null
-      },
-      "Safari": {
-        "support": "7"
-      },
-      "Safari Mobile": {
-        "support": "7.1"
-      },
-      "Servo": {
-        "support": null
-      },
-      "status": {
-        "experimental": false,
-        "standardized": true,
-        "stable": true,
-        "obsolete": false
-      }
-    }
-  },
-  "img-src": {
-    "Basic support": {
-      "Android": {
-        "support": "4.4"
-      },
-      "Chrome": {
-        "support": "25"
-      },
-      "Chrome for Android": {
-        "support": true
-      },
-      "Edge": {
-        "support": "14"
-      },
-      "Edge Mobile": {
-        "support": true
-      },
-      "Firefox": {
-        "support": "23.0"
-      },
-      "Firefox for Android": {
-        "support": "23.0"
-      },
-      "Internet Explorer": {
-        "support": false
-      },
-      "IE Mobile": {
-        "support": false
-      },
-      "Opera": {
-        "support": "15"
-      },
-      "Opera Mobile": {
-        "support": null
-      },
-      "Safari": {
-        "support": "7"
-      },
-      "Safari Mobile": {
-        "support": "7.1"
-      },
-      "Servo": {
-        "support": null
-      },
-      "status": {
-        "experimental": false,
-        "standardized": true,
-        "stable": true,
-        "obsolete": false
-      }
-    }
-  },
-  "manifest-src": {
-    "Basic support": {
-      "Android": {
-        "support": null
-      },
-      "Chrome": {
-        "support": true
-      },
-      "Chrome for Android": {
-        "support": true
-      },
-      "Edge": {
-        "support": false
-      },
-      "Edge Mobile": {
-        "support": false
-      },
-      "Firefox": {
-        "support": "41.0"
-      },
-      "Firefox for Android": {
-        "support": "41.0"
-      },
-      "Internet Explorer": {
-        "support": false
-      },
-      "IE Mobile": {
-        "support": false
-      },
-      "Opera": {
-        "support": true
-      },
-      "Opera Mobile": {
-        "support": null
-      },
-      "Safari": {
-        "support": false
-      },
-      "Safari Mobile": {
-        "support": false
-      },
-      "Servo": {
-        "support": null
-      },
-      "status": {
-        "experimental": false,
-        "standardized": true,
-        "stable": true,
-        "obsolete": false
-      }
-    }
-  },
-  "media-src": {
-    "Basic support": {
-      "Android": {
-        "support": "4.4"
-      },
-      "Chrome": {
-        "support": "25"
-      },
-      "Chrome for Android": {
-        "support": true
-      },
-      "Edge": {
-        "support": "14"
-      },
-      "Edge Mobile": {
-        "support": true
-      },
-      "Firefox": {
-        "support": "23.0"
-      },
-      "Firefox for Android": {
-        "support": "23.0"
-      },
-      "Internet Explorer": {
-        "support": false
-      },
-      "IE Mobile": {
-        "support": false
-      },
-      "Opera": {
-        "support": "15"
-      },
-      "Opera Mobile": {
-        "support": null
-      },
-      "Safari": {
-        "support": "7"
-      },
-      "Safari Mobile": {
-        "support": "7.1"
-      },
-      "Servo": {
-        "support": null
-      },
-      "status": {
-        "experimental": false,
-        "standardized": true,
-        "stable": true,
-        "obsolete": false
-      }
-    }
-  },
-  "navigation-to": {
-    "Basic support": {
-      "Android": {
-        "support": false
-      },
-      "Chrome": {
-        "support": false
-      },
-      "Chrome for Android": {
-        "support": false
-      },
-      "Edge": {
-        "support": false
-      },
-      "Edge Mobile": {
-        "support": false
-      },
-      "Firefox": {
-        "support": false
-      },
-      "Firefox for Android": {
-        "support": false
-      },
-      "Internet Explorer": {
-        "support": false
-      },
-      "IE Mobile": {
-        "support": false
-      },
-      "Opera": {
-        "support": false
-      },
-      "Opera Mobile": {
-        "support": false
-      },
-      "Safari": {
-        "support": false
-      },
-      "Safari Mobile": {
-        "support": false
-      },
-      "Servo": {
-        "support": null
-      },
-      "status": {
-        "experimental": true,
-        "standardized": true,
-        "stable": true,
-        "obsolete": false
-      }
-    }
-  },
-  "object-src": {
-    "Basic support": {
-      "Android": {
-        "support": "4.4"
-      },
-      "Chrome": {
-        "support": "25"
-      },
-      "Chrome for Android": {
-        "support": true
-      },
-      "Edge": {
-        "support": "14"
-      },
-      "Edge Mobile": {
-        "support": true
-      },
-      "Firefox": {
-        "support": "23.0"
-      },
-      "Firefox for Android": {
-        "support": "23.0"
-      },
-      "Internet Explorer": {
-        "support": false
-      },
-      "IE Mobile": {
-        "support": false
-      },
-      "Opera": {
-        "support": "15"
-      },
-      "Opera Mobile": {
-        "support": null
-      },
-      "Safari": {
-        "support": "7"
-      },
-      "Safari Mobile": {
-        "support": "7.1"
-      },
-      "Servo": {
-        "support": null
-      },
-      "status": {
-        "experimental": false,
-        "standardized": true,
-        "stable": true,
-        "obsolete": false
-      }
-    }
-  },
-  "plugin-types": {
-    "Basic support": {
-      "Android": {
-        "support": null
-      },
-      "Chrome": {
-        "support": "40"
-      },
-      "Chrome for Android": {
-        "support": true
-      },
-      "Edge": {
-        "support": false
-      },
-      "Edge Mobile": {
-        "support": false
-      },
-      "Firefox": {
-        "support": false,
-        "notes": ["See <a href=\"https://bugzilla.mozilla.org/show_bug.cgi?id=1045899\">Bugzilla bug 1045899</a>."]
-      },
-      "Firefox for Android": {
-        "support": false
-      },
-      "Internet Explorer": {
-        "support": false
-      },
-      "IE Mobile": {
-        "support": false
-      },
-      "Opera": {
-        "support": "27"
-      },
-      "Opera Mobile": {
-        "support": null
-      },
-      "Safari": {
-        "support": "10"
-      },
-      "Safari Mobile": {
-        "support": "9.3"
-      },
-      "Servo": {
-        "support": null
-      },
-      "status": {
-        "experimental": false,
-        "standardized": true,
-        "stable": true,
-        "obsolete": false
-      }
-    }
-  },
-  "referrer": {
-    "Basic support": {
-      "Android": {
-        "support": false
-      },
-      "Android Webview": {
-        "support": false,
-        "notes": ["Removed in 56."]
-      },
-      "Chrome": {
-        "support": false,
-        "notes": ["Removed in 56."]
-      },
-      "Chrome for Android": {
-        "support": false,
-        "notes": ["Removed in 56."]
-      },
-      "Edge": {
-        "support": false
-      },
-      "Edge Mobile": {
-        "support": false
-      },
-      "Firefox": {
-        "support": "37.0",
-        "notes": ["Will be removed, see <a href=\"https://bugzilla.mozilla.org/show_bug.cgi?id=1302449\">Bugzilla bug 1302449</a>."]
-      },
-      "Firefox for Android": {
-        "support": "37.0"
-      },
-      "Internet Explorer": {
-        "support": false
-      },
-      "IE Mobile": {
-        "support": false
-      },
-      "Opera": {
-        "support": false
-      },
-      "Opera Mobile": {
-        "support": false
-      },
-      "Safari": {
-        "support": false
-      },
-      "Safari Mobile": {
-        "support": false
-      },
-      "Servo": {
-        "support": null
-      },
-      "status": {
-        "experimental": false,
-        "standardized": false,
-        "stable": false,
-        "obsolete": true
-      }
-    }
-  },
-  "report-to": {
-    "Basic support": {
-      "Android": {
-        "support": false
-      },
-      "Chrome": {
-        "support": false
-      },
-      "Chrome for Android": {
-        "support": false
-      },
-      "Edge": {
-        "support": false
-      },
-      "Edge Mobile": {
-        "support": false
-      },
-      "Firefox": {
-        "support": false
-      },
-      "Firefox for Android": {
-        "support": false
-      },
-      "Internet Explorer": {
-        "support": false
-      },
-      "IE Mobile": {
-        "support": false
-      },
-      "Opera": {
-        "support": false
-      },
-      "Opera Mobile": {
-        "support": false
-      },
-      "Safari": {
-        "support": false
-      },
-      "Safari Mobile": {
-        "support": false
-      },
-      "Servo": {
-        "support": null
-      },
-      "status": {
-        "experimental": false,
-        "standardized": true,
-        "stable": true,
-        "obsolete": false
-      }
-    }
-  },
-  "report-uri": {
-    "Basic support": {
-      "Android": {
-        "support": "4.4"
-      },
-      "Chrome": {
-        "support": "25"
-      },
-      "Chrome for Android": {
-        "support": true
-      },
-      "Edge": {
-        "support": "14"
-      },
-      "Edge Mobile": {
-        "support": true
-      },
-      "Firefox": {
-        "support": "23.0"
-      },
-      "Firefox for Android": {
-        "support": "23.0"
-      },
-      "Internet Explorer": {
-        "support": false
-      },
-      "IE Mobile": {
-        "support": false
-      },
-      "Opera": {
-        "support": "15"
-      },
-      "Opera Mobile": {
-        "support": null
-      },
-      "Safari": {
-        "support": "7"
-      },
-      "Safari Mobile": {
-        "support": "7.1"
-      },
-      "Servo": {
-        "support": null
-      },
-      "status": {
-        "experimental": false,
-        "standardized": true,
-        "stable": false,
-        "obsolete": true
-      }
-    }
-  },
-  "require-sri-for": {
-    "Basic support": {
-      "Android": {
-        "support": false
-      },
-      "Chrome": {
-        "support": false
-      },
-      "Chrome for Android": {
-        "support": false
-      },
-      "Edge": {
-        "support": false
-      },
-      "Edge Mobile": {
-        "support": false
-      },
-      "Firefox": {
-        "support": "49.0"
-      },
-      "Firefox for Android": {
-        "support": "49.0"
-      },
-      "Internet Explorer": {
-        "support": false
-      },
-      "IE Mobile": {
-        "support": false
-      },
-      "Opera": {
-        "support": false
-      },
-      "Opera Mobile": {
-        "support": false
-      },
-      "Safari": {
-        "support": false
-      },
-      "Safari Mobile": {
-        "support": false
-      },
-      "Servo": {
-        "support": null
-      },
-      "status": {
-        "experimental": true,
-        "standardized": true,
-        "stable": true,
-        "obsolete": false
-      }
-    }
-  },
-  "sandbox": {
-    "Basic support": {
-      "Android": {
-        "support": "4.4"
-      },
-      "Chrome": {
-        "support": "25"
-      },
-      "Chrome for Android": {
-        "support": true
-      },
-      "Edge": {
-        "support": "14"
-      },
-      "Edge Mobile": {
-        "support": true
-      },
-      "Firefox": {
-        "support": "50.0"
-      },
-      "Firefox for Android": {
-        "support": "50.0"
-      },
-      "Internet Explorer": {
-        "support": "10"
-      },
-      "IE Mobile": {
-        "support": "10"
-      },
-      "Opera": {
-        "support": "15"
-      },
-      "Opera Mobile": {
-        "support": null
-      },
-      "Safari": {
-        "support": "7"
-      },
-      "Safari Mobile": {
-        "support": "7.1"
-      },
-      "Servo": {
-        "support": null
-      },
-      "status": {
-        "experimental": false,
-        "standardized": true,
-        "stable": true,
-        "obsolete": false
-      }
-    }
-  },
-  "script-src": {
-    "Basic support": {
-      "Android": {
-        "support": "4.4"
-      },
-      "Chrome": {
-        "support": "25"
-      },
-      "Chrome for Android": {
-        "support": true
-      },
-      "Edge": {
-        "support": "14"
-      },
-      "Edge Mobile": {
-        "support": true
-      },
-      "Firefox": {
-        "support": "23.0"
-      },
-      "Firefox for Android": {
-        "support": "23.0"
-      },
-      "Internet Explorer": {
-        "support": false
-      },
-      "IE Mobile": {
-        "support": false
-      },
-      "Opera": {
-        "support": "15"
-      },
-      "Opera Mobile": {
-        "support": null
-      },
-      "Safari": {
-        "support": "7"
-      },
-      "Safari Mobile": {
-        "support": "7.1"
-      },
-      "Servo": {
-        "support": null
-      },
-      "status": {
-        "experimental": false,
-        "standardized": true,
-        "stable": true,
-        "obsolete": false
-      }
-    }
-  },
-  "strict-dynamic": {
-    "Basic support": {
-      "Android": {
-        "support": null
-      },
-      "Chrome": {
-        "support": "52"
-      },
-      "Chrome for Android": {
-        "support": "52"
-      },
-      "Edge": {
-        "support": false
-      },
-      "Edge Mobile": {
-        "support": false
-      },
-      "Firefox": {
-        "support": "52.0"
-      },
-      "Firefox for Android": {
-        "support": false
-      },
-      "Internet Explorer": {
-        "support": false
-      },
-      "IE Mobile": {
-        "support": false
-      },
-      "Opera": {
-        "support": false
-      },
-      "Opera Mobile": {
-        "support": false
-      },
-      "Safari": {
-        "support": false
-      },
-      "Safari Mobile": {
-        "support": false
-      },
-      "Servo": {
-        "support": null
-      },
-      "status": {
-        "experimental": false,
-        "standardized": true,
-        "stable": true,
-        "obsolete": false
-      }
-    }
-  },
-  "style-src": {
-    "Basic support": {
-      "Android": {
-        "support": "4.4"
-      },
-      "Chrome": {
-        "support": "25"
-      },
-      "Chrome for Android": {
-        "support": true
-      },
-      "Edge": {
-        "support": "14"
-      },
-      "Edge Mobile": {
-        "support": true
-      },
-      "Firefox": {
-        "support": "23.0"
-      },
-      "Firefox for Android": {
-        "support": "23.0"
-      },
-      "Internet Explorer": {
-        "support": false
-      },
-      "IE Mobile": {
-        "support": false
-      },
-      "Opera": {
-        "support": "15"
-      },
-      "Opera Mobile": {
-        "support": null
-      },
-      "Safari": {
-        "support": "7"
-      },
-      "Safari Mobile": {
-        "support": "7.1"
-      },
-      "Servo": {
-        "support": null
-      },
-      "status": {
-        "experimental": false,
-        "standardized": true,
-        "stable": true,
-        "obsolete": false
-      }
-    }
-  },
-  "upgrade-unsecure-requests": {
-    "Basic support": {
-      "Android": {
-        "support": null
-      },
-      "Chrome": {
-        "support": "43"
-      },
-      "Chrome for Android": {
-        "support": "43"
-      },
-      "Edge": {
-        "support": false,
-        "notes":["<a href=\"https://developer.microsoft.com/en-us/microsoft-edge/platform/status/cspupgradeinsecurerequestsdirective\">Under consideration</a> for future release."]
-      },
-      "Edge Mobile": {
-        "support": false
-      },
-      "Firefox": {
-        "support": "42.0"
-      },
-      "Firefox for Android": {
-        "support": "42.0"
-      },
-      "Internet Explorer": {
-        "support": false
-      },
-      "IE Mobile": {
-        "support": false
-      },
-      "Opera": {
-        "support": "30"
-      },
-      "Opera Mobile": {
-        "support": null
-      },
-      "Safari": {
-        "support": false
-      },
-      "Safari Mobile": {
-        "support": false
-      },
-      "Servo": {
-        "support": null
-      },
-      "status": {
-        "experimental": false,
-        "standardized": true,
-        "stable": true,
-        "obsolete": false
-      }
-    }
-  },
-  "worker-src": {
-    "Basic support": {
-      "Android": {
-        "support": null
-      },
-      "Chrome": {
-        "support": "56"
-      },
-      "Chrome for Android": {
-        "support": null
-      },
-      "Edge": {
-        "support": false
-      },
-      "Edge Mobile": {
-        "support": false
-      },
-      "Firefox": {
-        "support": false,
-        "notes": ["See <a href=\"https://bugzilla.mozilla.org/show_bug.cgi?id=1302667\">Bugzilla bug 1302667</a>."]
-      },
-      "Firefox for Android": {
-        "support": false
-      },
-      "Internet Explorer": {
-        "support": false
-      },
-      "IE Mobile": {
-        "support": false
-      },
-      "Opera": {
-        "support": false
-      },
-      "Opera Mobile": {
-        "support": false
-      },
-      "Safari": {
-        "support": false
-      },
-      "Safari Mobile": {
-        "support": false
-      },
-      "Servo": {
-        "support": null
-      },
-      "status": {
-        "experimental": false,
-        "standardized": true,
-        "stable": true,
-        "obsolete": false
+  "version": "1.0.0",
+  "data": {
+    "http": {
+      "headers": {
+        "Content-Security-Policy": {
+          "__compat": {
+            "basic_support": {
+              "desc": "Basic support",
+              "status": {
+                "webview_android": {
+                  "version_added": "4.4"
+                },
+                "chrome": {
+                  "version_added": "25",
+                  "notes": ["Implemented as X-Webkit-CSP header in Chrome 14."]
+                },
+                "chrome_android": {
+                  "version_added": true
+                },
+                "edge": {
+                  "version_added": "14"
+                },
+                "edge_mobile": {
+                  "version_added": true
+                },
+                "firefox": {
+                  "version_added": "23.0",
+                  "notes": ["Implemented as X-Content-Security-Policy header in Firefox 4."]
+                },
+                "firefox_android": {
+                  "version_added": "23.0"
+                },
+                "ie": {
+                  "version_added": "10",
+                  "notes": ["Implemented as X-Content-Security-Policy header, only supporting 'sandbox' directive."]
+                },
+                "ie_mobile": {
+                  "version_added": null
+                },
+                "opera": {
+                  "version_added": "15"
+                },
+                "opera_android": {
+                  "version_added": null
+                },
+                "safari": {
+                  "version_added": "7",
+                  "notes": ["Implemented as X-Webkit-CSP header in Safari 6."]
+                },
+                "safari_ios": {
+                  "version_added": "7.1",
+                  "notes": ["Implemented as X-Webkit-CSP header in iOS 5.1."]
+                },
+                "servo": {
+                  "version_added": null
+                }
+              },
+              "status": {
+                "experimental": false,
+                "standard_track": true,
+                "obsolete": false
+              }
+            },
+            "meta-element-support": {
+              "desc": "<code>&lt;meta&gt;</code> element support",
+              "status": {
+                "webview_android": {
+                  "version_added": true
+                },
+                "chrome": {
+                  "version_added": true
+                },
+                "chrome_android": {
+                  "version_added": true
+                },
+                "edge": {
+                  "version_added": true
+                },
+                "edge_mobile": {
+                  "version_added": true
+                },
+                "firefox": {
+                  "version_added": "45.0"
+                },
+                "firefox_android": {
+                  "version_added": "45.0"
+                },
+                "ie": {
+                  "version_added": false
+                },
+                "ie_mobile": {
+                  "version_added": false
+                },
+                "opera": {
+                  "version_added": true
+                },
+                "opera_android": {
+                  "version_added": true
+                },
+                "safari": {
+                  "version_added": true
+                },
+                "safari_ios": {
+                  "version_added": true
+                },
+                "servo": {
+                  "version_added": null
+                }
+              },
+              "status": {
+                "experimental": false,
+                "standard_track": true,
+                "obsolete": false
+              }
+            },
+            "worker_support": {
+              "desc": "Worker support",
+              "status": {
+                "webview_android": {
+                  "version_added": null
+                },
+                "chrome": {
+                  "version_added": true
+                },
+                "chrome_android": {
+                  "version_added": true
+                },
+                "edge": {
+                  "version_added": null
+                },
+                "edge_mobile": {
+                  "version_added": null
+                },
+                "firefox": {
+                  "version_added": "50.0"
+                },
+                "firefox_android": {
+                  "version_added": "50.0"
+                },
+                "ie": {
+                  "version_added": false
+                },
+                "ie_mobile": {
+                  "version_added": false
+                },
+                "opera": {
+                  "version_added": null
+                },
+                "opera_android": {
+                  "version_added": null
+                },
+                "safari": {
+                  "version_added": false
+                },
+                "safari_ios": {
+                  "version_added": false
+                },
+                "servo": {
+                  "version_added": null
+                }
+              },
+              "status": {
+                "experimental": false,
+                "standard_track": true,
+                "obsolete": false
+              }
+            }
+          }
+        },
+        "base-uri": {
+          "__compat": {
+            "basic_support": {
+              "desc": "Basic support",
+              "status": {
+                "webview_android": {
+                  "version_added": null
+                },
+                "chrome": {
+                  "version_added": "40"
+                },
+                "chrome_android": {
+                  "version_added": true
+                },
+                "edge": {
+                  "version_added": false
+                },
+                "edge_mobile": {
+                  "version_added": false
+                },
+                "firefox": {
+                  "version_added": "35.0"
+                },
+                "firefox_android": {
+                  "version_added": "35.0"
+                },
+                "ie": {
+                  "version_added": false
+                },
+                "ie_mobile": {
+                  "version_added": false
+                },
+                "opera": {
+                  "version_added": "27"
+                },
+                "opera_android": {
+                  "version_added": null
+                },
+                "safari": {
+                  "version_added": "10"
+                },
+                "safari_ios": {
+                  "version_added": "9.3"
+                },
+                "servo": {
+                  "version_added": null
+                }
+              },
+              "status": {
+                "experimental": false,
+                "standard_track": true,
+                "obsolete": false
+              }
+            }
+          }
+        },
+        "block-all-mixed-content": {
+          "__compat": {
+            "basic_support": {
+              "desc": "Basic support",
+              "status": {
+                "webview_android": {
+                  "version_added": null
+                },
+                "chrome": {
+                  "version_added": true
+                },
+                "chrome_android": {
+                  "version_added": true
+                },
+                "edge": {
+                  "version_added": null
+                },
+                "edge_mobile": {
+                  "version_added": null
+                },
+                "firefox": {
+                  "version_added": "48.0"
+                },
+                "firefox_android": {
+                  "version_added": "48.0"
+                },
+                "ie": {
+                  "version_added": false
+                },
+                "ie_mobile": {
+                  "version_added": false
+                },
+                "opera": {
+                  "version_added": true
+                },
+                "opera_android": {
+                  "version_added": null
+                },
+                "safari": {
+                  "version_added": null
+                },
+                "safari_ios": {
+                  "version_added": null
+                },
+                "servo": {
+                  "version_added": null
+                }
+              },
+              "status": {
+                "experimental": false,
+                "standard_track": true,
+                "obsolete": false
+              }
+            }
+          }
+        },
+        "child-src": {
+          "__compat": {
+            "basic_support": {
+              "desc": "Basic support",
+              "status": {
+                "webview_android": {
+                  "version_added": null
+                },
+                "chrome": {
+                  "version_added": "40"
+                },
+                "chrome_android": {
+                  "version_added": true
+                },
+                "edge": {
+                  "version_added": false
+                },
+                "edge_mobile": {
+                  "version_added": false
+                },
+                "firefox": {
+                  "version_added": "45.0"
+                },
+                "firefox_android": {
+                  "version_added": "45.0"
+                },
+                "ie": {
+                  "version_added": false
+                },
+                "ie_mobile": {
+                  "version_added": false
+                },
+                "opera": {
+                  "version_added": "27"
+                },
+                "opera_android": {
+                  "version_added": null
+                },
+                "safari": {
+                  "version_added": "10"
+                },
+                "safari_ios": {
+                  "version_added": "9.3"
+                },
+                "servo": {
+                  "version_added": null
+                }
+              },
+              "status": {
+                "experimental": false,
+                "standard_track": true,
+                "obsolete": false
+              }
+            }
+          }
+        },
+        "connect-src": {
+          "__compat": {
+            "basic_support": {
+              "desc": "Basic support",
+              "status": {
+                "webview_android": {
+                  "version_added": "4.4"
+                },
+                "chrome": {
+                  "version_added": "25"
+                },
+                "chrome_android": {
+                  "version_added": true
+                },
+                "edge": {
+                  "version_added": "14"
+                },
+                "edge_mobile": {
+                  "version_added": null
+                },
+                "firefox": {
+                  "version_added": "23.0",
+                  "notes": ["Prior to Firefox 50, ping attributes of &lt;a&gt; elements weren't covered by connect-src."]
+                },
+                "firefox_android": {
+                  "version_added": "23.0"
+                },
+                "ie": {
+                  "version_added": false
+                },
+                "ie_mobile": {
+                  "version_added": false
+                },
+                "opera": {
+                  "version_added": "15"
+                },
+                "opera_android": {
+                  "version_added": null
+                },
+                "safari": {
+                  "version_added": "7"
+                },
+                "safari_ios": {
+                  "version_added": "7.1"
+                },
+                "servo": {
+                  "version_added": null
+                }
+              },
+              "status": {
+                "experimental": false,
+                "standard_track": true,
+                "obsolete": false
+              }
+            }
+          }
+        },
+        "default-src": {
+          "__compat": {
+            "basic_support": {
+              "desc": "Basic support",
+              "status": {
+                "webview_android": {
+                  "version_added": "4.4"
+                },
+                "chrome": {
+                  "version_added": "25"
+                },
+                "chrome_android": {
+                  "version_added": true
+                },
+                "edge": {
+                  "version_added": "14"
+                },
+                "edge_mobile": {
+                  "version_added": null
+                },
+                "firefox": {
+                  "version_added": "23.0"
+                },
+                "firefox_android": {
+                  "version_added": "23.0"
+                },
+                "ie": {
+                  "version_added": false
+                },
+                "ie_mobile": {
+                  "version_added": false
+                },
+                "opera": {
+                  "version_added": "15"
+                },
+                "opera_android": {
+                  "version_added": null
+                },
+                "safari": {
+                  "version_added": "7"
+                },
+                "safari_ios": {
+                  "version_added": "7.1"
+                },
+                "servo": {
+                  "version_added": null
+                }
+              },
+              "status": {
+                "experimental": false,
+                "standard_track": true,
+                "obsolete": false
+              }
+            }
+          }
+        },
+        "disown-opener": {
+          "__compat": {
+            "basic_support": {
+              "desc": "Basic support",
+              "status": {
+                "webview_android": {
+                  "version_added": false
+                },
+                "chrome": {
+                  "version_added": false
+                },
+                "chrome_android": {
+                  "version_added": false
+                },
+                "edge": {
+                  "version_added": false
+                },
+                "edge_mobile": {
+                  "version_added": false
+                },
+                "firefox": {
+                  "version_added": false
+                },
+                "firefox_android": {
+                  "version_added": false
+                },
+                "ie": {
+                  "version_added": false
+                },
+                "ie_mobile": {
+                  "version_added": false
+                },
+                "opera": {
+                  "version_added": false
+                },
+                "opera_android": {
+                  "version_added": false
+                },
+                "safari": {
+                  "version_added": false
+                },
+                "safari_ios": {
+                  "version_added": false
+                },
+                "servo": {
+                  "version_added": null
+                }
+              },
+              "status": {
+                "experimental": true,
+                "standard_track": true,
+                "obsolete": false
+              }
+            }
+          }
+        },
+        "font-src": {
+          "__compat": {
+            "basic_support": {
+              "desc": "Basic support",
+              "status": {
+                "webview_android": {
+                  "version_added": "4.4"
+                },
+                "chrome": {
+                  "version_added": "25"
+                },
+                "chrome_android": {
+                  "version_added": true
+                },
+                "edge": {
+                  "version_added": "14"
+                },
+                "edge_mobile": {
+                  "version_added": null
+                },
+                "firefox": {
+                  "version_added": "23.0"
+                },
+                "firefox_android": {
+                  "version_added": "23.0"
+                },
+                "ie": {
+                  "version_added": false
+                },
+                "ie_mobile": {
+                  "version_added": false
+                },
+                "opera": {
+                  "version_added": "15"
+                },
+                "opera_android": {
+                  "version_added": null
+                },
+                "safari": {
+                  "version_added": "7"
+                },
+                "safari_ios": {
+                  "version_added": "7.1"
+                },
+                "servo": {
+                  "version_added": null
+                }
+              },
+              "status": {
+                "experimental": false,
+                "standard_track": true,
+                "obsolete": false
+              }
+            }
+          }
+        },
+        "form-action": {
+          "__compat": {
+            "basic_support": {
+              "desc": "Basic support",
+              "status": {
+                "webview_android": {
+                  "version_added": null
+                },
+                "chrome": {
+                  "version_added": "40"
+                },
+                "chrome_android": {
+                  "version_added": true
+                },
+                "edge": {
+                  "version_added": false
+                },
+                "edge_mobile": {
+                  "version_added": false
+                },
+                "firefox": {
+                  "version_added": "36.0"
+                },
+                "firefox_android": {
+                  "version_added": "36.0"
+                },
+                "ie": {
+                  "version_added": false
+                },
+                "ie_mobile": {
+                  "version_added": false
+                },
+                "opera": {
+                  "version_added": "27"
+                },
+                "opera_android": {
+                  "version_added": null
+                },
+                "safari": {
+                  "version_added": "10"
+                },
+                "safari_ios": {
+                  "version_added": "9.3"
+                },
+                "servo": {
+                  "version_added": null
+                }
+              },
+              "status": {
+                "experimental": false,
+                "standard_track": true,
+                "obsolete": false
+              }
+            }
+          }
+        },
+        "frame-ancestors": {
+          "__compat": {
+            "basic_support": {
+              "desc": "Basic support",
+              "status": {
+                "webview_android": {
+                  "version_added": null
+                },
+                "chrome": {
+                  "version_added": "40"
+                },
+                "chrome_android": {
+                  "version_added": true
+                },
+                "edge": {
+                  "version_added": false
+                },
+                "edge_mobile": {
+                  "version_added": false
+                },
+                "firefox": {
+                  "version_added": "33.0"
+                },
+                "firefox_android": {
+                  "version_added": "33.0"
+                },
+                "ie": {
+                  "version_added": false
+                },
+                "ie_mobile": {
+                  "version_added": false
+                },
+                "opera": {
+                  "version_added": "26"
+                },
+                "opera_android": {
+                  "version_added": null
+                },
+                "safari": {
+                  "version_added": "10"
+                },
+                "safari_ios": {
+                  "version_added": "9.3"
+                },
+                "servo": {
+                  "version_added": null
+                }
+              },
+              "status": {
+                "experimental": false,
+                "standard_track": true,
+                "obsolete": false
+              }
+            }
+          }
+        },
+        "frame-src": {
+          "__compat": {
+            "basic_support": {
+              "desc": "Basic support",
+              "status": {
+                "webview_android": {
+                  "version_added": "4.4"
+                },
+                "chrome": {
+                  "version_added": "25"
+                },
+                "chrome_android": {
+                  "version_added": true
+                },
+                "edge": {
+                  "version_added": "14"
+                },
+                "edge_mobile": {
+                  "version_added": null
+                },
+                "firefox": {
+                  "version_added": "23.0"
+                },
+                "firefox_android": {
+                  "version_added": "23.0"
+                },
+                "ie": {
+                  "version_added": false
+                },
+                "ie_mobile": {
+                  "version_added": false
+                },
+                "opera": {
+                  "version_added": "15"
+                },
+                "opera_android": {
+                  "version_added": null
+                },
+                "safari": {
+                  "version_added": "7"
+                },
+                "safari_ios": {
+                  "version_added": "7.1"
+                },
+                "servo": {
+                  "version_added": null
+                }
+              },
+              "status": {
+                "experimental": false,
+                "standard_track": true,
+                "obsolete": false
+              }
+            }
+          }
+        },
+        "img-src": {
+          "__compat": {
+            "basic_support": {
+              "desc": "Basic support",
+              "status": {
+                "webview_android": {
+                  "version_added": "4.4"
+                },
+                "chrome": {
+                  "version_added": "25"
+                },
+                "chrome_android": {
+                  "version_added": true
+                },
+                "edge": {
+                  "version_added": "14"
+                },
+                "edge_mobile": {
+                  "version_added": null
+                },
+                "firefox": {
+                  "version_added": "23.0"
+                },
+                "firefox_android": {
+                  "version_added": "23.0"
+                },
+                "ie": {
+                  "version_added": false
+                },
+                "ie_mobile": {
+                  "version_added": false
+                },
+                "opera": {
+                  "version_added": "15"
+                },
+                "opera_android": {
+                  "version_added": null
+                },
+                "safari": {
+                  "version_added": "7"
+                },
+                "safari_ios": {
+                  "version_added": "7.1"
+                },
+                "servo": {
+                  "version_added": null
+                }
+              },
+              "status": {
+                "experimental": false,
+                "standard_track": true,
+                "obsolete": false
+              }
+            }
+          }
+        },
+        "manifest-src": {
+          "__compat": {
+            "basic_support": {
+              "desc": "Basic support",
+              "status": {
+                "webview_android": {
+                  "version_added": null
+                },
+                "chrome": {
+                  "version_added": true
+                },
+                "chrome_android": {
+                  "version_added": true
+                },
+                "edge": {
+                  "version_added": false
+                },
+                "edge_mobile": {
+                  "version_added": false
+                },
+                "firefox": {
+                  "version_added": "41.0"
+                },
+                "firefox_android": {
+                  "version_added": "41.0"
+                },
+                "ie": {
+                  "version_added": false
+                },
+                "ie_mobile": {
+                  "version_added": false
+                },
+                "opera": {
+                  "version_added": true
+                },
+                "opera_android": {
+                  "version_added": null
+                },
+                "safari": {
+                  "version_added": false
+                },
+                "safari_ios": {
+                  "version_added": false
+                },
+                "servo": {
+                  "version_added": null
+                }
+              },
+              "status": {
+                "experimental": false,
+                "standard_track": true,
+                "obsolete": false
+              }
+            }
+          }
+        },
+        "media-src": {
+          "__compat": {
+            "basic_support": {
+              "desc": "Basic support",
+              "status": {
+                "webview_android": {
+                  "version_added": "4.4"
+                },
+                "chrome": {
+                  "version_added": "25"
+                },
+                "chrome_android": {
+                  "version_added": true
+                },
+                "edge": {
+                  "version_added": "14"
+                },
+                "edge_mobile": {
+                  "version_added": null
+                },
+                "firefox": {
+                  "version_added": "23.0"
+                },
+                "firefox_android": {
+                  "version_added": "23.0"
+                },
+                "ie": {
+                  "version_added": false
+                },
+                "ie_mobile": {
+                  "version_added": false
+                },
+                "opera": {
+                  "version_added": "15"
+                },
+                "opera_android": {
+                  "version_added": null
+                },
+                "safari": {
+                  "version_added": "7"
+                },
+                "safari_ios": {
+                  "version_added": "7.1"
+                },
+                "servo": {
+                  "version_added": null
+                }
+              },
+              "status": {
+                "experimental": false,
+                "standard_track": true,
+                "obsolete": false
+              }
+            }
+          }
+        },
+        "navigation-to": {
+          "__compat": {
+            "basic_support": {
+              "desc": "Basic support",
+              "status": {
+                "webview_android": {
+                  "version_added": false
+                },
+                "chrome": {
+                  "version_added": false
+                },
+                "chrome_android": {
+                  "version_added": false
+                },
+                "edge": {
+                  "version_added": false
+                },
+                "edge_mobile": {
+                  "version_added": false
+                },
+                "firefox": {
+                  "version_added": false
+                },
+                "firefox_android": {
+                  "version_added": false
+                },
+                "ie": {
+                  "version_added": false
+                },
+                "ie_mobile": {
+                  "version_added": false
+                },
+                "opera": {
+                  "version_added": false
+                },
+                "opera_android": {
+                  "version_added": false
+                },
+                "safari": {
+                  "version_added": false
+                },
+                "safari_ios": {
+                  "version_added": false
+                },
+                "servo": {
+                  "version_added": null
+                }
+              },
+              "status": {
+                "experimental": true,
+                "standard_track": true,
+                "obsolete": false
+              }
+            }
+          }
+        },
+        "object-src": {
+          "__compat": {
+            "basic_support": {
+              "desc": "Basic support",
+              "status": {
+                "webview_android": {
+                  "version_added": "4.4"
+                },
+                "chrome": {
+                  "version_added": "25"
+                },
+                "chrome_android": {
+                  "version_added": true
+                },
+                "edge": {
+                  "version_added": "14"
+                },
+                "edge_mobile": {
+                  "version_added": null
+                },
+                "firefox": {
+                  "version_added": "23.0"
+                },
+                "firefox_android": {
+                  "version_added": "23.0"
+                },
+                "ie": {
+                  "version_added": false
+                },
+                "ie_mobile": {
+                  "version_added": false
+                },
+                "opera": {
+                  "version_added": "15"
+                },
+                "opera_android": {
+                  "version_added": null
+                },
+                "safari": {
+                  "version_added": "7"
+                },
+                "safari_ios": {
+                  "version_added": "7.1"
+                },
+                "servo": {
+                  "version_added": null
+                }
+              },
+              "status": {
+                "experimental": false,
+                "standard_track": true,
+                "obsolete": false
+              }
+            }
+          }
+        },
+        "plugin-types": {
+          "__compat": {
+            "basic_support": {
+              "desc": "Basic support",
+              "status": {
+                "webview_android": {
+                  "version_added": null
+                },
+                "chrome": {
+                  "version_added": "40"
+                },
+                "chrome_android": {
+                  "version_added": true
+                },
+                "edge": {
+                  "version_added": false
+                },
+                "edge_mobile": {
+                  "version_added": false
+                },
+                "firefox": {
+                  "version_added": false,
+                  "notes": "See <a href=\"https://bugzilla.mozilla.org/show_bug.cgi?id=1045899\">Bugzilla bug 1045899</a>."
+                },
+                "firefox_android": {
+                  "version_added": false
+                },
+                "ie": {
+                  "version_added": false
+                },
+                "ie_mobile": {
+                  "version_added": false
+                },
+                "opera": {
+                  "version_added": "27"
+                },
+                "opera_android": {
+                  "version_added": null
+                },
+                "safari": {
+                  "version_added": "10"
+                },
+                "safari_ios": {
+                  "version_added": "9.3"
+                },
+                "servo": {
+                  "version_added": null
+                }
+              },
+              "status": {
+                "experimental": false,
+                "standard_track": true,
+                "obsolete": false
+              }
+            }
+          }
+        },
+        "referrer": {
+          "__compat": {
+            "basic_support": {
+              "desc": "Basic support",
+              "status": {
+                "webview_android": {
+                  "version_added": true,
+                  "version_removed": "56.0"
+                },
+                "chrome": {
+                  "version_added": true,
+                  "version_removed": "56.0"
+                },
+                "chrome_android": {
+                  "version_added": true,
+                  "version_removed": "56.0"
+                },
+                "edge": {
+                  "version_added": false
+                },
+                "edge_mobile": {
+                  "version_added": false
+                },
+                "firefox": {
+                  "version_added": "37.0",
+                  "notes": "Will be removed, see <a href=\"https://bugzilla.mozilla.org/show_bug.cgi?id=1302449\">Bugzilla bug 1302449</a>."
+                },
+                "firefox_android": {
+                  "version_added": "37.0",
+                  "notes": "Will be removed, see <a href=\"https://bugzilla.mozilla.org/show_bug.cgi?id=1302449\">Bugzilla bug 1302449</a>."
+                },
+                "ie": {
+                  "version_added": false
+                },
+                "ie_mobile": {
+                  "version_added": false
+                },
+                "opera": {
+                  "version_added": false
+                },
+                "opera_android": {
+                  "version_added": false
+                },
+                "safari": {
+                  "version_added": false
+                },
+                "safari_ios": {
+                  "version_added": false
+                },
+                "servo": {
+                  "version_added": null
+                }
+              },
+              "status": {
+                "experimental": false,
+                "standard_track": false,
+                "obsolete": true
+              }
+            }
+          }
+        },
+        "report-to": {
+          "__compat": {
+            "basic_support": {
+              "desc": "Basic support",
+              "status": {
+                "webview_android": {
+                  "version_added": false
+                },
+                "chrome": {
+                  "version_added": false
+                },
+                "chrome_android": {
+                  "version_added": false
+                },
+                "edge": {
+                  "version_added": false
+                },
+                "edge_mobile": {
+                  "version_added": false
+                },
+                "firefox": {
+                  "version_added": false
+                },
+                "firefox_android": {
+                  "version_added": false
+                },
+                "ie": {
+                  "version_added": false
+                },
+                "ie_mobile": {
+                  "version_added": false
+                },
+                "opera": {
+                  "version_added": false
+                },
+                "opera_android": {
+                  "version_added": false
+                },
+                "safari": {
+                  "version_added": false
+                },
+                "safari_ios": {
+                  "version_added": false
+                },
+                "servo": {
+                  "version_added": null
+                }
+              },
+              "status": {
+                "experimental": false,
+                "standard_track": true,
+                "obsolete": false
+              }
+            }
+          }
+        },
+        "report-uri": {
+          "__compat": {
+            "basic_support": {
+              "desc": "Basic support",
+              "status": {
+                "webview_android": {
+                  "version_added": "4.4"
+                },
+                "chrome": {
+                  "version_added": "25"
+                },
+                "chrome_android": {
+                  "version_added": true
+                },
+                "edge": {
+                  "version_added": "14"
+                },
+                "edge_mobile": {
+                  "version_added": null
+                },
+                "firefox": {
+                  "version_added": "23.0"
+                },
+                "firefox_android": {
+                  "version_added": "23.0"
+                },
+                "ie": {
+                  "version_added": false
+                },
+                "ie_mobile": {
+                  "version_added": false
+                },
+                "opera": {
+                  "version_added": "15"
+                },
+                "opera_android": {
+                  "version_added": null
+                },
+                "safari": {
+                  "version_added": "7"
+                },
+                "safari_ios": {
+                  "version_added": "7.1"
+                },
+                "servo": {
+                  "version_added": null
+                }
+              },
+              "status": {
+                "experimental": false,
+                "standard_track": true,
+                "obsolete": true
+              }
+            }
+          }
+        },
+        "require-sri-for": {
+          "__compat": {
+            "basic_support": {
+              "desc": "Basic support",
+              "status": {
+                "webview_android": {
+                  "version_added": false
+                },
+                "chrome": {
+                  "version_added": false
+                },
+                "chrome_android": {
+                  "version_added": false
+                },
+                "edge": {
+                  "version_added": false
+                },
+                "edge_mobile": {
+                  "version_added": false
+                },
+                "firefox": {
+                  "version_added": "49.0"
+                },
+                "firefox_android": {
+                  "version_added": "49.0"
+                },
+                "ie": {
+                  "version_added": false
+                },
+                "ie_mobile": {
+                  "version_added": false
+                },
+                "opera": {
+                  "version_added": false
+                },
+                "opera_android": {
+                  "version_added": false
+                },
+                "safari": {
+                  "version_added": false
+                },
+                "safari_ios": {
+                  "version_added": false
+                },
+                "servo": {
+                  "version_added": null
+                }
+              },
+              "status": {
+                "experimental": true,
+                "standard_track": true,
+                "obsolete": false
+              }
+            }
+          }
+        },
+        "sandbox": {
+          "__compat": {
+            "basic_support": {
+              "desc": "Basic support",
+              "status": {
+                "webview_android": {
+                  "version_added": "4.4"
+                },
+                "chrome": {
+                  "version_added": "25"
+                },
+                "chrome_android": {
+                  "version_added": true
+                },
+                "edge": {
+                  "version_added": "14"
+                },
+                "edge_mobile": {
+                  "version_added": null
+                },
+                "firefox": {
+                  "version_added": "50.0"
+                },
+                "firefox_android": {
+                  "version_added": "50.0"
+                },
+                "ie": {
+                  "version_added": "10"
+                },
+                "ie_mobile": {
+                  "version_added": "10"
+                },
+                "opera": {
+                  "version_added": "15"
+                },
+                "opera_android": {
+                  "version_added": null
+                },
+                "safari": {
+                  "version_added": "7"
+                },
+                "safari_ios": {
+                  "version_added": "7.1"
+                },
+                "servo": {
+                  "version_added": null
+                }
+              },
+              "status": {
+                "experimental": false,
+                "standard_track": true,
+                "obsolete": false
+              }
+            }
+          }
+        },
+        "script-src": {
+          "__compat": {
+            "basic_support": {
+              "desc": "Basic support",
+              "status": {
+                "webview_android": {
+                  "version_added": "4.4"
+                },
+                "chrome": {
+                  "version_added": "25"
+                },
+                "chrome_android": {
+                  "version_added": true
+                },
+                "edge": {
+                  "version_added": "14"
+                },
+                "edge_mobile": {
+                  "version_added": null
+                },
+                "firefox": {
+                  "version_added": "23.0"
+                },
+                "firefox_android": {
+                  "version_added": "23.0"
+                },
+                "ie": {
+                  "version_added": false
+                },
+                "ie_mobile": {
+                  "version_added": false
+                },
+                "opera": {
+                  "version_added": "15"
+                },
+                "opera_android": {
+                  "version_added": null
+                },
+                "safari": {
+                  "version_added": "7"
+                },
+                "safari_ios": {
+                  "version_added": "7.1"
+                },
+                "servo": {
+                  "version_added": null
+                }
+              },
+              "status": {
+                "experimental": false,
+                "standard_track": true,
+                "obsolete": false
+              }
+            }
+          }
+        },
+        "strict-dynamic": {
+          "__compat": {
+            "basic_support": {
+              "desc": "Basic support",
+              "status": {
+                "webview_android": {
+                  "version_added": null
+                },
+                "chrome": {
+                  "version_added": "52"
+                },
+                "chrome_android": {
+                  "version_added": "52"
+                },
+                "edge": {
+                  "version_added": false
+                },
+                "edge_mobile": {
+                  "version_added": false
+                },
+                "firefox": {
+                  "version_added": "52.0"
+                },
+                "firefox_android": {
+                  "version_added": false
+                },
+                "ie": {
+                  "version_added": false
+                },
+                "ie_mobile": {
+                  "version_added": false
+                },
+                "opera": {
+                  "version_added": false
+                },
+                "opera_android": {
+                  "version_added": false
+                },
+                "safari": {
+                  "version_added": false
+                },
+                "safari_ios": {
+                  "version_added": false
+                },
+                "servo": {
+                  "version_added": null
+                }
+              },
+              "status": {
+                "experimental": false,
+                "standard_track": true,
+                "obsolete": false
+              }
+            }
+          }
+        },
+        "style-src": {
+          "__compat": {
+            "basic_support": {
+              "desc": "Basic support",
+              "status": {
+                "webview_android": {
+                  "version_added": "4.4"
+                },
+                "chrome": {
+                  "version_added": "25"
+                },
+                "chrome_android": {
+                  "version_added": true
+                },
+                "edge": {
+                  "version_added": "14"
+                },
+                "edge_mobile": {
+                  "version_added": null
+                },
+                "firefox": {
+                  "version_added": "23.0"
+                },
+                "firefox_android": {
+                  "version_added": "23.0"
+                },
+                "ie": {
+                  "version_added": false
+                },
+                "ie_mobile": {
+                  "version_added": false
+                },
+                "opera": {
+                  "version_added": "15"
+                },
+                "opera_android": {
+                  "version_added": null
+                },
+                "safari": {
+                  "version_added": "7"
+                },
+                "safari_ios": {
+                  "version_added": "7.1"
+                },
+                "servo": {
+                  "version_added": null
+                }
+              },
+              "status": {
+                "experimental": false,
+                "standard_track": true,
+                "obsolete": false
+              }
+            }
+          }
+        },
+        "upgrade-unsecure-requests": {
+          "__compat": {
+            "basic_support": {
+              "desc": "Basic support",
+              "status": {
+                "webview_android": {
+                  "version_added": null
+                },
+                "chrome": {
+                  "version_added": "43"
+                },
+                "chrome_android": {
+                  "version_added": "43"
+                },
+                "edge": {
+                  "version_added": false,
+                  "notes": "<a href=\"https://developer.microsoft.com/en-us/microsoft-edge/platform/status/cspupgradeinsecurerequestsdirective\">Under consideration</a> for future release."
+
+                },
+                "edge_mobile": {
+                  "version_added": false
+                },
+                "firefox": {
+                  "version_added": "42.0"
+                },
+                "firefox_android": {
+                  "version_added": "42.0"
+                },
+                "ie": {
+                  "version_added": false
+                },
+                "ie_mobile": {
+                  "version_added": false
+                },
+                "opera": {
+                  "version_added": "30"
+                },
+                "opera_android": {
+                  "version_added": null
+                },
+                "safari": {
+                  "version_added": false
+                },
+                "safari_ios": {
+                  "version_added": false
+                },
+                "servo": {
+                  "version_added": null
+                }
+              },
+              "status": {
+                "experimental": false,
+                "standard_track": true,
+                "obsolete": false
+              }
+            }
+          }
+        },
+        "worker-src": {
+          "__compat": {
+            "basic_support": {
+              "desc": "Basic support",
+              "status": {
+                "webview_android": {
+                  "version_added": null
+                },
+                "chrome": {
+                  "version_added": "56"
+                },
+                "chrome_android": {
+                  "version_added": null
+                },
+                "edge": {
+                  "version_added": false
+                },
+                "edge_mobile": {
+                  "version_added": false
+                },
+                "firefox": {
+                  "version_added": false,
+                  "notes": ["See <a href=\"https://bugzilla.mozilla.org/show_bug.cgi?id=1302667\">Bugzilla bug 1302667</a>."]
+                },
+                "firefox_android": {
+                  "version_added": false
+                },
+                "ie": {
+                  "version_added": false
+                },
+                "ie_mobile": {
+                  "version_added": false
+                },
+                "opera": {
+                  "version_added": false
+                },
+                "opera_android": {
+                  "version_added": false
+                },
+                "safari": {
+                  "version_added": false
+                },
+                "safari_ios": {
+                  "version_added": false
+                },
+                "servo": {
+                  "version_added": null
+                }
+              },
+              "status": {
+                "experimental": false,
+                "standard_track": true,
+                "obsolete": false
+              }
+            }
+          }
+        }
       }
     }
   }
diff --git a/http/headers/content-type.json b/http/headers/content-type.json
index 7cd938a27dd8f..d88d04a37ea36 100644
--- a/http/headers/content-type.json
+++ b/http/headers/content-type.json
@@ -1,53 +1,64 @@
 {
-  "Content-Type": {
-    "Basic support": {
-      "Android": {
-        "support": true
-      },
-      "Chrome": {
-        "support": true
-      },
-      "Chrome for Android": {
-        "support": true
-      },
-      "Edge": {
-        "support": true
-      },
-      "Edge Mobile": {
-        "support": true
-      },
-      "Firefox": {
-        "support": true
-      },
-      "Firefox for Android": {
-        "support": true
-      },
-      "Internet Explorer": {
-        "support": true
-      },
-      "IE Mobile": {
-        "support": true
-      },
-      "Opera": {
-        "support": true
-      },
-      "Opera Mobile": {
-        "support": true
-      },
-      "Safari": {
-        "support": true
-      },
-      "Safari Mobile": {
-        "support": true
-      },
-      "Servo": {
-        "support": true
-      },
-      "status": {
-        "experimental": false,
-        "standardized": true,
-        "stable": true,
-        "obsolete": false
+  "version": "1.0.0",
+  "data": {
+    "http": {
+      "headers": {
+        "Content-Type": {
+          "__compat": {
+            "basic_support": {
+              "desc": "Basic support",
+              "support": {
+                "webview_android": {
+                  "version_added": true
+                },
+                "chrome": {
+                  "version_added": true
+                },
+                "chrome_android": {
+                  "version_added": true
+                },
+                "edge": {
+                  "version_added": true
+                },
+                "edge_mobile": {
+                  "version_added": true
+                },
+                "firefox": {
+                  "version_added": true
+                },
+                "firefox_android": {
+                  "version_added": true
+                },
+                "ie": {
+                  "version_added": true
+                },
+                "ie_mobile": {
+                  "version_added": true
+                },
+                "opera": {
+                  "version_added": true
+                },
+                "opera_android": {
+                  "version_added": true
+                },
+                "safari": {
+                  "version_added": true
+                },
+                "safari_ios": {
+                  "version_added": true
+                },
+                "servo": {
+                  "version_added": true
+                }
+              },
+              "status": {
+                "experimental": false,
+                "standard_track": true,
+                "obsolete": false
+              }
+            }
+          }
+        }
       }
     }
   }
diff --git a/http/headers/cookie.json b/http/headers/cookie.json
index 1d890c294f9f9..66a45393ce0eb 100644
--- a/http/headers/cookie.json
+++ b/http/headers/cookie.json
@@ -1,53 +1,64 @@
 {
-  "Cookie": {
-    "Basic support": {
-      "Android": {
-        "support": true
-      },
-      "Chrome": {
-        "support": true
-      },
-      "Chrome for Android": {
-        "support": true
-      },
-      "Edge": {
-        "support": true
-      },
-      "Edge Mobile": {
-        "support": true
-      },
-      "Firefox": {
-        "support": true
-      },
-      "Firefox for Android": {
-        "support": true
-      },
-      "Internet Explorer": {
-        "support": true
-      },
-      "IE Mobile": {
-        "support": true
-      },
-      "Opera": {
-        "support": true
-      },
-      "Opera Mobile": {
-        "support": true
-      },
-      "Safari": {
-        "support": true
-      },
-      "Safari Mobile": {
-        "support": true
-      },
-      "Servo": {
-        "support": true
-      },
-      "status": {
-        "experimental": false,
-        "standardized": true,
-        "stable": true,
-        "obsolete": false
+  "version": "1.0.0",
+  "data": {
+    "http": {
+      "headers": {
+        "Cookie": {
+          "__compat": {
+            "basic_support": {
+              "desc": "Basic support",
+              "support": {
+                "webview_android": {
+                  "version_added": true
+                },
+                "chrome": {
+                  "version_added": true
+                },
+                "chrome_android": {
+                  "version_added": true
+                },
+                "edge": {
+                  "version_added": true
+                },
+                "edge_mobile": {
+                  "version_added": true
+                },
+                "firefox": {
+                  "version_added": true
+                },
+                "firefox_android": {
+                  "version_added": true
+                },
+                "ie": {
+                  "version_added": true
+                },
+                "ie_mobile": {
+                  "version_added": true
+                },
+                "opera": {
+                  "version_added": true
+                },
+                "opera_android": {
+                  "version_added": true
+                },
+                "safari": {
+                  "version_added": true
+                },
+                "safari_ios": {
+                  "version_added": true
+                },
+                "servo": {
+                  "version_added": true
+                }
+              },
+              "status": {
+                "experimental": false,
+                "standard_track": true,
+                "obsolete": false
+              }
+            }
+          }
+        }
       }
     }
   }
diff --git a/http/headers/cookie2.json b/http/headers/cookie2.json
index d54d10e8377e5..a9eb517991029 100644
--- a/http/headers/cookie2.json
+++ b/http/headers/cookie2.json
@@ -1,53 +1,64 @@
 {
-  "Cookie2": {
-    "Basic support": {
-      "Android": {
-        "support": false
-      },
-      "Chrome": {
-        "support": false
-      },
-      "Chrome for Android": {
-        "support": false
-      },
-      "Edge": {
-        "support": false
-      },
-      "Edge Mobile": {
-        "support": false
-      },
-      "Firefox": {
-        "support": false
-      },
-      "Firefox for Android": {
-        "support": false
-      },
-      "Internet Explorer": {
-        "support": false
-      },
-      "IE Mobile": {
-        "support": false
-      },
-      "Opera": {
-        "support": false
-      },
-      "Opera Mobile": {
-        "support": false
-      },
-      "Safari": {
-        "support": false
-      },
-      "Safari Mobile": {
-        "support": false
-      },
-      "Servo": {
-        "support": false
-      },
-      "status": {
-        "experimental": false,
-        "standardized": true,
-        "stable": true,
-        "obsolete": true
+  "version": "1.0.0",
+  "data": {
+    "http": {
+      "headers": {
+        "Cookie2": {
+          "__compat": {
+            "basic_support": {
+              "desc": "Basic support",
+              "support": {
+                "webview_android": {
+                  "version_added": false
+                },
+                "chrome": {
+                  "version_added": false
+                },
+                "chrome_android": {
+                  "version_added": false
+                },
+                "edge": {
+                  "version_added": false
+                },
+                "edge_mobile": {
+                  "version_added": false
+                },
+                "firefox": {
+                  "version_added": false
+                },
+                "firefox_android": {
+                  "version_added": false
+                },
+                "ie": {
+                  "version_added": false
+                },
+                "ie_mobile": {
+                  "version_added": false
+                },
+                "opera": {
+                  "version_added": false
+                },
+                "opera_android": {
+                  "version_added": false
+                },
+                "safari": {
+                  "version_added": false
+                },
+                "safari_ios": {
+                  "version_added": false
+                },
+                "servo": {
+                  "version_added": false
+                }
+              },
+              "status": {
+                "experimental": false,
+                "standard_track": true,
+                "obsolete": true
+              }
+            }
+          }
+        }
       }
     }
   }
diff --git a/http/headers/date.json b/http/headers/date.json
index 2ad5966813530..e7b3434e1d114 100644
--- a/http/headers/date.json
+++ b/http/headers/date.json
@@ -1,53 +1,64 @@
 {
-  "Date": {
-    "Basic support": {
-      "Android": {
-        "support": true
-      },
-      "Chrome": {
-        "support": true
-      },
-      "Chrome for Android": {
-        "support": true
-      },
-      "Edge": {
-        "support": true
-      },
-      "Edge Mobile": {
-        "support": true
-      },
-      "Firefox": {
-        "support": true
-      },
-      "Firefox for Android": {
-        "support": true
-      },
-      "Internet Explorer": {
-        "support": true
-      },
-      "IE Mobile": {
-        "support": true
-      },
-      "Opera": {
-        "support": true
-      },
-      "Opera Mobile": {
-        "support": true
-      },
-      "Safari": {
-        "support": true
-      },
-      "Safari Mobile": {
-        "support": true
-      },
-      "Servo": {
-        "support": true
-      },
-      "status": {
-        "experimental": false,
-        "standardized": true,
-        "stable": true,
-        "obsolete": false
+  "version": "1.0.0",
+  "data": {
+    "http": {
+      "headers": {
+        "Date": {
+          "__compat": {
+            "basic_support": {
+              "desc": "Basic support",
+              "support": {
+                "webview_android": {
+                  "version_added": true
+                },
+                "chrome": {
+                  "version_added": true
+                },
+                "chrome_android": {
+                  "version_added": true
+                },
+                "edge": {
+                  "version_added": true
+                },
+                "edge_mobile": {
+                  "version_added": true
+                },
+                "firefox": {
+                  "version_added": true
+                },
+                "firefox_android": {
+                  "version_added": true
+                },
+                "ie": {
+                  "version_added": true
+                },
+                "ie_mobile": {
+                  "version_added": true
+                },
+                "opera": {
+                  "version_added": true
+                },
+                "opera_android": {
+                  "version_added": true
+                },
+                "safari": {
+                  "version_added": true
+                },
+                "safari_ios": {
+                  "version_added": true
+                },
+                "servo": {
+                  "version_added": true
+                }
+              },
+              "status": {
+                "experimental": false,
+                "standard_track": true,
+                "obsolete": false
+              }
+            }
+          }
+        }
       }
     }
   }
diff --git a/http/headers/dnt.json b/http/headers/dnt.json
index b1bb482581ce7..5761de16991e8 100644
--- a/http/headers/dnt.json
+++ b/http/headers/dnt.json
@@ -1,53 +1,64 @@
 {
-  "DNT": {
-    "Basic support": {
-      "Android": {
-        "support": true
-      },
-      "Chrome": {
-        "support": "23"
-      },
-      "Chrome for Android": {
-        "support": true
-      },
-      "Edge": {
-        "support": true
-      },
-      "Edge Mobile": {
-        "support": true
-      },
-      "Firefox": {
-        "support": "4"
-      },
-      "Firefox for Android": {
-        "support": true
-      },
-      "Internet Explorer": {
-        "support": "9"
-      },
-      "IE Mobile": {
-        "support": true
-      },
-      "Opera": {
-        "support": true
-      },
-      "Opera Mobile": {
-        "support": true
-      },
-      "Safari": {
-        "support": "6"
-      },
-      "Safari Mobile": {
-        "support": true
-      },
-      "Servo": {
-        "support": true
-      },
-      "status": {
-        "experimental": false,
-        "standardized": true,
-        "stable": true,
-        "obsolete": false
+  "version": "1.0.0",
+  "data": {
+    "http": {
+      "headers": {
+        "DNT": {
+          "__compat": {
+            "basic_support": {
+              "desc": "Basic support",
+              "support": {
+                "webview_android": {
+                  "version_added": true
+                },
+                "chrome": {
+                  "version_added": "23"
+                },
+                "chrome_android": {
+                  "version_added": true
+                },
+                "edge": {
+                  "version_added": true
+                },
+                "edge_mobile": {
+                  "version_added": true
+                },
+                "firefox": {
+                  "version_added": "4"
+                },
+                "firefox_android": {
+                  "version_added": true
+                },
+                "ie": {
+                  "version_added": "9"
+                },
+                "ie_mobile": {
+                  "version_added": true
+                },
+                "opera": {
+                  "version_added": true
+                },
+                "opera_android": {
+                  "version_added": true
+                },
+                "safari": {
+                  "version_added": "6"
+                },
+                "safari_ios": {
+                  "version_added": true
+                },
+                "servo": {
+                  "version_added": true
+                }
+              },
+              "status": {
+                "experimental": false,
+                "standard_track": true,
+                "obsolete": false
+              }
+            }
+          }
+        }
       }
     }
   }
diff --git a/http/headers/etag.json b/http/headers/etag.json
index 2a16a9f01e1ea..711ef1d96ba05 100644
--- a/http/headers/etag.json
+++ b/http/headers/etag.json
@@ -1,53 +1,64 @@
 {
-  "ETag": {
-    "Basic support": {
-      "Android": {
-        "support": true
-      },
-      "Chrome": {
-        "support": true
-      },
-      "Chrome for Android": {
-        "support": true
-      },
-      "Edge": {
-        "support": true
-      },
-      "Edge Mobile": {
-        "support": true
-      },
-      "Firefox": {
-        "support": true
-      },
-      "Firefox for Android": {
-        "support": true
-      },
-      "Internet Explorer": {
-        "support": true
-      },
-      "IE Mobile": {
-        "support": true
-      },
-      "Opera": {
-        "support": true
-      },
-      "Opera Mobile": {
-        "support": true
-      },
-      "Safari": {
-        "support": true
-      },
-      "Safari Mobile": {
-        "support": true
-      },
-      "Servo": {
-        "support": true
-      },
-      "status": {
-        "experimental": false,
-        "standardized": true,
-        "stable": true,
-        "obsolete": false
+  "version": "1.0.0",
+  "data": {
+    "http": {
+      "headers": {
+        "ETag": {
+          "__compat": {
+            "basic_support": {
+              "desc": "Basic support",
+              "support": {
+                "webview_android": {
+                  "version_added": true
+                },
+                "chrome": {
+                  "version_added": true
+                },
+                "chrome_android": {
+                  "version_added": true
+                },
+                "edge": {
+                  "version_added": true
+                },
+                "edge_mobile": {
+                  "version_added": true
+                },
+                "firefox": {
+                  "version_added": true
+                },
+                "firefox_android": {
+                  "version_added": true
+                },
+                "ie": {
+                  "version_added": true
+                },
+                "ie_mobile": {
+                  "version_added": true
+                },
+                "opera": {
+                  "version_added": true
+                },
+                "opera_android": {
+                  "version_added": true
+                },
+                "safari": {
+                  "version_added": true
+                },
+                "safari_ios": {
+                  "version_added": true
+                },
+                "servo": {
+                  "version_added": true
+                }
+              },
+              "status": {
+                "experimental": false,
+                "standard_track": true,
+                "obsolete": false
+              }
+            }
+          }
+        }
       }
     }
   }
diff --git a/http/headers/expires.json b/http/headers/expires.json
index 3f316f235cde5..78398200a8860 100644
--- a/http/headers/expires.json
+++ b/http/headers/expires.json
@@ -1,53 +1,64 @@
 {
-  "Expires": {
-    "Basic support": {
-      "Android": {
-        "support": true
-      },
-      "Chrome": {
-        "support": true
-      },
-      "Chrome for Android": {
-        "support": true
-      },
-      "Edge": {
-        "support": true
-      },
-      "Edge Mobile": {
-        "support": true
-      },
-      "Firefox": {
-        "support": true
-      },
-      "Firefox for Android": {
-        "support": true
-      },
-      "Internet Explorer": {
-        "support": true
-      },
-      "IE Mobile": {
-        "support": true
-      },
-      "Opera": {
-        "support": true
-      },
-      "Opera Mobile": {
-        "support": true
-      },
-      "Safari": {
-        "support": true
-      },
-      "Safari Mobile": {
-        "support": true
-      },
-      "Servo": {
-        "support": true
-      },
-      "status": {
-        "experimental": false,
-        "standardized": true,
-        "stable": true,
-        "obsolete": false
+  "version": "1.0.0",
+  "data": {
+    "http": {
+      "headers": {
+        "Expires": {
+          "__compat": {
+            "basic_support": {
+              "desc": "Basic support",
+              "support": {
+                "webview_android": {
+                  "version_added": true
+                },
+                "chrome": {
+                  "version_added": true
+                },
+                "chrome_android": {
+                  "version_added": true
+                },
+                "edge": {
+                  "version_added": true
+                },
+                "edge_mobile": {
+                  "version_added": true
+                },
+                "firefox": {
+                  "version_added": true
+                },
+                "firefox_android": {
+                  "version_added": true
+                },
+                "ie": {
+                  "version_added": true
+                },
+                "ie_mobile": {
+                  "version_added": true
+                },
+                "opera": {
+                  "version_added": true
+                },
+                "opera_android": {
+                  "version_added": true
+                },
+                "safari": {
+                  "version_added": true
+                },
+                "safari_ios": {
+                  "version_added": true
+                },
+                "servo": {
+                  "version_added": true
+                }
+              },
+              "status": {
+                "experimental": false,
+                "standard_track": true,
+                "obsolete": false
+              }
+            }
+          }
+        }
       }
     }
   }
diff --git a/http/headers/from.json b/http/headers/from.json
index 50d1458763f9c..b6a2290b95d07 100644
--- a/http/headers/from.json
+++ b/http/headers/from.json
@@ -1,53 +1,64 @@
 {
-  "From": {
-    "Basic support": {
-      "Android": {
-        "support": true
-      },
-      "Chrome": {
-        "support": true
-      },
-      "Chrome for Android": {
-        "support": true
-      },
-      "Edge": {
-        "support": true
-      },
-      "Edge Mobile": {
-        "support": true
-      },
-      "Firefox": {
-        "support": true
-      },
-      "Firefox for Android": {
-        "support": true
-      },
-      "Internet Explorer": {
-        "support": true
-      },
-      "IE Mobile": {
-        "support": true
-      },
-      "Opera": {
-        "support": true
-      },
-      "Opera Mobile": {
-        "support": true
-      },
-      "Safari": {
-        "support": true
-      },
-      "Safari Mobile": {
-        "support": true
-      },
-      "Servo": {
-        "support": true
-      },
-      "status": {
-        "experimental": false,
-        "standardized": true,
-        "stable": true,
-        "obsolete": false
+  "version": "1.0.0",
+  "data": {
+    "http": {
+      "headers": {
+        "From": {
+          "__compat": {
+            "basic_support": {
+              "desc": "Basic support",
+              "support": {
+                "webview_android": {
+                  "version_added": true
+                },
+                "chrome": {
+                  "version_added": true
+                },
+                "chrome_android": {
+                  "version_added": true
+                },
+                "edge": {
+                  "version_added": true
+                },
+                "edge_mobile": {
+                  "version_added": true
+                },
+                "firefox": {
+                  "version_added": true
+                },
+                "firefox_android": {
+                  "version_added": true
+                },
+                "ie": {
+                  "version_added": true
+                },
+                "ie_mobile": {
+                  "version_added": true
+                },
+                "opera": {
+                  "version_added": true
+                },
+                "opera_android": {
+                  "version_added": true
+                },
+                "safari": {
+                  "version_added": true
+                },
+                "safari_ios": {
+                  "version_added": true
+                },
+                "servo": {
+                  "version_added": true
+                }
+              },
+              "status": {
+                "experimental": false,
+                "standard_track": true,
+                "obsolete": false
+              }
+            }
+          }
+        }
       }
     }
   }
diff --git a/http/headers/host.json b/http/headers/host.json
index 308e4bdd03e47..bb9721946f9e2 100644
--- a/http/headers/host.json
+++ b/http/headers/host.json
@@ -1,53 +1,64 @@
 {
-  "Host": {
-    "Basic support": {
-      "Android": {
-        "support": true
-      },
-      "Chrome": {
-        "support": true
-      },
-      "Chrome for Android": {
-        "support": true
-      },
-      "Edge": {
-        "support": true
-      },
-      "Edge Mobile": {
-        "support": true
-      },
-      "Firefox": {
-        "support": true
-      },
-      "Firefox for Android": {
-        "support": true
-      },
-      "Internet Explorer": {
-        "support": true
-      },
-      "IE Mobile": {
-        "support": true
-      },
-      "Opera": {
-        "support": true
-      },
-      "Opera Mobile": {
-        "support": true
-      },
-      "Safari": {
-        "support": true
-      },
-      "Safari Mobile": {
-        "support": true
-      },
-      "Servo": {
-        "support": true
-      },
-      "status": {
-        "experimental": false,
-        "standardized": true,
-        "stable": true,
-        "obsolete": false
+  "version": "1.0.0",
+  "data": {
+    "http": {
+      "headers": {
+        "Host": {
+          "__compat": {
+            "basic_support": {
+              "desc": "Basic support",
+              "support": {
+                "webview_android": {
+                  "version_added": true
+                },
+                "chrome": {
+                  "version_added": true
+                },
+                "chrome_android": {
+                  "version_added": true
+                },
+                "edge": {
+                  "version_added": true
+                },
+                "edge_mobile": {
+                  "version_added": true
+                },
+                "firefox": {
+                  "version_added": true
+                },
+                "firefox_android": {
+                  "version_added": true
+                },
+                "ie": {
+                  "version_added": true
+                },
+                "ie_mobile": {
+                  "version_added": true
+                },
+                "opera": {
+                  "version_added": true
+                },
+                "opera_android": {
+                  "version_added": true
+                },
+                "safari": {
+                  "version_added": true
+                },
+                "safari_ios": {
+                  "version_added": true
+                },
+                "servo": {
+                  "version_added": true
+                }
+              },
+              "status": {
+                "experimental": false,
+                "standard_track": true,
+                "obsolete": false
+              }
+            }
+          }
+        }
       }
     }
   }
diff --git a/http/headers/if-match.json b/http/headers/if-match.json
index 774b233b3790d..052a3c5eeb69d 100644
--- a/http/headers/if-match.json
+++ b/http/headers/if-match.json
@@ -1,53 +1,64 @@
 {
-  "If-Match": {
-    "Basic support": {
-      "Android": {
-        "support": true
-      },
-      "Chrome": {
-        "support": true
-      },
-      "Chrome for Android": {
-        "support": true
-      },
-      "Edge": {
-        "support": true
-      },
-      "Edge Mobile": {
-        "support": true
-      },
-      "Firefox": {
-        "support": true
-      },
-      "Firefox for Android": {
-        "support": true
-      },
-      "Internet Explorer": {
-        "support": true
-      },
-      "IE Mobile": {
-        "support": true
-      },
-      "Opera": {
-        "support": true
-      },
-      "Opera Mobile": {
-        "support": true
-      },
-      "Safari": {
-        "support": true
-      },
-      "Safari Mobile": {
-        "support": true
-      },
-      "Servo": {
-        "support": true
-      },
-      "status": {
-        "experimental": true,
-        "standardized": false,
-        "stable": true,
-        "obsolete": true
+  "version": "1.0.0",
+  "data": {
+    "http": {
+      "headers": {
+        "If-Match": {
+          "__compat": {
+            "basic_support": {
+              "desc": "Basic support",
+              "support": {
+                "webview_android": {
+                  "version_added": true
+                },
+                "chrome": {
+                  "version_added": true
+                },
+                "chrome_android": {
+                  "version_added": true
+                },
+                "edge": {
+                  "version_added": true
+                },
+                "edge_mobile": {
+                  "version_added": true
+                },
+                "firefox": {
+                  "version_added": true
+                },
+                "firefox_android": {
+                  "version_added": true
+                },
+                "ie": {
+                  "version_added": true
+                },
+                "ie_mobile": {
+                  "version_added": true
+                },
+                "opera": {
+                  "version_added": true
+                },
+                "opera_android": {
+                  "version_added": true
+                },
+                "safari": {
+                  "version_added": true
+                },
+                "safari_ios": {
+                  "version_added": true
+                },
+                "servo": {
+                  "version_added": true
+                }
+              },
+              "status": {
+                "experimental": true,
+                "standard_track": false,
+                "obsolete": true
+              }
+            }
+          }
+        }
       }
     }
   }
diff --git a/http/headers/if-modified-since.json b/http/headers/if-modified-since.json
index b35588ea1b1b2..6e3012ad44cdb 100644
--- a/http/headers/if-modified-since.json
+++ b/http/headers/if-modified-since.json
@@ -1,53 +1,64 @@
 {
-  "If-Modified-Since": {
-    "Basic support": {
-      "Android": {
-        "support": true
-      },
-      "Chrome": {
-        "support": true
-      },
-      "Chrome for Android": {
-        "support": true
-      },
-      "Edge": {
-        "support": true
-      },
-      "Edge Mobile": {
-        "support": true
-      },
-      "Firefox": {
-        "support": true
-      },
-      "Firefox for Android": {
-        "support": true
-      },
-      "Internet Explorer": {
-        "support": true
-      },
-      "IE Mobile": {
-        "support": true
-      },
-      "Opera": {
-        "support": true
-      },
-      "Opera Mobile": {
-        "support": true
-      },
-      "Safari": {
-        "support": true
-      },
-      "Safari Mobile": {
-        "support": true
-      },
-      "Servo": {
-        "support": true
-      },
-      "status": {
-        "experimental": true,
-        "standardized": false,
-        "stable": true,
-        "obsolete": true
+  "version": "1.0.0",
+  "data": {
+    "http": {
+      "headers": {
+        "If-Modified-Since": {
+          "__compat": {
+            "basic_support": {
+              "desc": "Basic support",
+              "support": {
+                "webview_android": {
+                  "version_added": true
+                },
+                "chrome": {
+                  "version_added": true
+                },
+                "chrome_android": {
+                  "version_added": true
+                },
+                "edge": {
+                  "version_added": true
+                },
+                "edge_mobile": {
+                  "version_added": true
+                },
+                "firefox": {
+                  "version_added": true
+                },
+                "firefox_android": {
+                  "version_added": true
+                },
+                "ie": {
+                  "version_added": true
+                },
+                "ie_mobile": {
+                  "version_added": true
+                },
+                "opera": {
+                  "version_added": true
+                },
+                "opera_android": {
+                  "version_added": true
+                },
+                "safari": {
+                  "version_added": true
+                },
+                "safari_ios": {
+                  "version_added": true
+                },
+                "servo": {
+                  "version_added": true
+                }
+              },
+              "status": {
+                "experimental": true,
+                "standard_track": false,
+                "obsolete": true
+              }
+            }
+          }
+        }
       }
     }
   }
diff --git a/http/headers/if-none-match.json b/http/headers/if-none-match.json
index 12d9e8e9b9489..ac2e87b219019 100644
--- a/http/headers/if-none-match.json
+++ b/http/headers/if-none-match.json
@@ -1,53 +1,64 @@
 {
-  "If-None-Match": {
-    "Basic support": {
-      "Android": {
-        "support": true
-      },
-      "Chrome": {
-        "support": true
-      },
-      "Chrome for Android": {
-        "support": true
-      },
-      "Edge": {
-        "support": true
-      },
-      "Edge Mobile": {
-        "support": true
-      },
-      "Firefox": {
-        "support": true
-      },
-      "Firefox for Android": {
-        "support": true
-      },
-      "Internet Explorer": {
-        "support": true
-      },
-      "IE Mobile": {
-        "support": true
-      },
-      "Opera": {
-        "support": true
-      },
-      "Opera Mobile": {
-        "support": true
-      },
-      "Safari": {
-        "support": true
-      },
-      "Safari Mobile": {
-        "support": true
-      },
-      "Servo": {
-        "support": true
-      },
-      "status": {
-        "experimental": true,
-        "standardized": false,
-        "stable": true,
-        "obsolete": true
+  "version": "1.0.0",
+  "data": {
+    "http": {
+      "headers": {
+        "If-None-Match": {
+          "__compat": {
+            "basic_support": {
+              "desc": "Basic support",
+              "support": {
+                "webview_android": {
+                  "version_added": true
+                },
+                "chrome": {
+                  "version_added": true
+                },
+                "chrome_android": {
+                  "version_added": true
+                },
+                "edge": {
+                  "version_added": true
+                },
+                "edge_mobile": {
+                  "version_added": true
+                },
+                "firefox": {
+                  "version_added": true
+                },
+                "firefox_android": {
+                  "version_added": true
+                },
+                "ie": {
+                  "version_added": true
+                },
+                "ie_mobile": {
+                  "version_added": true
+                },
+                "opera": {
+                  "version_added": true
+                },
+                "opera_android": {
+                  "version_added": true
+                },
+                "safari": {
+                  "version_added": true
+                },
+                "safari_ios": {
+                  "version_added": true
+                },
+                "servo": {
+                  "version_added": true
+                }
+              },
+              "status": {
+                "experimental": true,
+                "standard_track": false,
+                "obsolete": true
+              }
+            }
+          }
+        }
       }
     }
   }
diff --git a/http/headers/if-range.json b/http/headers/if-range.json
index 364a47b2da034..09388c644910f 100644
--- a/http/headers/if-range.json
+++ b/http/headers/if-range.json
@@ -1,53 +1,64 @@
 {
-  "If-Range": {
-    "Basic support": {
-      "Android": {
-        "support": true
-      },
-      "Chrome": {
-        "support": true
-      },
-      "Chrome for Android": {
-        "support": true
-      },
-      "Edge": {
-        "support": true
-      },
-      "Edge Mobile": {
-        "support": true
-      },
-      "Firefox": {
-        "support": true
-      },
-      "Firefox for Android": {
-        "support": true
-      },
-      "Internet Explorer": {
-        "support": true
-      },
-      "IE Mobile": {
-        "support": true
-      },
-      "Opera": {
-        "support": true
-      },
-      "Opera Mobile": {
-        "support": true
-      },
-      "Safari": {
-        "support": true
-      },
-      "Safari Mobile": {
-        "support": true
-      },
-      "Servo": {
-        "support": true
-      },
-      "status": {
-        "experimental": false,
-        "standardized": true,
-        "stable": true,
-        "obsolete": false
+  "version": "1.0.0",
+  "data": {
+    "http": {
+      "headers": {
+        "If-Range": {
+          "__compat": {
+            "basic_support": {
+              "desc": "Basic support",
+              "status":{
+                "webview_android": {
+                  "version_added": true
+                },
+                "chrome": {
+                  "version_added": true
+                },
+                "chrome_android": {
+                  "version_added": true
+                },
+                "edge": {
+                  "version_added": true
+                },
+                "edge_mobile": {
+                  "version_added": true
+                },
+                "firefox": {
+                  "version_added": true
+                },
+                "firefox_android": {
+                  "version_added": true
+                },
+                "ie": {
+                  "version_added": true
+                },
+                "ie_mobile": {
+                  "version_added": true
+                },
+                "opera": {
+                  "version_added": true
+                },
+                "opera_android": {
+                  "version_added": true
+                },
+                "safari": {
+                  "version_added": true
+                },
+                "safari_ios": {
+                  "version_added": true
+                },
+                "servo": {
+                  "version_added": true
+                }
+              },
+              "status": {
+                "experimental": false,
+                "standard_track": true,
+                "obsolete": false
+              }
+            }
+          }
+        }
       }
     }
   }
diff --git a/http/headers/if-unmodified-since.json b/http/headers/if-unmodified-since.json
index f5605ffccc244..f553b96424f08 100644
--- a/http/headers/if-unmodified-since.json
+++ b/http/headers/if-unmodified-since.json
@@ -1,53 +1,64 @@
 {
-  "If-Unmodified-Since": {
-    "Basic support": {
-      "Android": {
-        "support": true
-      },
-      "Chrome": {
-        "support": true
-      },
-      "Chrome for Android": {
-        "support": true
-      },
-      "Edge": {
-        "support": true
-      },
-      "Edge Mobile": {
-        "support": true
-      },
-      "Firefox": {
-        "support": true
-      },
-      "Firefox for Android": {
-        "support": true
-      },
-      "Internet Explorer": {
-        "support": true
-      },
-      "IE Mobile": {
-        "support": true
-      },
-      "Opera": {
-        "support": true
-      },
-      "Opera Mobile": {
-        "support": true
-      },
-      "Safari": {
-        "support": true
-      },
-      "Safari Mobile": {
-        "support": true
-      },
-      "Servo": {
-        "support": true
-      },
-      "status": {
-        "experimental": true,
-        "standardized": false,
-        "stable": true,
-        "obsolete": true
+  "version": "1.0.0",
+  "data": {
+    "http": {
+      "headers": {
+        "If-Unmodified-Since": {
+          "__compat": {
+            "basic_support": {
+              "desc": "Basic support",
+              "support": {
+                "webview_android": {
+                  "version_added": true
+                },
+                "chrome": {
+                  "version_added": true
+                },
+                "chrome_android": {
+                  "version_added": true
+                },
+                "edge": {
+                  "version_added": true
+                },
+                "edge_mobile": {
+                  "version_added": true
+                },
+                "firefox": {
+                  "version_added": true
+                },
+                "firefox_android": {
+                  "version_added": true
+                },
+                "ie": {
+                  "version_added": true
+                },
+                "ie_mobile": {
+                  "version_added": true
+                },
+                "opera": {
+                  "version_added": true
+                },
+                "opera_android": {
+                  "version_added": true
+                },
+                "safari": {
+                  "version_added": true
+                },
+                "safari_ios": {
+                  "version_added": true
+                },
+                "servo": {
+                  "version_added": true
+                }
+              },
+              "status": {
+                "experimental": true,
+                "standard_track": false,
+                "obsolete": true
+              }
+            }
+          }
+        }
       }
     }
   }
diff --git a/http/headers/keep-alive.json b/http/headers/keep-alive.json
index 6f5f7164e4ee8..c312b553cf502 100644
--- a/http/headers/keep-alive.json
+++ b/http/headers/keep-alive.json
@@ -1,53 +1,64 @@
 {
-  "Keep-Alive": {
-    "Basic support": {
-      "Android": {
-        "support": true
-      },
-      "Chrome": {
-        "support": true
-      },
-      "Chrome for Android": {
-        "support": true
-      },
-      "Edge": {
-        "support": true
-      },
-      "Edge Mobile": {
-        "support": true
-      },
-      "Firefox": {
-        "support": true
-      },
-      "Firefox for Android": {
-        "support": true
-      },
-      "Internet Explorer": {
-        "support": true
-      },
-      "IE Mobile": {
-        "support": true
-      },
-      "Opera": {
-        "support": true
-      },
-      "Opera Mobile": {
-        "support": true
-      },
-      "Safari": {
-        "support": true
-      },
-      "Safari Mobile": {
-        "support": true
-      },
-      "Servo": {
-        "support": true
-      },
-      "status": {
-        "experimental": true,
-        "standardized": false,
-        "stable": true,
-        "obsolete": true
+  "version": "1.0.0",
+  "data": {
+    "http": {
+      "headers": {
+        "Keep-Alive": {
+          "__compat": {
+            "basic_support": {
+              "desc": "Basic support",
+              "support": {
+                "webview_android": {
+                  "version_added": true
+                },
+                "chrome": {
+                  "version_added": true
+                },
+                "chrome_android": {
+                  "version_added": true
+                },
+                "edge": {
+                  "version_added": true
+                },
+                "edge_mobile": {
+                  "version_added": true
+                },
+                "firefox": {
+                  "version_added": true
+                },
+                "firefox_android": {
+                  "version_added": true
+                },
+                "ie": {
+                  "version_added": true
+                },
+                "ie_mobile": {
+                  "version_added": true
+                },
+                "opera": {
+                  "version_added": true
+                },
+                "opera_android": {
+                  "version_added": true
+                },
+                "safari": {
+                  "version_added": true
+                },
+                "safari_ios": {
+                  "version_added": true
+                },
+                "servo": {
+                  "version_added": true
+                }
+              },
+              "status": {
+                "experimental": true,
+                "standard_track": false,
+                "obsolete": true
+              }
+            }
+          }
+        }
       }
     }
   }
diff --git a/http/headers/large-allocation.json b/http/headers/large-allocation.json
index 95b4d002e3536..fb190c04a1264 100644
--- a/http/headers/large-allocation.json
+++ b/http/headers/large-allocation.json
@@ -1,53 +1,64 @@
 {
-  "Large-Allocation": {
-    "Basic support": {
-      "Android": {
-        "support": false
-      },
-      "Chrome": {
-        "support": false
-      },
-      "Chrome for Android": {
-        "support": false
-      },
-      "Edge": {
-        "support": false
-      },
-      "Edge Mobile": {
-        "support": false
-      },
-      "Firefox": {
-        "support": "53"
-      },
-      "Firefox for Android": {
-        "support": false
-      },
-      "Internet Explorer": {
-        "support": false
-      },
-      "IE Mobile": {
-        "support": false
-      },
-      "Opera": {
-        "support": false
-      },
-      "Opera Mobile": {
-        "support": false
-      },
-      "Safari": {
-        "support": false
-      },
-      "Safari Mobile": {
-        "support": false
-      },
-      "Servo": {
-        "support": false
-      },
-      "status": {
-        "experimental": true,
-        "standardized": false,
-        "stable": false,
-        "obsolete": false
+  "version": "1.0.0",
+  "data": {
+    "http": {
+      "headers": {
+        "Large-Allocation": {
+          "__compat": {
+            "basic_support": {
+              "desc": "Basic support",
+              "status": {
+                "webview_android": {
+                  "version_added": false
+                },
+                "chrome": {
+                  "version_added": false
+                },
+                "chrome_android": {
+                  "version_added": false
+                },
+                "edge": {
+                  "version_added": false
+                },
+                "edge_mobile": {
+                  "version_added": false
+                },
+                "firefox": {
+                  "version_added": "53"
+                },
+                "firefox_android": {
+                  "version_added": false
+                },
+                "ie": {
+                  "version_added": false
+                },
+                "ie_mobile": {
+                  "version_added": false
+                },
+                "opera": {
+                  "version_added": false
+                },
+                "opera_android": {
+                  "version_added": false
+                },
+                "safari": {
+                  "version_added": false
+                },
+                "safari_ios": {
+                  "version_added": false
+                },
+                "servo": {
+                  "version_added": false
+                }
+              },
+              "status": {
+                "experimental": true,
+                "standard_track": false,
+                "obsolete": false
+              }
+            }
+          }
+        }
       }
     }
   }
diff --git a/http/headers/last-modified.json b/http/headers/last-modified.json
index 0b479a9afb5d4..efe74904927be 100644
--- a/http/headers/last-modified.json
+++ b/http/headers/last-modified.json
@@ -1,53 +1,64 @@
 {
-  "Last-Modified": {
-    "Basic support": {
-      "Android": {
-        "support": true
-      },
-      "Chrome": {
-        "support": true
-      },
-      "Chrome for Android": {
-        "support": true
-      },
-      "Edge": {
-        "support": true
-      },
-      "Edge Mobile": {
-        "support": true
-      },
-      "Firefox": {
-        "support": true
-      },
-      "Firefox for Android": {
-        "support": true
-      },
-      "Internet Explorer": {
-        "support": true
-      },
-      "IE Mobile": {
-        "support": true
-      },
-      "Opera": {
-        "support": true
-      },
-      "Opera Mobile": {
-        "support": true
-      },
-      "Safari": {
-        "support": true
-      },
-      "Safari Mobile": {
-        "support": true
-      },
-      "Servo": {
-        "support": true
-      },
-      "status": {
-        "experimental": true,
-        "standardized": false,
-        "stable": true,
-        "obsolete": true
+  "version": "1.0.0",
+  "data": {
+    "http": {
+      "headers": {
+        "Last-Modified": {
+          "__compat": {
+            "basic_support": {
+              "desc": "Basic support",
+              "support": {
+                "webview_android": {
+                  "version_added": true
+                },
+                "chrome": {
+                  "version_added": true
+                },
+                "chrome_android": {
+                  "version_added": true
+                },
+                "edge": {
+                  "version_added": true
+                },
+                "edge_mobile": {
+                  "version_added": true
+                },
+                "firefox": {
+                  "version_added": true
+                },
+                "firefox_android": {
+                  "version_added": true
+                },
+                "ie": {
+                  "version_added": true
+                },
+                "ie_mobile": {
+                  "version_added": true
+                },
+                "opera": {
+                  "version_added": true
+                },
+                "opera_android": {
+                  "version_added": true
+                },
+                "safari": {
+                  "version_added": true
+                },
+                "safari_ios": {
+                  "version_added": true
+                },
+                "servo": {
+                  "version_added": true
+                }
+              },
+              "status": {
+                "experimental": true,
+                "standard_track": false,
+                "obsolete": true
+              }
+            }
+          }
+        }
       }
     }
   }
diff --git a/http/headers/location.json b/http/headers/location.json
index ea785f4395536..7b65d361024eb 100644
--- a/http/headers/location.json
+++ b/http/headers/location.json
@@ -1,53 +1,64 @@
 {
-  "Location": {
-    "Basic support": {
-      "Android": {
-        "support": true
-      },
-      "Chrome": {
-        "support": true
-      },
-      "Chrome for Android": {
-        "support": true
-      },
-      "Edge": {
-        "support": true
-      },
-      "Edge Mobile": {
-        "support": true
-      },
-      "Firefox": {
-        "support": true
-      },
-      "Firefox for Android": {
-        "support": true
-      },
-      "Internet Explorer": {
-        "support": true
-      },
-      "IE Mobile": {
-        "support": true
-      },
-      "Opera": {
-        "support": true
-      },
-      "Opera Mobile": {
-        "support": true
-      },
-      "Safari": {
-        "support": true
-      },
-      "Safari Mobile": {
-        "support": true
-      },
-      "Servo": {
-        "support": true
-      },
-      "status": {
-        "experimental": true,
-        "standardized": false,
-        "stable": true,
-        "obsolete": true
+  "version": "1.0.0",
+  "data": {
+    "http": {
+      "headers": {
+        "Location": {
+          "__compat": {
+            "basic_support": {
+              "desc": "Basic support",
+              "support": {
+                "webview_android": {
+                  "version_added": true
+                },
+                "chrome": {
+                  "version_added": true
+                },
+                "chrome_android": {
+                  "version_added": true
+                },
+                "edge": {
+                  "version_added": true
+                },
+                "edge_mobile": {
+                  "version_added": true
+                },
+                "firefox": {
+                  "version_added": true
+                },
+                "firefox_android": {
+                  "version_added": true
+                },
+                "ie": {
+                  "version_added": true
+                },
+                "ie_mobile": {
+                  "version_added": true
+                },
+                "opera": {
+                  "version_added": true
+                },
+                "opera_android": {
+                  "version_added": true
+                },
+                "safari": {
+                  "version_added": true
+                },
+                "safari_ios": {
+                  "version_added": true
+                },
+                "servo": {
+                  "version_added": true
+                }
+              },
+              "status": {
+                "experimental": true,
+                "standard_track": false,
+                "obsolete": true
+              }
+            }
+          }
+        }
       }
     }
   }
diff --git a/http/headers/origin.json b/http/headers/origin.json
index 879d4cb46b8e0..07cd7169c30ed 100644
--- a/http/headers/origin.json
+++ b/http/headers/origin.json
@@ -1,53 +1,64 @@
 {
-  "Origin": {
-    "Basic support": {
-      "Android": {
-        "support": true
-      },
-      "Chrome": {
-        "support": true
-      },
-      "Chrome for Android": {
-        "support": true
-      },
-      "Edge": {
-        "support": true
-      },
-      "Edge Mobile": {
-        "support": true
-      },
-      "Firefox": {
-        "support": true
-      },
-      "Firefox for Android": {
-        "support": true
-      },
-      "Internet Explorer": {
-        "support": true
-      },
-      "IE Mobile": {
-        "support": true
-      },
-      "Opera": {
-        "support": true
-      },
-      "Opera Mobile": {
-        "support": true
-      },
-      "Safari": {
-        "support": true
-      },
-      "Safari Mobile": {
-        "support": true
-      },
-      "Servo": {
-        "support": true
-      },
-      "status": {
-        "experimental": false,
-        "standardized": true,
-        "stable": true,
-        "obsolete": false
+  "version": "1.0.0",
+  "data": {
+    "http": {
+      "headers": {
+        "Origin": {
+          "__compat": {
+            "basic_support": {
+              "desc": "Basic support",
+              "support": {
+                "webview_android": {
+                  "version_added": true
+                },
+                "chrome": {
+                  "version_added": true
+                },
+                "chrome_android": {
+                  "version_added": true
+                },
+                "edge": {
+                  "version_added": true
+                },
+                "edge_mobile": {
+                  "version_added": true
+                },
+                "firefox": {
+                  "version_added": true
+                },
+                "firefox_android": {
+                  "version_added": true
+                },
+                "ie": {
+                  "version_added": true
+                },
+                "ie_mobile": {
+                  "version_added": true
+                },
+                "opera": {
+                  "version_added": true
+                },
+                "opera_android": {
+                  "version_added": true
+                },
+                "safari": {
+                  "version_added": true
+                },
+                "safari_ios": {
+                  "version_added": true
+                },
+                "servo": {
+                  "version_added": true
+                }
+              },
+              "status": {
+                "experimental": false,
+                "standard_track": true,
+                "obsolete": false
+              }
+            }
+          }
+        }
       }
     }
   }
diff --git a/http/headers/pragma.json b/http/headers/pragma.json
index 85a62fa7306cf..d29f19a0ba17c 100644
--- a/http/headers/pragma.json
+++ b/http/headers/pragma.json
@@ -1,53 +1,64 @@
 {
-  "Pragma": {
-    "Basic support": {
-      "Android": {
-        "support": true
-      },
-      "Chrome": {
-        "support": true
-      },
-      "Chrome for Android": {
-        "support": true
-      },
-      "Edge": {
-        "support": true
-      },
-      "Edge Mobile": {
-        "support": true
-      },
-      "Firefox": {
-        "support": true
-      },
-      "Firefox for Android": {
-        "support": true
-      },
-      "Internet Explorer": {
-        "support": true
-      },
-      "IE Mobile": {
-        "support": true
-      },
-      "Opera": {
-        "support": true
-      },
-      "Opera Mobile": {
-        "support": true
-      },
-      "Safari": {
-        "support": true
-      },
-      "Safari Mobile": {
-        "support": true
-      },
-      "Servo": {
-        "support": true
-      },
-      "status": {
-        "experimental": false,
-        "standardized": true,
-        "stable": true,
-        "obsolete": false
+  "version": "1.0.0",
+  "data": {
+    "http": {
+      "headers": {
+        "Pragma": {
+          "__compat": {
+            "basic_support": {
+              "desc": "Basic support",
+              "support": {
+                "webview_android": {
+                  "version_added": true
+                },
+                "chrome": {
+                  "version_added": true
+                },
+                "chrome_android": {
+                  "version_added": true
+                },
+                "edge": {
+                  "version_added": true
+                },
+                "edge_mobile": {
+                  "version_added": true
+                },
+                "firefox": {
+                  "version_added": true
+                },
+                "firefox_android": {
+                  "version_added": true
+                },
+                "ie": {
+                  "version_added": true
+                },
+                "ie_mobile": {
+                  "version_added": true
+                },
+                "opera": {
+                  "version_added": true
+                },
+                "opera_android": {
+                  "version_added": true
+                },
+                "safari": {
+                  "version_added": true
+                },
+                "safari_ios": {
+                  "version_added": true
+                },
+                "servo": {
+                  "version_added": true
+                }
+              },
+              "status": {
+                "experimental": false,
+                "standard_track": true,
+                "obsolete": false
+              }
+            }
+          }
+        }
       }
     }
   }
diff --git a/http/headers/public-key-pins-report-only.json b/http/headers/public-key-pins-report-only.json
index c657465a4c93c..cd67adc3ec209 100644
--- a/http/headers/public-key-pins-report-only.json
+++ b/http/headers/public-key-pins-report-only.json
@@ -1,55 +1,66 @@
 {
-  "Public-Key-Pins-Report-Only": {
-    "Basic support": {
-      "Android": {
-        "support": true
-      },
-      "Chrome": {
-        "support": "46"
-      },
-      "Chrome for Android": {
-        "support": true
-      },
-      "Edge": {
-        "support": false,
-        "notes": ["<a href=\"https://developer.microsoft.com/en-us/microsoft-edge/platform/status/publickeypinningextensionforhttp\">Under consideration</a> for future release."]
-      },
-      "Edge Mobile": {
-        "support": null
-      },
-      "Firefox": {
-        "support": false,
-        "notes": ["See <a href=\"https://bugzilla.mozilla.org/show_bug.cgi?id=1091177\">Bugzilla bug 1091177</a>."]
-      },
-      "Firefox for Android": {
-        "support": false
-      },
-      "Internet Explorer": {
-        "support": null
-      },
-      "IE Mobile": {
-        "support": null
-      },
-      "Opera": {
-        "support": "33"
-      },
-      "Opera Mobile": {
-        "support": "33"
-      },
-      "Safari": {
-        "support": null
-      },
-      "Safari Mobile": {
-        "support": null
-      },
-      "Servo": {
-        "support": null
-      },
-      "status": {
-        "experimental": false,
-        "standardized": true,
-        "stable": true,
-        "obsolete": false
+  "version": "1.0.0",
+  "data": {
+    "http": {
+      "headers": {
+        "Public-Key-Pins-Report-Only": {
+          "__compat": {
+            "basic_support": {
+              "desc": "Basic support",
+              "status": {
+                "webview_android": {
+                  "version_added": true
+                },
+                "chrome": {
+                  "version_added": "46"
+                },
+                "chrome_android": {
+                  "version_added": true
+                },
+                "edge": {
+                  "version_added": false,
+                  "notes": ["<a href=\"https://developer.microsoft.com/en-us/microsoft-edge/platform/status/publickeypinningextensionforhttp\">Under consideration</a> for future release."]
+                },
+                "edge_mobile": {
+                  "version_added": null
+                },
+                "firefox": {
+                  "version_added": false,
+                  "notes": ["See <a href=\"https://bugzilla.mozilla.org/show_bug.cgi?id=1091177\">Bugzilla bug 1091177</a>."]
+                },
+                "firefox_android": {
+                  "version_added": false
+                },
+                "ie": {
+                  "version_added": null
+                },
+                "ie_mobile": {
+                  "version_added": null
+                },
+                "opera": {
+                  "version_added": "33"
+                },
+                "opera_android": {
+                  "version_added": "33"
+                },
+                "safari": {
+                  "version_added": null
+                },
+                "safari_ios": {
+                  "version_added": null
+                },
+                "servo": {
+                  "version_added": null
+                }
+              },
+              "status": {
+                "experimental": false,
+                "standard_track": true,
+                "obsolete": false
+              }
+            }
+          }
+        }
       }
     }
   }
diff --git a/http/headers/public-key-pins.json b/http/headers/public-key-pins.json
index 9a0c9b9659882..b3375dba6379c 100644
--- a/http/headers/public-key-pins.json
+++ b/http/headers/public-key-pins.json
@@ -1,105 +1,118 @@
 {
-  "Public-Key-Pins": {
-    "Basic support": {
-      "Android": {
-        "support": true
-      },
-      "Chrome": {
-        "support": true
-      },
-      "Chrome for Android": {
-        "support": true
-      },
-      "Edge": {
-        "support": false,
-        "notes": ["<a href=\"https://developer.microsoft.com/en-us/microsoft-edge/platform/status/publickeypinningextensionforhttp\">Under consideration</a> for future release."]
-      },
-      "Edge Mobile": {
-        "support": null
-      },
-      "Firefox": {
-        "support": "35.0"
-      },
-      "Firefox for Android": {
-        "support": "35.0"
-      },
-      "Internet Explorer": {
-        "support": null
-      },
-      "IE Mobile": {
-        "support": null
-      },
-      "Opera": {
-        "support": true
-      },
-      "Opera Mobile": {
-        "support": true
-      },
-      "Safari": {
-        "support": null
-      },
-      "Safari Mobile": {
-        "support": null
-      },
-      "Servo": {
-        "support": null
-      },
-      "status": {
-        "experimental": false,
-        "standardized": true,
-        "stable": true,
-        "obsolete": false
-      }
-    },
-    "report-uri": {
-      "Android": {
-        "support": true
-      },
-      "Chrome": {
-        "support": "46"
-      },
-      "Chrome for Android": {
-        "support": true
-      },
-      "Edge": {
-        "support": null
-      },
-      "Edge Mobile": {
-        "support": null
-      },
-      "Firefox": {
-        "support": false,
-        "notes": ["See <a href=\"https://bugzilla.mozilla.org/show_bug.cgi?id=1091176\">Bugzilla bug 1091176</a>."]
-      },
-      "Firefox for Android": {
-        "support": false
-      },
-      "Internet Explorer": {
-        "support": null
-      },
-      "IE Mobile": {
-        "support": null
-      },
-      "Opera": {
-        "support": "33"
-      },
-      "Opera Mobile": {
-        "support": "33"
-      },
-      "Safari": {
-        "support": null
-      },
-      "Safari Mobile": {
-        "support": null
-      },
-      "Servo": {
-        "support": null
-      },
-      "status": {
-        "experimental": false,
-        "standardized": true,
-        "stable": true,
-        "obsolete": false
+  "version": "1.0.0",
+  "data": {
+    "http": {
+      "headers": {
+        "Public-Key-Pins": {
+          "__compat": {
+            "basic_support": {
+              "desc": "Basic support",
+              "status": {
+                "webview_android": {
+                  "version_added": true
+                },
+                "chrome": {
+                  "version_added": true
+                },
+                "chrome_android": {
+                  "version_added": true
+                },
+                "edge": {
+                  "version_added": false,
+                  "notes": "<a href=\"https://developer.microsoft.com/en-us/microsoft-edge/platform/status/publickeypinningextensionforhttp\">Under consideration</a> for future release."
+                },
+                "edge_mobile": {
+                  "version_added": null
+                },
+                "firefox": {
+                  "version_added": "35.0"
+                },
+                "firefox_android": {
+                  "version_added": "35.0"
+                },
+                "ie": {
+                  "version_added": null
+                },
+                "ie_mobile": {
+                  "version_added": null
+                },
+                "opera": {
+                  "version_added": true
+                },
+                "opera_android": {
+                  "version_added": true
+                },
+                "safari": {
+                  "version_added": null
+                },
+                "safari_ios": {
+                  "version_added": null
+                },
+                "servo": {
+                  "version_added": null
+                }
+              },
+              "status": {
+                "experimental": false,
+                "standard_track": true,
+                "obsolete": false
+              }
+            },
+            "report-uri": {
+              "desc": "report-uri",
+              "status": {
+                "webview_android": {
+                  "version_added": true
+                },
+                "chrome": {
+                  "version_added": "46"
+                },
+                "chrome_android": {
+                  "version_added": true
+                },
+                "edge": {
+                  "version_added": null
+                },
+                "edge_mobile": {
+                  "version_added": null
+                },
+                "firefox": {
+                  "version_added": false,
+                  "notes": "See <a href=\"https://bugzilla.mozilla.org/show_bug.cgi?id=1091176\">Bugzilla bug 1091176</a>."
+                },
+                "firefox_android": {
+                  "version_added": false
+                },
+                "ie": {
+                  "version_added": null
+                },
+                "ie_mobile": {
+                  "version_added": null
+                },
+                "opera": {
+                  "version_added": "33"
+                },
+                "opera_android": {
+                  "version_added": "33"
+                },
+                "safari": {
+                  "version_added": null
+                },
+                "safari_ios": {
+                  "version_added": null
+                },
+                "servo": {
+                  "version_added": null
+                }
+              },
+              "status": {
+                "experimental": false,
+                "standard_track": true,
+                "obsolete": false
+              }
+            }
+          }
+        }
       }
     }
   }
diff --git a/http/headers/range.json b/http/headers/range.json
index eae734fdb1e05..a6108e5ff0165 100644
--- a/http/headers/range.json
+++ b/http/headers/range.json
@@ -1,53 +1,64 @@
 {
-  "Range": {
-    "Basic support": {
-      "Android": {
-        "support": true
-      },
-      "Chrome": {
-        "support": true
-      },
-      "Chrome for Android": {
-        "support": true
-      },
-      "Edge": {
-        "support": true
-      },
-      "Edge Mobile": {
-        "support": true
-      },
-      "Firefox": {
-        "support": true
-      },
-      "Firefox for Android": {
-        "support": true
-      },
-      "Internet Explorer": {
-        "support": true
-      },
-      "IE Mobile": {
-        "support": true
-      },
-      "Opera": {
-        "support": true
-      },
-      "Opera Mobile": {
-        "support": true
-      },
-      "Safari": {
-        "support": true
-      },
-      "Safari Mobile": {
-        "support": true
-      },
-      "Servo": {
-        "support": true
-      },
-      "status": {
-        "experimental": false,
-        "standardized": true,
-        "stable": true,
-        "obsolete": false
+  "version": "1.0.0",
+  "data": {
+    "http": {
+      "headers": {
+        "Range": {
+          "__compat": {
+            "basic_support": {
+              "desc": "Basic support",
+              "status": {
+                "webview_android": {
+                  "version_added": true
+                },
+                "chrome": {
+                  "version_added": true
+                },
+                "chrome_android": {
+                  "version_added": true
+                },
+                "edge": {
+                  "version_added": true
+                },
+                "edge_mobile": {
+                  "version_added": true
+                },
+                "firefox": {
+                  "version_added": true
+                },
+                "firefox_android": {
+                  "version_added": true
+                },
+                "ie": {
+                  "version_added": true
+                },
+                "ie_mobile": {
+                  "version_added": true
+                },
+                "opera": {
+                  "version_added": true
+                },
+                "opera_android": {
+                  "version_added": true
+                },
+                "safari": {
+                  "version_added": true
+                },
+                "safari_ios": {
+                  "version_added": true
+                },
+                "servo": {
+                  "version_added": true
+                }
+              },
+              "status": {
+                "experimental": false,
+                "standard_track": true,
+                "obsolete": false
+              }
+            }
+          }
+        }
       }
     }
   }
diff --git a/http/headers/referer.json b/http/headers/referer.json
index 48c2d7f64d73d..678a05ab8c802 100644
--- a/http/headers/referer.json
+++ b/http/headers/referer.json
@@ -1,53 +1,64 @@
 {
-  "Referer": {
-    "Basic support": {
-      "Android": {
-        "support": true
-      },
-      "Chrome": {
-        "support": true
-      },
-      "Chrome for Android": {
-        "support": true
-      },
-      "Edge": {
-        "support": true
-      },
-      "Edge Mobile": {
-        "support": true
-      },
-      "Firefox": {
-        "support": true
-      },
-      "Firefox for Android": {
-        "support": true
-      },
-      "Internet Explorer": {
-        "support": true
-      },
-      "IE Mobile": {
-        "support": true
-      },
-      "Opera": {
-        "support": true
-      },
-      "Opera Mobile": {
-        "support": true
-      },
-      "Safari": {
-        "support": true
-      },
-      "Safari Mobile": {
-        "support": true
-      },
-      "Servo": {
-        "support": true
-      },
-      "status": {
-        "experimental": false,
-        "standardized": true,
-        "stable": true,
-        "obsolete": false
+  "version": "1.0.0",
+  "data": {
+    "http": {
+      "headers": {
+        "Referer": {
+          "__compat": {
+            "basic_support": {
+              "desc": "Basic support",
+              "support": {
+                "webview_android": {
+                  "version_added": true
+                },
+                "chrome": {
+                  "version_added": true
+                },
+                "chrome_android": {
+                  "version_added": true
+                },
+                "edge": {
+                  "version_added": true
+                },
+                "edge_mobile": {
+                  "version_added": true
+                },
+                "firefox": {
+                  "version_added": true
+                },
+                "firefox_android": {
+                  "version_added": true
+                },
+                "ie": {
+                  "version_added": true
+                },
+                "ie_mobile": {
+                  "version_added": true
+                },
+                "opera": {
+                  "version_added": true
+                },
+                "opera_android": {
+                  "version_added": true
+                },
+                "safari": {
+                  "version_added": true
+                },
+                "safari_ios": {
+                  "version_added": true
+                },
+                "servo": {
+                  "version_added": true
+                }
+              },
+              "status": {
+                "experimental": false,
+                "standard_track": true,
+                "obsolete": false
+              }
+            }
+          }
+        }
       }
     }
   }
diff --git a/http/headers/referrer-policy.json b/http/headers/referrer-policy.json
index aa08d800d0fd2..8799837406d13 100644
--- a/http/headers/referrer-policy.json
+++ b/http/headers/referrer-policy.json
@@ -1,203 +1,220 @@
 {
-  "Referrer-Policy": {
-    "Basic support": {
-      "Android": {
-        "support": false
-      },
-      "Chrome": {
-        "support": "56"
-      },
-      "Chrome for Android": {
-        "support": "56"
-      },
-      "Edge": {
-        "support": false
-      },
-      "Edge Mobile": {
-        "support": false
-      },
-      "Firefox": {
-        "support": "50.0"
-      },
-      "Firefox for Android": {
-        "support": "50.0"
-      },
-      "Internet Explorer": {
-        "support": false
-      },
-      "IE Mobile": {
-        "support": false
-      },
-      "Opera": {
-        "support": "43"
-      },
-      "Opera Mobile": {
-        "support": false
-      },
-      "Safari": {
-        "support": false
-      },
-      "Safari Mobile": {
-        "support": false
-      },
-      "Servo": {
-        "support": false
-      },
-      "status": {
-        "experimental": false,
-        "standardized": true,
-        "stable": true,
-        "obsolete": false
-      }
-    },
-    "same-origin": {
-      "Android": {
-        "support": false
-      },
-      "Chrome": {
-        "support": false
-      },
-      "Chrome for Android": {
-        "support": false
-      },
-      "Edge": {
-        "support": false
-      },
-      "Edge Mobile": {
-        "support": false
-      },
-      "Firefox": {
-        "support": "52.0"
-      },
-      "Firefox for Android": {
-        "support": "52.0"
-      },
-      "Internet Explorer": {
-        "support": false
-      },
-      "IE Mobile": {
-        "support": false
-      },
-      "Opera": {
-        "support": false
-      },
-      "Opera Mobile": {
-        "support": false
-      },
-      "Safari": {
-        "support": false
-      },
-      "Safari Mobile": {
-        "support": false
-      },
-      "Servo": {
-        "support": null
-      },
-      "status": {
-        "experimental": false,
-        "standardized": false,
-        "stable": true,
-        "obsolete": false
-      }
-    },
-    "strict-origin": {
-      "Android": {
-        "support": false
-      },
-      "Chrome": {
-        "support": false
-      },
-      "Chrome for Android": {
-        "support": false
-      },
-      "Edge": {
-        "support": false
-      },
-      "Edge Mobile": {
-        "support": false
-      },
-      "Firefox": {
-        "support": "52.0"
-      },
-      "Firefox for Android": {
-        "support": "52.0"
-      },
-      "Internet Explorer": {
-        "support": false
-      },
-      "IE Mobile": {
-        "support": false
-      },
-      "Opera": {
-        "support": false
-      },
-      "Opera Mobile": {
-        "support": false
-      },
-      "Safari": {
-        "support": false
-      },
-      "Safari Mobile": {
-        "support": false
-      },
-      "Servo": {
-        "support": null
-      },
-      "status": {
-        "experimental": false,
-        "standardized": false,
-        "stable": true,
-        "obsolete": false
-      }
-    },
-    "strict-origin-when-cross-origin": {
-      "Android": {
-        "support": false
-      },
-      "Chrome": {
-        "support": false
-      },
-      "Chrome for Android": {
-        "support": false
-      },
-      "Edge": {
-        "support": false
-      },
-      "Edge Mobile": {
-        "support": false
-      },
-      "Firefox": {
-        "support": "52.0"
-      },
-      "Firefox for Android": {
-        "support": "52.0"
-      },
-      "Internet Explorer": {
-        "support": false
-      },
-      "IE Mobile": {
-        "support": false
-      },
-      "Opera": {
-        "support": false
-      },
-      "Opera Mobile": {
-        "support": false
-      },
-      "Safari": {
-        "support": false
-      },
-      "Safari Mobile": {
-        "support": false
-      },
-      "Servo": {
-        "support": null
-      },
-      "status": {
-        "experimental": false,
-        "standardized": false,
-        "stable": true,
-        "obsolete": false
+  "version": "1.0.0",
+  "data": {
+    "http": {
+      "headers": {
+        "Referrer-Policy": {
+          "__compat": {
+            "basic_support": {
+              "desc": "Basic support",
+              "status": {
+                "webview_android": {
+                  "version_added": "56.0"
+                },
+                "chrome": {
+                  "version_added": "56.0"
+                },
+                "chrome_android": {
+                  "version_added": false
+                },
+                "edge": {
+                  "version_added": false
+                },
+                "edge_mobile": {
+                  "version_added": false
+                },
+                "firefox": {
+                  "version_added": "50.0"
+                },
+                "firefox_android": {
+                  "version_added": "50.0"
+                },
+                "ie": {
+                  "version_added": false
+                },
+                "ie_mobile": {
+                  "version_added": false
+                },
+                "opera": {
+                  "version_added": false
+                },
+                "opera_android": {
+                  "version_added": false
+                },
+                "safari": {
+                  "version_added": false
+                },
+                "safari_ios": {
+                  "version_added": false
+                },
+                "servo": {
+                  "version_added": false
+                }
+              },
+              "status": {
+                "experimental": false,
+                "standard_track": true,
+                "obsolete": false
+              }
+            },
+            "same-origin": {
+              "desc": "same-origin",
+              "status": {
+                "webview_android": {
+                  "version_added": false
+                },
+                "chrome": {
+                  "version_added": false
+                },
+                "chrome_android": {
+                  "version_added": false
+                },
+                "edge": {
+                  "version_added": false
+                },
+                "edge_mobile": {
+                  "version_added": false
+                },
+                "firefox": {
+                  "version_added": "52.0"
+                },
+                "firefox_android": {
+                  "version_added": "52.0"
+                },
+                "ie": {
+                  "version_added": false
+                },
+                "ie_mobile": {
+                  "version_added": false
+                },
+                "opera": {
+                  "version_added": false
+                },
+                "opera_android": {
+                  "version_added": false
+                },
+                "safari": {
+                  "version_added": false
+                },
+                "safari_ios": {
+                  "version_added": false
+                },
+                "servo": {
+                  "version_added": null
+                }
+              },
+              "status": {
+                "experimental": false,
+                "standard_track": false,
+                "obsolete": false
+              }
+            },
+            "strict-origin": {
+              "desc": "strict-origin",
+              "status": {
+                "webview_android": {
+                  "version_added": false
+                },
+                "chrome": {
+                  "version_added": false
+                },
+                "chrome_android": {
+                  "version_added": false
+                },
+                "edge": {
+                  "version_added": false
+                },
+                "edge_mobile": {
+                  "version_added": false
+                },
+                "firefox": {
+                  "version_added": "52.0"
+                },
+                "firefox_android": {
+                  "version_added": "52.0"
+                },
+                "ie": {
+                  "version_added": false
+                },
+                "ie_mobile": {
+                  "version_added": false
+                },
+                "opera": {
+                  "version_added": false
+                },
+                "opera_android": {
+                  "version_added": false
+                },
+                "safari": {
+                  "version_added": false
+                },
+                "safari_ios": {
+                  "version_added": false
+                },
+                "servo": {
+                  "version_added": null
+                }
+              },
+              "status": {
+                "experimental": false,
+                "standard_track": false,
+                "obsolete": false
+              }
+            },
+            "strict-origin-when-cross-origin": {
+              "desc": "strict-origin-when-cross-origin",
+              "status": {
+                "webview_android": {
+                  "version_added": false
+                },
+                "chrome": {
+                  "version_added": false
+                },
+                "chrome_android": {
+                  "version_added": false
+                },
+                "edge": {
+                  "version_added": false
+                },
+                "edge_mobile": {
+                  "version_added": false
+                },
+                "firefox": {
+                  "version_added": "52.0"
+                },
+                "firefox_android": {
+                  "version_added": "52.0"
+                },
+                "ie": {
+                  "version_added": false
+                },
+                "ie_mobile": {
+                  "version_added": false
+                },
+                "opera": {
+                  "version_added": false
+                },
+                "opera_android": {
+                  "version_added": false
+                },
+                "safari": {
+                  "version_added": false
+                },
+                "safari_ios": {
+                  "version_added": false
+                },
+                "servo": {
+                  "version_added": null
+                }
+              },
+              "status": {
+                "experimental": false,
+                "standard_track": false,
+                "obsolete": false
+              }
+            }
+          }
+        }
       }
     }
   }
diff --git a/http/headers/retry-after.json b/http/headers/retry-after.json
index f1971894f71e8..5b2af8d58fe3f 100644
--- a/http/headers/retry-after.json
+++ b/http/headers/retry-after.json
@@ -1,54 +1,65 @@
 {
-  "Retry-After": {
-    "Basic support": {
-      "Android": {
-        "support": null
-      },
-      "Chrome": {
-        "support": null
-      },
-      "Chrome for Android": {
-        "support": null
-      },
-      "Edge": {
-        "support": true
-      },
-      "Edge Mobile": {
-        "support": true
-      },
-      "Firefox": {
-        "support": false,
-        "notes": ["See <a href=\"https://bugzilla.mozilla.org/show_bug.cgi?id=230260\">Bug 230260</a>."]
-      },
-      "Firefox for Android": {
-        "support": null
-      },
-      "Internet Explorer": {
-        "support": null
-      },
-      "IE Mobile": {
-        "support": null
-      },
-      "Opera": {
-        "support": null
-      },
-      "Opera Mobile": {
-        "support": null
-      },
-      "Safari": {
-        "support": null
-      },
-      "Safari Mobile": {
-        "support": null
-      },
-      "Servo": {
-        "support": null
-      },
-      "status": {
-        "experimental": false,
-        "standardized": true,
-        "stable": true,
-        "obsolete": false
+  "version": "1.0.0",
+  "data": {
+    "http": {
+      "headers": {
+        "Retry-After": {
+          "__compat": {
+            "basic_support": {
+              "desc": "Basic support",
+              "status": {
+                "webview_android": {
+                  "version_added": null
+                },
+                "chrome": {
+                  "version_added": null
+                },
+                "chrome_android": {
+                  "version_added": null
+                },
+                "edge": {
+                  "version_added": true
+                },
+                "edge_mobile": {
+                  "version_added": true
+                },
+                "firefox": {
+                  "version_added": false,
+                  "notes": ["See <a href=\"https://bugzilla.mozilla.org/show_bug.cgi?id=230260\">Bug 230260</a>."]
+                },
+                "firefox_android": {
+                  "version_added": null
+                },
+                "ie": {
+                  "version_added": null
+                },
+                "ie_mobile": {
+                  "version_added": null
+                },
+                "opera": {
+                  "version_added": null
+                },
+                "opera_android": {
+                  "version_added": null
+                },
+                "safari": {
+                  "version_added": null
+                },
+                "safari_ios": {
+                  "version_added": null
+                },
+                "servo": {
+                  "version_added": null
+                }
+              },
+              "status": {
+                "experimental": false,
+                "standard_track": true,
+                "obsolete": false
+              }
+            }
+          }
+        }
       }
     }
   }
diff --git a/http/headers/server.json b/http/headers/server.json
index a2e803a2d57ab..406a5b5b325e9 100644
--- a/http/headers/server.json
+++ b/http/headers/server.json
@@ -1,53 +1,64 @@
 {
-  "Server": {
-    "Basic support": {
-      "Android": {
-        "support": true
-      },
-      "Chrome": {
-        "support": true
-      },
-      "Chrome for Android": {
-        "support": true
-      },
-      "Edge": {
-        "support": true
-      },
-      "Edge Mobile": {
-        "support": true
-      },
-      "Firefox": {
-        "support": true
-      },
-      "Firefox for Android": {
-        "support": true
-      },
-      "Internet Explorer": {
-        "support": true
-      },
-      "IE Mobile": {
-        "support": true
-      },
-      "Opera": {
-        "support": true
-      },
-      "Opera Mobile": {
-        "support": true
-      },
-      "Safari": {
-        "support": true
-      },
-      "Safari Mobile": {
-        "support": true
-      },
-      "Servo": {
-        "support": true
-      },
-      "status": {
-        "experimental": false,
-        "standardized": true,
-        "stable": true,
-        "obsolete": false
+  "version": "1.0.0",
+  "data": {
+    "http": {
+      "headers": {
+        "Server": {
+          "__compat": {
+            "basic_support": {
+              "desc": "Basic support",
+              "support": {
+                "webview_android": {
+                  "version_added": true
+                },
+                "chrome": {
+                  "version_added": true
+                },
+                "chrome_android": {
+                  "version_added": true
+                },
+                "edge": {
+                  "version_added": true
+                },
+                "edge_mobile": {
+                  "version_added": true
+                },
+                "firefox": {
+                  "version_added": true
+                },
+                "firefox_android": {
+                  "version_added": true
+                },
+                "ie": {
+                  "version_added": true
+                },
+                "ie_mobile": {
+                  "version_added": true
+                },
+                "opera": {
+                  "version_added": true
+                },
+                "opera_android": {
+                  "version_added": true
+                },
+                "safari": {
+                  "version_added": true
+                },
+                "safari_ios": {
+                  "version_added": true
+                },
+                "servo": {
+                  "version_added": true
+                }
+              },
+              "status": {
+                "experimental": false,
+                "standard_track": true,
+                "obsolete": false
+              }
+            }
+          }
+        }
       }
     }
   }
diff --git a/http/headers/set-cookie.json b/http/headers/set-cookie.json
index 6381acc6ad980..a25370f466bd8 100644
--- a/http/headers/set-cookie.json
+++ b/http/headers/set-cookie.json
@@ -1,255 +1,274 @@
 {
-  "Set-Cookie": {
-    "Basic support": {
-      "Android": {
-        "support": true
-      },
-      "Chrome": {
-        "support": true
-      },
-      "Chrome for Android": {
-        "support": true
-      },
-      "Edge": {
-        "support": true
-      },
-      "Edge Mobile": {
-        "support": true
-      },
-      "Firefox": {
-        "support": true
-      },
-      "Firefox for Android": {
-        "support": true
-      },
-      "Internet Explorer": {
-        "support": true
-      },
-      "IE Mobile": {
-        "support": true
-      },
-      "Opera": {
-        "support": true
-      },
-      "Opera Mobile": {
-        "support": true
-      },
-      "Safari": {
-        "support": true
-      },
-      "Safari Mobile": {
-        "support": true
-      },
-      "Servo": {
-        "support": null
-      },
-      "status": {
-        "experimental": false,
-        "standardized": true,
-        "stable": true,
-        "obsolete": false
-      }
-    },
-    "Max-Age": {
-      "Android": {
-        "support": true
-      },
-      "Chrome": {
-        "support": true
-      },
-      "Chrome for Android": {
-        "support": true
-      },
-      "Edge": {
-        "support": true
-      },
-      "Edge Mobile": {
-        "support": true
-      },
-      "Firefox": {
-        "support": true
-      },
-      "Firefox for Android": {
-        "support": true
-      },
-      "Internet Explorer": {
-        "support": "8.0"
-      },
-      "IE Mobile": {
-        "support": true
-      },
-      "Opera": {
-        "support": true
-      },
-      "Opera Mobile": {
-        "support": true
-      },
-      "Safari": {
-        "support": true
-      },
-      "Safari Mobile": {
-        "support": true
-      },
-      "Servo": {
-        "support": null
-      },
-      "status": {
-        "experimental": false,
-        "standardized": true,
-        "stable": true,
-        "obsolete": false
-      }
-    },
-    "HttpOnly": {
-      "Android": {
-        "support": null
-      },
-      "Chrome": {
-        "support": "1.0"
-      },
-      "Chrome for Android": {
-        "support": true
-      },
-      "Edge": {
-        "support": true
-      },
-      "Edge Mobile": {
-        "support": true
-      },
-      "Firefox": {
-        "support": "3.0"
-      },
-      "Firefox for Android": {
-        "support": "1.0"
-      },
-      "Internet Explorer": {
-        "support": "9.0"
-      },
-      "IE Mobile": {
-        "support": true
-      },
-      "Opera": {
-        "support": "11"
-      },
-      "Opera Mobile": {
-        "support": true
-      },
-      "Safari": {
-        "support": "5.0"
-      },
-      "Safari Mobile": {
-        "support": "iOS 4"
-      },
-      "Servo": {
-        "support": null
-      },
-      "status": {
-        "experimental": false,
-        "standardized": true,
-        "stable": true,
-        "obsolete": false
-      }
-    },
-    "Cookie prefixes": {
-      "Android": {
-        "support": null
-      },
-      "Chrome": {
-        "support": "49"
-      },
-      "Chrome for Android": {
-        "support": "49"
-      },
-      "Edge": {
-        "support": true
-      },
-      "Edge Mobile": {
-        "support": true
-      },
-      "Firefox": {
-        "support": "50"
-      },
-      "Firefox for Android": {
-        "support": "50"
-      },
-      "Internet Explorer": {
-        "support": null
-      },
-      "IE Mobile": {
-        "support": null
-      },
-      "Opera": {
-        "support": "36"
-      },
-      "Opera Mobile": {
-        "support": "36"
-      },
-      "Safari": {
-        "support": true
-      },
-      "Safari Mobile": {
-        "support": true
-      },
-      "Servo": {
-        "support": null
-      },
-      "status": {
-        "experimental": false,
-        "standardized": true,
-        "stable": true,
-        "obsolete": false
-      }
-    },
-    "SameSite": {
-      "Android": {
-        "support": "51"
-      },
-      "Chrome": {
-        "support": "51"
-      },
-      "Chrome for Android": {
-        "support": "51"
-      },
-      "Edge": {
-        "support": false
-      },
-      "Edge Mobile": {
-        "support": false
-      },
-      "Firefox": {
-        "support": false,
-        "notes": ["See <a href=\"https://bugzilla.mozilla.org/show_bug.cgi?id=795346\">Bugzilla bug 795346</a>."]
-      },
-      "Firefox for Android": {
-        "support": false,
-        "notes": ["See <a href=\"https://bugzilla.mozilla.org/show_bug.cgi?id=795346\">Bugzilla bug 795346</a>."]
-      },
-      "Internet Explorer": {
-        "support": false
-      },
-      "IE Mobile": {
-        "support": false
-      },
-      "Opera": {
-        "support": "39"
-      },
-      "Opera Mobile": {
-        "support": "39"
-      },
-      "Safari": {
-        "support": false
-      },
-      "Safari Mobile": {
-        "support": false
-      },
-      "Servo": {
-        "support": null
-      },
-      "status": {
-        "experimental": false,
-        "standardized": true,
-        "stable": true,
-        "obsolete": false
+  "version": "1.0.0",
+  "data": {
+    "http": {
+      "headers": {
+        "Set-Cookie": {
+          "__compat": {
+            "basic_support": {
+              "desc": "Basic support",
+              "support": {
+                "webview_android": {
+                  "version_added": true
+                },
+                "chrome": {
+                  "version_added": true
+                },
+                "chrome_android": {
+                  "version_added": true
+                },
+                "edge": {
+                  "version_added": true
+                },
+                "edge_mobile": {
+                  "version_added": true
+                },
+                "firefox": {
+                  "version_added": true
+                },
+                "firefox_android": {
+                  "version_added": true
+                },
+                "ie": {
+                  "version_added": true
+                },
+                "ie_mobile": {
+                  "version_added": true
+                },
+                "opera": {
+                  "version_added": true
+                },
+                "opera_android": {
+                  "version_added": true
+                },
+                "safari": {
+                  "version_added": true
+                },
+                "safari_ios": {
+                  "version_added": true
+                },
+                "servo": {
+                  "version_added": null
+                }
+              },
+              "status": {
+                "experimental": false,
+                "standard_track": true,
+                "obsolete": false
+              }
+            },
+            "Max-Age": {
+              "desc": "<code>Max-Age</code>",
+              "support": {
+                "webview_android": {
+                  "version_added": true
+                },
+                "chrome": {
+                  "version_added": true
+                },
+                "chrome_android": {
+                  "version_added": true
+                },
+                "edge": {
+                  "version_added": true
+                },
+                "edge_mobile": {
+                  "version_added": true
+                },
+                "firefox": {
+                  "version_added": true
+                },
+                "firefox_android": {
+                  "version_added": true
+                },
+                "ie": {
+                  "version_added": "8.0"
+                },
+                "ie_mobile": {
+                  "version_added": true
+                },
+                "opera": {
+                  "version_added": true
+                },
+                "opera_android": {
+                  "version_added": true
+                },
+                "safari": {
+                  "version_added": true
+                },
+                "safari_ios": {
+                  "version_added": true
+                },
+                "servo": {
+                  "version_added": null
+                }
+              },
+              "status": {
+                "experimental": false,
+                "standard_track": true,
+                "obsolete": false
+              }
+            },
+            "HttpOnly": {
+              "desc": "Basic support",
+              "support": {
+                "webview_android": {
+                  "version_added": null
+                },
+                "chrome": {
+                  "version_added": "1.0"
+                },
+                "chrome_android": {
+                  "version_added": true
+                },
+                "edge": {
+                  "version_added": true
+                },
+                "edge_mobile": {
+                  "version_added": true
+                },
+                "firefox": {
+                  "version_added": "3.0"
+                },
+                "firefox_android": {
+                  "version_added": "1.0"
+                },
+                "ie": {
+                  "version_added": "9.0"
+                },
+                "ie_mobile": {
+                  "version_added": true
+                },
+                "opera": {
+                  "version_added": "11"
+                },
+                "opera_android": {
+                  "version_added": true
+                },
+                "safari": {
+                  "version_added": "5.0"
+                },
+                "safari_ios": {
+                  "version_added": "iOS 4"
+                },
+                "servo": {
+                  "version_added": null
+                }
+              },
+              "status": {
+                "experimental": false,
+                "standard_track": true,
+                "obsolete": false
+              }
+            },
+            "Cookie prefixes": {
+              "desc": "Cookie prefixes",
+              "support": {
+                "webview_android": {
+                  "version_added": null
+                },
+                "chrome": {
+                  "version_added": "49"
+                },
+                "chrome_android": {
+                  "version_added": "49"
+                },
+                "edge": {
+                  "version_added": true
+                },
+                "edge_mobile": {
+                  "version_added": true
+                },
+                "firefox": {
+                  "version_added": "50"
+                },
+                "firefox_android": {
+                  "version_added": "50"
+                },
+                "ie": {
+                  "version_added": null
+                },
+                "ie_mobile": {
+                  "version_added": null
+                },
+                "opera": {
+                  "version_added": "36"
+                },
+                "opera_android": {
+                  "version_added": "36"
+                },
+                "safari": {
+                  "version_added": true
+                },
+                "safari_ios": {
+                  "version_added": true
+                },
+                "servo": {
+                  "version_added": null
+                }
+              },
+              "status": {
+                "experimental": false,
+                "standard_track": true,
+                "obsolete": false
+              }
+            },
+            "SameSite": {
+              "desc": "<code>SameSite</code>",
+              "support": {
+                "webview_android": {
+                  "version_added": "51"
+                },
+                "chrome": {
+                  "version_added": "51"
+                },
+                "chrome_android": {
+                  "version_added": "51"
+                },
+                "edge": {
+                  "version_added": false
+                },
+                "edge_mobile": {
+                  "version_added": false
+                },
+                "firefox": {
+                  "version_added": false,
+                  "notes": "See <a href=\"https://bugzilla.mozilla.org/show_bug.cgi?id=795346\">bug 795346</a> on Bugzilla."
+                },
+                "firefox_android": {
+                  "version_added": false,
+                  "notes": "See <a href=\"https://bugzilla.mozilla.org/show_bug.cgi?id=795346\">bug 795346</a> on Bugzilla."
+                },
+                "ie": {
+                  "version_added": false
+                },
+                "ie_mobile": {
+                  "version_added": false
+                },
+                "opera": {
+                  "version_added": "39"
+                },
+                "opera_android": {
+                  "version_added": "39"
+                },
+                "safari": {
+                  "version_added": false
+                },
+                "safari_ios": {
+                  "version_added": false
+                },
+                "servo": {
+                  "version_added": null
+                }
+              },
+              "status": {
+                "experimental": false,
+                "standard_track": true,
+                "obsolete": false
+              }
+            }
+          }
+        }
       }
     }
   }
diff --git a/http/headers/set-cookie2.json b/http/headers/set-cookie2.json
index f0e0c034b1060..03674e526ccc0 100644
--- a/http/headers/set-cookie2.json
+++ b/http/headers/set-cookie2.json
@@ -1,53 +1,64 @@
 {
-  "Set-Cookie2": {
-    "Basic support": {
-      "Android": {
-        "support": false
-      },
-      "Chrome": {
-        "support": false
-      },
-      "Chrome for Android": {
-        "support": false
-      },
-      "Edge": {
-        "support": false
-      },
-      "Edge Mobile": {
-        "support": false
-      },
-      "Firefox": {
-        "support": false
-      },
-      "Firefox for Android": {
-        "support": false
-      },
-      "Internet Explorer": {
-        "support": false
-      },
-      "IE Mobile": {
-        "support": false
-      },
-      "Opera": {
-        "support": false
-      },
-      "Opera Mobile": {
-        "support": false
-      },
-      "Safari": {
-        "support": false
-      },
-      "Safari Mobile": {
-        "support": false
-      },
-      "Servo": {
-        "support": false
-      },
-      "status": {
-        "experimental": false,
-        "standardized": true,
-        "stable": true,
-        "obsolete": true
+  "version": "1.0.0",
+  "data": {
+    "http": {
+      "headers": {
+        "Set-Cookie2": {
+          "__compat": {
+            "basic_support": {
+              "desc": "Basic support",
+              "support": {
+                "webview_android": {
+                  "version_added": false
+                },
+                "chrome": {
+                  "version_added": false
+                },
+                "chrome_android": {
+                  "version_added": false
+                },
+                "edge": {
+                  "version_added": false
+                },
+                "edge_mobile": {
+                  "version_added": false
+                },
+                "firefox": {
+                  "version_added": false
+                },
+                "firefox_android": {
+                  "version_added": false
+                },
+                "ie": {
+                  "version_added": false
+                },
+                "ie_mobile": {
+                  "version_added": false
+                },
+                "opera": {
+                  "version_added": false
+                },
+                "opera_android": {
+                  "version_added": false
+                },
+                "safari": {
+                  "version_added": false
+                },
+                "safari_ios": {
+                  "version_added": false
+                },
+                "servo": {
+                  "version_added": false
+                }
+              },
+              "status": {
+                "experimental": false,
+                "standard_track": true,
+                "obsolete": true
+              }
+            }
+          }
+        }
       }
     }
   }
diff --git a/http/headers/strict-transport-security.json b/http/headers/strict-transport-security.json
index ebd9d39aa83d7..4b3fd7dd19f77 100644
--- a/http/headers/strict-transport-security.json
+++ b/http/headers/strict-transport-security.json
@@ -1,53 +1,64 @@
 {
-  "Strict-Transport-Security": {
-    "Basic support": {
-      "Android": {
-        "support": "4.4"
-      },
-      "Chrome": {
-        "support": "4.0"
-      },
-      "Chrome for Android": {
-        "support": "18"
-      },
-      "Edge": {
-        "support": "12"
-      },
-      "Edge Mobile": {
-        "support": true
-      },
-      "Firefox": {
-        "support": "4"
-      },
-      "Firefox for Android": {
-        "support": true
-      },
-      "Internet Explorer": {
-        "support": "11"
-      },
-      "IE Mobile": {
-        "support": null
-      },
-      "Opera": {
-        "support": "12"
-      },
-      "Opera Mobile": {
-        "support": null
-      },
-      "Safari": {
-        "support": "7"
-      },
-      "Safari Mobile": {
-        "support": "8.4"
-      },
-      "Servo": {
-        "support": null
-      },
-      "status": {
-        "experimental": false,
-        "standardized": true,
-        "stable": true,
-        "obsolete": true
+  "version": "1.0.0",
+  "data": {
+    "http": {
+      "headers": {
+        "Strict-Transport-Security": {
+          "__compat": {
+            "basic_support": {
+              "desc": "Basic support",
+              "support": {
+                "webview_android": {
+                  "version_added": "4.4"
+                },
+                "chrome": {
+                  "version_added": "4.0"
+                },
+                "chrome_android": {
+                  "version_added": "18"
+                },
+                "edge": {
+                  "version_added": "12"
+                },
+                "edge_mobile": {
+                  "version_added": true
+                },
+                "firefox": {
+                  "version_added": "4"
+                },
+                "firefox_android": {
+                  "version_added": true
+                },
+                "ie": {
+                  "version_added": "11"
+                },
+                "ie_mobile": {
+                  "version_added": null
+                },
+                "opera": {
+                  "version_added": "12"
+                },
+                "opera_android": {
+                  "version_added": null
+                },
+                "safari": {
+                  "version_added": "7"
+                },
+                "safari_ios": {
+                  "version_added": "8.4"
+                },
+                "servo": {
+                  "version_added": null
+                }
+              },
+              "status": {
+                "experimental": false,
+                "standard_track": true,
+                "obsolete": true
+              }
+            }
+          }
+        }
       }
     }
   }
diff --git a/http/headers/te.json b/http/headers/te.json
index c3268458d9bf6..28dd48dcd8733 100644
--- a/http/headers/te.json
+++ b/http/headers/te.json
@@ -1,53 +1,64 @@
 {
-  "TE": {
-    "Basic support": {
-      "Android": {
-        "support": true
-      },
-      "Chrome": {
-        "support": true
-      },
-      "Chrome for Android": {
-        "support": true
-      },
-      "Edge": {
-        "support": true
-      },
-      "Edge Mobile": {
-        "support": true
-      },
-      "Firefox": {
-        "support": true
-      },
-      "Firefox for Android": {
-        "support": true
-      },
-      "Internet Explorer": {
-        "support": true
-      },
-      "IE Mobile": {
-        "support": true
-      },
-      "Opera": {
-        "support": true
-      },
-      "Opera Mobile": {
-        "support": true
-      },
-      "Safari": {
-        "support": true
-      },
-      "Safari Mobile": {
-        "support": true
-      },
-      "Servo": {
-        "support": true
-      },
-      "status": {
-        "experimental": false,
-        "standardized": true,
-        "stable": true,
-        "obsolete": false
+  "version": "1.0.0",
+  "data": {
+    "http": {
+      "headers": {
+        "TE": {
+          "__compat": {
+            "basic_support": {
+              "desc": "Basic support",
+              "support": {
+                "webview_android": {
+                  "version_added": true
+                },
+                "chrome": {
+                  "version_added": true
+                },
+                "chrome_android": {
+                  "version_added": true
+                },
+                "edge": {
+                  "version_added": true
+                },
+                "edge_mobile": {
+                  "version_added": true
+                },
+                "firefox": {
+                  "version_added": true
+                },
+                "firefox_android": {
+                  "version_added": true
+                },
+                "ie": {
+                  "version_added": true
+                },
+                "ie_mobile": {
+                  "version_added": true
+                },
+                "opera": {
+                  "version_added": true
+                },
+                "opera_android": {
+                  "version_added": true
+                },
+                "safari": {
+                  "version_added": true
+                },
+                "safari_ios": {
+                  "version_added": true
+                },
+                "servo": {
+                  "version_added": true
+                }
+              },
+              "status": {
+                "experimental": false,
+                "standard_track": true,
+                "obsolete": false
+              }
+            }
+          }
+        }
       }
     }
   }
diff --git a/http/headers/trailer.json b/http/headers/trailer.json
index 0cde69ca5bf0d..e86f7a0110d9a 100644
--- a/http/headers/trailer.json
+++ b/http/headers/trailer.json
@@ -1,53 +1,64 @@
 {
-  "Trailer": {
-    "Basic support": {
-      "Android": {
-        "support": true
-      },
-      "Chrome": {
-        "support": true
-      },
-      "Chrome for Android": {
-        "support": true
-      },
-      "Edge": {
-        "support": true
-      },
-      "Edge Mobile": {
-        "support": true
-      },
-      "Firefox": {
-        "support": true
-      },
-      "Firefox for Android": {
-        "support": true
-      },
-      "Internet Explorer": {
-        "support": true
-      },
-      "IE Mobile": {
-        "support": true
-      },
-      "Opera": {
-        "support": true
-      },
-      "Opera Mobile": {
-        "support": true
-      },
-      "Safari": {
-        "support": true
-      },
-      "Safari Mobile": {
-        "support": true
-      },
-      "Servo": {
-        "support": true
-      },
-      "status": {
-        "experimental": false,
-        "standardized": true,
-        "stable": true,
-        "obsolete": false
+  "version": "1.0.0",
+  "data": {
+    "http": {
+      "headers": {
+        "Trailer": {
+          "__compat": {
+            "basic_support": {
+              "desc": "Basic support",
+              "support": {
+                "webview_android": {
+                  "version_added": true
+                },
+                "chrome": {
+                  "version_added": true
+                },
+                "chrome_android": {
+                  "version_added": true
+                },
+                "edge": {
+                  "version_added": true
+                },
+                "edge_mobile": {
+                  "version_added": true
+                },
+                "firefox": {
+                  "version_added": true
+                },
+                "firefox_android": {
+                  "version_added": true
+                },
+                "ie": {
+                  "version_added": true
+                },
+                "ie_mobile": {
+                  "version_added": true
+                },
+                "opera": {
+                  "version_added": true
+                },
+                "opera_android": {
+                  "version_added": true
+                },
+                "safari": {
+                  "version_added": true
+                },
+                "safari_ios": {
+                  "version_added": true
+                },
+                "servo": {
+                  "version_added": true
+                }
+              },
+              "status": {
+                "experimental": false,
+                "standard_track": true,
+                "obsolete": false
+              }
+            }
+          }
+        }
       }
     }
   }
diff --git a/http/headers/transfer-encoding.json b/http/headers/transfer-encoding.json
index d25abb6209fd9..06d3e6ed836c1 100644
--- a/http/headers/transfer-encoding.json
+++ b/http/headers/transfer-encoding.json
@@ -1,53 +1,64 @@
 {
-  "Transfer-Encoding": {
-    "Basic support": {
-      "Android": {
-        "support": true
-      },
-      "Chrome": {
-        "support": true
-      },
-      "Chrome for Android": {
-        "support": true
-      },
-      "Edge": {
-        "support": true
-      },
-      "Edge Mobile": {
-        "support": true
-      },
-      "Firefox": {
-        "support": true
-      },
-      "Firefox for Android": {
-        "support": true
-      },
-      "Internet Explorer": {
-        "support": true
-      },
-      "IE Mobile": {
-        "support": true
-      },
-      "Opera": {
-        "support": true
-      },
-      "Opera Mobile": {
-        "support": true
-      },
-      "Safari": {
-        "support": true
-      },
-      "Safari Mobile": {
-        "support": true
-      },
-      "Servo": {
-        "support": true
-      },
-      "status": {
-        "experimental": false,
-        "standardized": true,
-        "stable": true,
-        "obsolete": false
+  "version": "1.0.0",
+  "data": {
+    "http": {
+      "headers": {
+        "Transfer-Encoding": {
+          "__compat": {
+            "basic_support": {
+              "desc": "Basic support",
+              "support": {
+                "webview_android": {
+                  "version_added": true
+                },
+                "chrome": {
+                  "version_added": true
+                },
+                "chrome_android": {
+                  "version_added": true
+                },
+                "edge": {
+                  "version_added": true
+                },
+                "edge_mobile": {
+                  "version_added": true
+                },
+                "firefox": {
+                  "version_added": true
+                },
+                "firefox_android": {
+                  "version_added": true
+                },
+                "ie": {
+                  "version_added": true
+                },
+                "ie_mobile": {
+                  "version_added": true
+                },
+                "opera": {
+                  "version_added": true
+                },
+                "opera_android": {
+                  "version_added": true
+                },
+                "safari": {
+                  "version_added": true
+                },
+                "safari_ios": {
+                  "version_added": true
+                },
+                "servo": {
+                  "version_added": true
+                }
+              },
+              "status": {
+                "experimental": false,
+                "standard_track": true,
+                "obsolete": false
+              }
+            }
+          }
+        }
       }
     }
   }
diff --git a/http/headers/upgrade-insecure-requests.json b/http/headers/upgrade-insecure-requests.json
index 6c6c04e39755f..bdc5aca92f5b1 100644
--- a/http/headers/upgrade-insecure-requests.json
+++ b/http/headers/upgrade-insecure-requests.json
@@ -1,54 +1,65 @@
 {
-  "Upgrade-Insecure-Requests": {
-    "Basic support": {
-      "Android": {
-        "support": null
-      },
-      "Chrome": {
-        "support": "44"
-      },
-      "Chrome for Android": {
-        "support": "44"
-      },
-      "Edge": {
-        "support": false,
-        "notes": ["<a href=\"https://developer.microsoft.com/en-us/microsoft-edge/platform/status/cspupgradeinsecurerequestsdirective\">Under consideration</a> for future release."]
-      },
-      "Edge Mobile": {
-        "support": false
-      },
-      "Firefox": {
-        "support": "48.0"
-      },
-      "Firefox for Android": {
-        "support": "48.0"
-      },
-      "Internet Explorer": {
-        "support": false
-      },
-      "IE Mobile": {
-        "support": null
-      },
-      "Opera": {
-        "support": null
-      },
-      "Opera Mobile": {
-        "support": null
-      },
-      "Safari": {
-        "support": null
-      },
-      "Safari Mobile": {
-        "support": null
-      },
-      "Servo": {
-        "support": null
-      },
-      "status": {
-        "experimental": false,
-        "standardized": true,
-        "stable": true,
-        "obsolete": false
+  "version": "1.0.0",
+  "data": {
+    "http": {
+      "headers": {
+        "Upgrade-Insecure-Requests": {
+          "__compat": {
+            "basic_support": {
+              "desc": "Basic support",
+              "status": {
+                "webview_android": {
+                  "version_added": null
+                },
+                "chrome": {
+                  "version_added": "44"
+                },
+                "chrome_android": {
+                  "version_added": "44"
+                },
+                "edge": {
+                  "version_added": false,
+                  "notes": "<a href=\"https://developer.microsoft.com/en-us/microsoft-edge/platform/status/cspupgradeinsecurerequestsdirective\">Under consideration</a> for future release."
+                },
+                "edge_mobile": {
+                  "version_added": false
+                },
+                "firefox": {
+                  "version_added": "48.0"
+                },
+                "firefox_android": {
+                  "version_added": "48.0"
+                },
+                "ie": {
+                  "version_added": false
+                },
+                "ie_mobile": {
+                  "version_added": null
+                },
+                "opera": {
+                  "version_added": null
+                },
+                "opera_android": {
+                  "version_added": null
+                },
+                "safari": {
+                  "version_added": null
+                },
+                "safari_ios": {
+                  "version_added": null
+                },
+                "servo": {
+                  "version_added": null
+                }
+              },
+              "status": {
+                "experimental": false,
+                "standard_track": true,
+                "obsolete": false
+              }
+            }
+          }
+        }
       }
     }
   }
diff --git a/http/headers/user-agent.json b/http/headers/user-agent.json
index 7105b282fd4e4..58b52c009b3a5 100644
--- a/http/headers/user-agent.json
+++ b/http/headers/user-agent.json
@@ -1,53 +1,64 @@
 {
-  "User-Agent": {
-    "Basic support": {
-      "Android": {
-        "support": true
-      },
-      "Chrome": {
-        "support": true
-      },
-      "Chrome for Android": {
-        "support": true
-      },
-      "Edge": {
-        "support": true
-      },
-      "Edge Mobile": {
-        "support": true
-      },
-      "Firefox": {
-        "support": true
-      },
-      "Firefox for Android": {
-        "support": true
-      },
-      "Internet Explorer": {
-        "support": true
-      },
-      "IE Mobile": {
-        "support": true
-      },
-      "Opera": {
-        "support": true
-      },
-      "Opera Mobile": {
-        "support": true
-      },
-      "Safari": {
-        "support": true
-      },
-      "Safari Mobile": {
-        "support": true
-      },
-      "Servo": {
-        "support": true
-      },
-      "status": {
-        "experimental": false,
-        "standardized": true,
-        "stable": true,
-        "obsolete": false
+  "version": "1.0.0",
+  "data": {
+    "http": {
+      "headers": {
+        "User-Agent": {
+          "__compat": {
+            "basic_support": {
+              "desc": "Basic support",
+              "support": {
+                "webview_android": {
+                  "version_added": true
+                },
+                "chrome": {
+                  "version_added": true
+                },
+                "chrome_android": {
+                  "version_added": true
+                },
+                "edge": {
+                  "version_added": true
+                },
+                "edge_mobile": {
+                  "version_added": true
+                },
+                "firefox": {
+                  "version_added": true
+                },
+                "firefox_android": {
+                  "version_added": true
+                },
+                "ie": {
+                  "version_added": true
+                },
+                "ie_mobile": {
+                  "version_added": true
+                },
+                "opera": {
+                  "version_added": true
+                },
+                "opera_android": {
+                  "version_added": true
+                },
+                "safari": {
+                  "version_added": true
+                },
+                "safari_ios": {
+                  "version_added": true
+                },
+                "servo": {
+                  "version_added": true
+                }
+              },
+              "status": {
+                "experimental": false,
+                "standard_track": true,
+                "obsolete": false
+              }
+            }
+          }
+        }
       }
     }
   }
diff --git a/http/headers/vary.json b/http/headers/vary.json
index a3452f46358a8..3d29ad9e872b4 100644
--- a/http/headers/vary.json
+++ b/http/headers/vary.json
@@ -1,53 +1,64 @@
 {
-  "Vary": {
-    "Basic support": {
-      "Android": {
-        "support": true
-      },
-      "Chrome": {
-        "support": true
-      },
-      "Chrome for Android": {
-        "support": true
-      },
-      "Edge": {
-        "support": true
-      },
-      "Edge Mobile": {
-        "support": true
-      },
-      "Firefox": {
-        "support": true
-      },
-      "Firefox for Android": {
-        "support": true
-      },
-      "Internet Explorer": {
-        "support": true
-      },
-      "IE Mobile": {
-        "support": true
-      },
-      "Opera": {
-        "support": true
-      },
-      "Opera Mobile": {
-        "support": true
-      },
-      "Safari": {
-        "support": true
-      },
-      "Safari Mobile": {
-        "support": true
-      },
-      "Servo": {
-        "support": true
-      },
-      "status": {
-        "experimental": false,
-        "standardized": true,
-        "stable": true,
-        "obsolete": false
+  "version": "1.0.0",
+  "data": {
+    "http": {
+      "headers": {
+        "Vary": {
+          "__compat": {
+            "basic_support": {
+              "desc": "Basic support",
+              "support": {
+                "webview_android": {
+                  "version_added": true
+                },
+                "chrome": {
+                  "version_added": true
+                },
+                "chrome_android": {
+                  "version_added": true
+                },
+                "edge": {
+                  "version_added": true
+                },
+                "edge_mobile": {
+                  "version_added": true
+                },
+                "firefox": {
+                  "version_added": true
+                },
+                "firefox_android": {
+                  "version_added": true
+                },
+                "ie": {
+                  "version_added": true
+                },
+                "ie_mobile": {
+                  "version_added": true
+                },
+                "opera": {
+                  "version_added": true
+                },
+                "opera_android": {
+                  "version_added": true
+                },
+                "safari": {
+                  "version_added": true
+                },
+                "safari_ios": {
+                  "version_added": true
+                },
+                "servo": {
+                  "version_added": true
+                }
+              },
+              "status": {
+                "experimental": false,
+                "standard_track": true,
+                "obsolete": false
+              }
+            }
+          }
+        }
       }
     }
   }
diff --git a/http/headers/via.json b/http/headers/via.json
index ea0505c93959e..d0938ac1a73d6 100644
--- a/http/headers/via.json
+++ b/http/headers/via.json
@@ -1,53 +1,64 @@
 {
-  "Via": {
-    "Basic support": {
-      "Android": {
-        "support": true
-      },
-      "Chrome": {
-        "support": true
-      },
-      "Chrome for Android": {
-        "support": true
-      },
-      "Edge": {
-        "support": true
-      },
-      "Edge Mobile": {
-        "support": true
-      },
-      "Firefox": {
-        "support": true
-      },
-      "Firefox for Android": {
-        "support": true
-      },
-      "Internet Explorer": {
-        "support": true
-      },
-      "IE Mobile": {
-        "support": true
-      },
-      "Opera": {
-        "support": true
-      },
-      "Opera Mobile": {
-        "support": true
-      },
-      "Safari": {
-        "support": true
-      },
-      "Safari Mobile": {
-        "support": true
-      },
-      "Servo": {
-        "support": true
-      },
-      "status": {
-        "experimental": false,
-        "standardized": true,
-        "stable": true,
-        "obsolete": false
+  "version": "1.0.0",
+  "data": {
+    "http": {
+      "headers": {
+        "Via": {
+          "__compat": {
+            "basic_support": {
+              "desc": "Basic support",
+              "support": {
+                "webview_android": {
+                  "version_added": true
+                },
+                "chrome": {
+                  "version_added": true
+                },
+                "chrome_android": {
+                  "version_added": true
+                },
+                "edge": {
+                  "version_added": true
+                },
+                "edge_mobile": {
+                  "version_added": true
+                },
+                "firefox": {
+                  "version_added": true
+                },
+                "firefox_android": {
+                  "version_added": true
+                },
+                "ie": {
+                  "version_added": true
+                },
+                "ie_mobile": {
+                  "version_added": true
+                },
+                "opera": {
+                  "version_added": true
+                },
+                "opera_android": {
+                  "version_added": true
+                },
+                "safari": {
+                  "version_added": true
+                },
+                "safari_ios": {
+                  "version_added": true
+                },
+                "servo": {
+                  "version_added": true
+                }
+              },
+              "status": {
+                "experimental": false,
+                "standard_track": true,
+                "obsolete": false
+              }
+            }
+          }
+        }
       }
     }
   }
diff --git a/http/headers/warning.json b/http/headers/warning.json
index 22b2e8a484044..d302bef7458f2 100644
--- a/http/headers/warning.json
+++ b/http/headers/warning.json
@@ -1,53 +1,64 @@
 {
-  "Warning": {
-    "Basic support": {
-      "Android": {
-        "support": true
-      },
-      "Chrome": {
-        "support": true
-      },
-      "Chrome for Android": {
-        "support": true
-      },
-      "Edge": {
-        "support": true
-      },
-      "Edge Mobile": {
-        "support": true
-      },
-      "Firefox": {
-        "support": true
-      },
-      "Firefox for Android": {
-        "support": true
-      },
-      "Internet Explorer": {
-        "support": true
-      },
-      "IE Mobile": {
-        "support": true
-      },
-      "Opera": {
-        "support": true
-      },
-      "Opera Mobile": {
-        "support": true
-      },
-      "Safari": {
-        "support": true
-      },
-      "Safari Mobile": {
-        "support": true
-      },
-      "Servo": {
-        "support": true
-      },
-      "status": {
-        "experimental": false,
-        "standardized": true,
-        "stable": true,
-        "obsolete": false
+  "version": "1.0.0",
+  "data": {
+    "http": {
+      "headers": {
+        "Warning": {
+          "__compat": {
+            "basic_support": {
+              "desc": "Basic support",
+              "support": {
+                "webview_android": {
+                  "version_added": true
+                },
+                "chrome": {
+                  "version_added": true
+                },
+                "chrome_android": {
+                  "version_added": true
+                },
+                "edge": {
+                  "version_added": true
+                },
+                "edge_mobile": {
+                  "version_added": true
+                },
+                "firefox": {
+                  "version_added": true
+                },
+                "firefox_android": {
+                  "version_added": true
+                },
+                "ie": {
+                  "version_added": true
+                },
+                "ie_mobile": {
+                  "version_added": true
+                },
+                "opera": {
+                  "version_added": true
+                },
+                "opera_android": {
+                  "version_added": true
+                },
+                "safari": {
+                  "version_added": true
+                },
+                "safari_ios": {
+                  "version_added": true
+                },
+                "servo": {
+                  "version_added": true
+                }
+              },
+              "status": {
+                "experimental": false,
+                "standard_track": true,
+                "obsolete": false
+              }
+            }
+          }
+        }
       }
     }
   }
diff --git a/http/headers/x-content-type-options.json b/http/headers/x-content-type-options.json
index d885c43072ec8..48d8d0682472f 100644
--- a/http/headers/x-content-type-options.json
+++ b/http/headers/x-content-type-options.json
@@ -1,53 +1,64 @@
 {
-  "X-Content-Type-Options": {
-    "Basic support": {
-      "Android": {
-        "support": true
-      },
-      "Chrome": {
-        "support": "1.0"
-      },
-      "Chrome for Android": {
-        "support": true
-      },
-      "Edge": {
-        "support": true
-      },
-      "Edge Mobile": {
-        "support": true
-      },
-      "Firefox": {
-        "support": "50"
-      },
-      "Firefox for Android": {
-        "support": "50"
-      },
-      "Internet Explorer": {
-        "support": "8.0"
-      },
-      "IE Mobile": {
-        "support": true
-      },
-      "Opera": {
-        "support": "13"
-      },
-      "Opera Mobile": {
-        "support": true
-      },
-      "Safari": {
-        "support": false
-      },
-      "Safari Mobile": {
-        "support": false
-      },
-      "Servo": {
-        "support": true
-      },
-      "status": {
-        "experimental": false,
-        "standardized": false,
-        "stable": true,
-        "obsolete": false
+  "version": "1.0.0",
+  "data": {
+    "http": {
+      "headers": {
+        "X-Content-Type-Options": {
+          "__compat": {
+            "basic_support": {
+              "desc": "Basic support",
+              "status": {
+                "webview_android": {
+                  "version_added": true
+                },
+                "chrome": {
+                  "version_added": "1.0"
+                },
+                "chrome_android": {
+                  "version_added": true
+                },
+                "edge": {
+                  "version_added": true
+                },
+                "edge_mobile": {
+                  "version_added": true
+                },
+                "firefox": {
+                  "version_added": "50"
+                },
+                "firefox_android": {
+                  "version_added": "50"
+                },
+                "ie": {
+                  "version_added": "8.0"
+                },
+                "ie_mobile": {
+                  "version_added": true
+                },
+                "opera": {
+                  "version_added": "13"
+                },
+                "opera_android": {
+                  "version_added": true
+                },
+                "safari": {
+                  "version_added": false
+                },
+                "safari_ios": {
+                  "version_added": false
+                },
+                "servo": {
+                  "version_added": true
+                }
+              },
+              "status": {
+                "experimental": false,
+                "standard_track": false,
+                "obsolete": false
+              }
+            }
+          }
+        }
       }
     }
   }
diff --git a/http/headers/x-frame-options.json b/http/headers/x-frame-options.json
index edb745eb70316..3356928fe9d68 100644
--- a/http/headers/x-frame-options.json
+++ b/http/headers/x-frame-options.json
@@ -1,103 +1,116 @@
 {
-  "X-Frame-Options": {
-    "Basic support": {
-      "Android": {
-        "support": true
-      },
-      "Chrome": {
-        "support": "4.0"
-      },
-      "Chrome for Android": {
-        "support": true
-      },
-      "Edge": {
-        "support": true
-      },
-      "Edge Mobile": {
-        "support": true
-      },
-      "Firefox": {
-        "support": "1.9.2"
-      },
-      "Firefox for Android": {
-        "support": true
-      },
-      "Internet Explorer": {
-        "support": "8.0"
-      },
-      "IE Mobile": {
-        "support": true
-      },
-      "Opera": {
-        "support": "10.50"
-      },
-      "Opera Mobile": {
-        "support": true
-      },
-      "Safari": {
-        "support": "4.0"
-      },
-      "Safari Mobile": {
-        "support": true
-      },
-      "Servo": {
-        "support": true
-      },
-      "status": {
-        "experimental": false,
-        "standardized": true,
-        "stable": true,
-        "obsolete": false
-      }
-    },
-    "ALLOW-FROM": {
-      "Android": {
-        "support": null
-      },
-      "Chrome": {
-        "support": false
-      },
-      "Chrome for Android": {
-        "support": null
-      },
-      "Edge": {
-        "support": true
-      },
-      "Edge Mobile": {
-        "support": true
-      },
-      "Firefox": {
-        "support": "18"
-      },
-      "Firefox for Android": {
-        "support": null
-      },
-      "Internet Explorer": {
-        "support": "8.0"
-      },
-      "IE Mobile": {
-        "support": null
-      },
-      "Opera": {
-        "support": false
-      },
-      "Opera Mobile": {
-        "support": null
-      },
-      "Safari": {
-        "support": true
-      },
-      "Safari Mobile": {
-        "support": null
-      },
-      "Servo": {
-        "support": null
-      },
-      "status": {
-        "experimental": false,
-        "standardized": true,
-        "stable": true,
-        "obsolete": false
+  "version": "1.0.0",
+  "data": {
+    "http": {
+      "headers": {
+        "X-Frame-Options": {
+          "__compat": {
+            "basic_support": {
+              "desc": "Basic support",
+              "support": {
+                "webview_android": {
+                  "version_added": true
+                },
+                "chrome": {
+                  "version_added": "4.0"
+                },
+                "chrome_android": {
+                  "version_added": true
+                },
+                "edge": {
+                  "version_added": true
+                },
+                "edge_mobile": {
+                  "version_added": true
+                },
+                "firefox": {
+                  "version_added": "1.9.2"
+                },
+                "firefox_android": {
+                  "version_added": true
+                },
+                "ie": {
+                  "version_added": "8.0"
+                },
+                "ie_mobile": {
+                  "version_added": true
+                },
+                "opera": {
+                  "version_added": "10.50"
+                },
+                "opera_android": {
+                  "version_added": true
+                },
+                "safari": {
+                  "version_added": "4.0"
+                },
+                "safari_ios": {
+                  "version_added": true
+                },
+                "servo": {
+                  "version_added": true
+                }
+              },
+              "status": {
+                "experimental": false,
+                "standard_track": true,
+                "obsolete": false
+              }
+            },
+            "ALLOW-FROM": {
+              "desc": "ALLOW-FROM",
+              "support": {
+                "webview_android": {
+                  "version_added": null
+                },
+                "chrome": {
+                  "version_added": false
+                },
+                "chrome_android": {
+                  "version_added": null
+                },
+                "edge": {
+                  "version_added": null
+                },
+                "edge_mobile": {
+                  "version_added": null
+                },
+                "firefox": {
+                  "version_added": "18"
+                },
+                "firefox_android": {
+                  "version_added": null
+                },
+                "ie": {
+                  "version_added": "8.0"
+                },
+                "ie_mobile": {
+                  "version_added": null
+                },
+                "opera": {
+                  "version_added": null
+                },
+                "opera_android": {
+                  "version_added": null
+                },
+                "safari": {
+                  "version_added": true
+                },
+                "safari_ios": {
+                  "version_added": null
+                },
+                "servo": {
+                  "version_added": null
+                }
+              },
+              "status": {
+                "experimental": false,
+                "standard_track": true,
+                "obsolete": false
+              }
+            }
+          }
+        }
       }
     }
   }
diff --git a/http/headers/x-xss-protection.json b/http/headers/x-xss-protection.json
index e76be7ac5ebac..b5c8df2996f94 100644
--- a/http/headers/x-xss-protection.json
+++ b/http/headers/x-xss-protection.json
@@ -1,53 +1,64 @@
 {
-  "X-XSS-Protection": {
-    "Basic support": {
-      "Android": {
-        "support": true
-      },
-      "Chrome": {
-        "support": true
-      },
-      "Chrome for Android": {
-        "support": true
-      },
-      "Edge": {
-        "support": true
-      },
-      "Edge Mobile": {
-        "support": true
-      },
-      "Firefox": {
-        "support": false
-      },
-      "Firefox for Android": {
-        "support": false
-      },
-      "Internet Explorer": {
-        "support": "8.0"
-      },
-      "IE Mobile": {
-        "support": null
-      },
-      "Opera": {
-        "support": true
-      },
-      "Opera Mobile": {
-        "support": true
-      },
-      "Safari": {
-        "support": true
-      },
-      "Safari Mobile": {
-        "support": true
-      },
-      "Servo": {
-        "support": false
-      },
-      "status": {
-        "experimental": false,
-        "standardized": false,
-        "stable": true,
-        "obsolete": false
+  "version": "1.0.0",
+  "data": {
+    "http": {
+      "headers": {
+        "X-XSS-Protection": {
+          "__compat": {
+            "basic_support": {
+              "desc": "Basic support",
+              "support": {
+                "webview_android": {
+                  "version_added": true
+                },
+                "chrome": {
+                  "version_added": true
+                },
+                "chrome_android": {
+                  "version_added": true
+                },
+                "edge": {
+                  "version_added": true
+                },
+                "edge_mobile": {
+                  "version_added": true
+                },
+                "firefox": {
+                  "version_added": false
+                },
+                "firefox_android": {
+                  "version_added": false
+                },
+                "ie": {
+                  "version_added": "8.0"
+                },
+                "ie_mobile": {
+                  "version_added": null
+                },
+                "opera": {
+                  "version_added": true
+                },
+                "opera_android": {
+                  "version_added": true
+                },
+                "safari": {
+                  "version_added": true
+                },
+                "safari_ios": {
+                  "version_added": true
+                },
+                "servo": {
+                  "version_added": false
+                }
+              },
+              "status": {
+                "experimental": false,
+                "standard_track": false,
+                "obsolete": false
+              }
+            }
+          }
+        }
       }
     }
   }
diff --git a/http/methods.json b/http/methods.json
index 4cb1a4a7ccac8..98b2d7bc43bb1 100644
--- a/http/methods.json
+++ b/http/methods.json
@@ -1,365 +1,400 @@
 {
-  "CONNECT": {
-    "Basic support": {
-      "Android": {
-        "support": true
-      },
-      "Chrome": {
-        "support": true
-      },
-      "Chrome for Android": {
-        "support": true
-      },
-      "Edge": {
-        "support": true
-      },
-      "Edge Mobile": {
-        "support": true
-      },
-      "Firefox": {
-        "support": true
-      },
-      "Firefox for Android": {
-        "support": true
-      },
-      "Internet Explorer": {
-        "support": true
-      },
-      "IE Mobile": {
-        "support": true
-      },
-      "Opera": {
-        "support": true
-      },
-      "Opera Mobile": {
-        "support": true
-      },
-      "Safari": {
-        "support": true
-      },
-      "Safari Mobile": {
-        "support": true
-      },
-      "Servo": {
-        "support": true
-      },
-      "status": {
-        "experimental": false,
-        "standardized": true,
-        "stable": true,
-        "obsolete": false
-      }
-    }
-  },
-  "DELETE": {
-    "Basic support": {
-      "Android": {
-        "support": true
-      },
-      "Chrome": {
-        "support": true
-      },
-      "Chrome for Android": {
-        "support": true
-      },
-      "Edge": {
-        "support": true
-      },
-      "Edge Mobile": {
-        "support": true
-      },
-      "Firefox": {
-        "support": true
-      },
-      "Firefox for Android": {
-        "support": true
-      },
-      "Internet Explorer": {
-        "support": true
-      },
-      "IE Mobile": {
-        "support": true
-      },
-      "Opera": {
-        "support": true
-      },
-      "Opera Mobile": {
-        "support": true
-      },
-      "Safari": {
-        "support": true
-      },
-      "Safari Mobile": {
-        "support": true
-      },
-      "Servo": {
-        "support": true
-      },
-      "status": {
-        "experimental": false,
-        "standardized": true,
-        "stable": true,
-        "obsolete": false
-      }
-    }
-  },
-  "GET": {
-    "Basic support": {
-      "Android": {
-        "support": true
-      },
-      "Chrome": {
-        "support": true
-      },
-      "Chrome for Android": {
-        "support": true
-      },
-      "Edge": {
-        "support": true
-      },
-      "Edge Mobile": {
-        "support": true
-      },
-      "Firefox": {
-        "support": true
-      },
-      "Firefox for Android": {
-        "support": true
-      },
-      "Internet Explorer": {
-        "support": true
-      },
-      "IE Mobile": {
-        "support": true
-      },
-      "Opera": {
-        "support": true
-      },
-      "Opera Mobile": {
-        "support": true
-      },
-      "Safari": {
-        "support": true
-      },
-      "Safari Mobile": {
-        "support": true
-      },
-      "Servo": {
-        "support": true
-      },
-      "status": {
-        "experimental": false,
-        "standardized": true,
-        "stable": true,
-        "obsolete": false
-      }
-    }
-  },
-  "HEAD": {
-    "Basic support": {
-      "Android": {
-        "support": true
-      },
-      "Chrome": {
-        "support": true
-      },
-      "Chrome for Android": {
-        "support": true
-      },
-      "Edge": {
-        "support": true
-      },
-      "Edge Mobile": {
-        "support": true
-      },
-      "Firefox": {
-        "support": true
-      },
-      "Firefox for Android": {
-        "support": true
-      },
-      "Internet Explorer": {
-        "support": true
-      },
-      "IE Mobile": {
-        "support": true
-      },
-      "Opera": {
-        "support": true
-      },
-      "Opera Mobile": {
-        "support": true
-      },
-      "Safari": {
-        "support": true
-      },
-      "Safari Mobile": {
-        "support": true
-      },
-      "Servo": {
-        "support": true
-      },
-      "status": {
-        "experimental": false,
-        "standardized": true,
-        "stable": true,
-        "obsolete": false
-      }
-    }
-  },
-  "OPTIONS": {
-    "Basic support": {
-      "Android": {
-        "support": true
-      },
-      "Chrome": {
-        "support": true
-      },
-      "Chrome for Android": {
-        "support": true
-      },
-      "Edge": {
-        "support": true
-      },
-      "Edge Mobile": {
-        "support": true
-      },
-      "Firefox": {
-        "support": true
-      },
-      "Firefox for Android": {
-        "support": true
-      },
-      "Internet Explorer": {
-        "support": true
-      },
-      "IE Mobile": {
-        "support": true
-      },
-      "Opera": {
-        "support": true
-      },
-      "Opera Mobile": {
-        "support": true
-      },
-      "Safari": {
-        "support": true
-      },
-      "Safari Mobile": {
-        "support": true
-      },
-      "Servo": {
-        "support": true
-      },
-      "status": {
-        "experimental": false,
-        "standardized": true,
-        "stable": true,
-        "obsolete": false
-      }
-    }
-  },
-  "POST": {
-    "Basic support": {
-      "Android": {
-        "support": true
-      },
-      "Chrome": {
-        "support": true
-      },
-      "Chrome for Android": {
-        "support": true
-      },
-      "Edge": {
-        "support": true
-      },
-      "Edge Mobile": {
-        "support": true
-      },
-      "Firefox": {
-        "support": true
-      },
-      "Firefox for Android": {
-        "support": true
-      },
-      "Internet Explorer": {
-        "support": true
-      },
-      "IE Mobile": {
-        "support": true
-      },
-      "Opera": {
-        "support": true
-      },
-      "Opera Mobile": {
-        "support": true
-      },
-      "Safari": {
-        "support": true
-      },
-      "Safari Mobile": {
-        "support": true
-      },
-      "Servo": {
-        "support": true
-      },
-      "status": {
-        "experimental": false,
-        "standardized": true,
-        "stable": true,
-        "obsolete": false
-      }
-    }
-  },
-  "PUT": {
-    "Basic support": {
-      "Android": {
-        "support": true
-      },
-      "Chrome": {
-        "support": true
-      },
-      "Chrome for Android": {
-        "support": true
-      },
-      "Edge": {
-        "support": true
-      },
-      "Edge Mobile": {
-        "support": true
-      },
-      "Firefox": {
-        "support": true
-      },
-      "Firefox for Android": {
-        "support": true
-      },
-      "Internet Explorer": {
-        "support": true
-      },
-      "IE Mobile": {
-        "support": true
-      },
-      "Opera": {
-        "support": true
-      },
-      "Opera Mobile": {
-        "support": true
-      },
-      "Safari": {
-        "support": true
-      },
-      "Safari Mobile": {
-        "support": true
-      },
-      "Servo": {
-        "support": true
-      },
-      "status": {
-        "experimental": false,
-        "standardized": true,
-        "stable": true,
-        "obsolete": false
+  "version": "1.0.0",
+  "data": {
+    "http": {
+      "methods": {
+        "CONNECT": {
+          "__compat": {
+            "basic_support": {
+              "desc": "Basic support",
+              "support": {
+                "webview_android": {
+                  "version_added": true
+                },
+                "chrome": {
+                  "version_added": true
+                },
+                "chrome_android": {
+                  "version_added": true
+                },
+                "edge": {
+                  "version_added": true
+                },
+                "edge_mobile": {
+                  "version_added": true
+                },
+                "firefox": {
+                  "version_added": true
+                },
+                "firefox_android": {
+                  "version_added": true
+                },
+                "ie": {
+                  "version_added": true
+                },
+                "ie_mobile": {
+                  "version_added": true
+                },
+                "opera": {
+                  "version_added": true
+                },
+                "opera_android": {
+                  "version_added": true
+                },
+                "safari": {
+                  "version_added": true
+                },
+                "safari_ios": {
+                  "version_added": true
+                },
+                "servo": {
+                  "version_added": true
+                }
+              },
+              "status": {
+                "experimental": false,
+                "standard_track": true,
+                "obsolete": false
+              }
+            }
+          }
+        },
+        "DELETE": {
+          "__compat": {
+            "basic_support": {
+              "desc": "Basic support",
+              "support": {
+                "webview_android": {
+                  "version_added": true
+                },
+                "chrome": {
+                  "version_added": true
+                },
+                "chrome_android": {
+                  "version_added": true
+                },
+                "edge": {
+                  "version_added": true
+                },
+                "edge_mobile": {
+                  "version_added": true
+                },
+                "firefox": {
+                  "version_added": true
+                },
+                "firefox_android": {
+                  "version_added": true
+                },
+                "ie": {
+                  "version_added": true
+                },
+                "ie_mobile": {
+                  "version_added": true
+                },
+                "opera": {
+                  "version_added": true
+                },
+                "opera_android": {
+                  "version_added": true
+                },
+                "safari": {
+                  "version_added": true
+                },
+                "safari_ios": {
+                  "version_added": true
+                },
+                "servo": {
+                  "version_added": true
+                }
+              },
+              "status": {
+                "experimental": false,
+                "standard_track": true,
+                "obsolete": false
+              }
+            }
+          }
+        },
+        "GET": {
+          "__compat": {
+            "basic_support": {
+              "desc": "Basic support",
+              "support": {
+                "webview_android": {
+                  "version_added": true
+                },
+                "chrome": {
+                  "version_added": true
+                },
+                "chrome_android": {
+                  "version_added": true
+                },
+                "edge": {
+                  "version_added": true
+                },
+                "edge_mobile": {
+                  "version_added": true
+                },
+                "firefox": {
+                  "version_added": true
+                },
+                "firefox_android": {
+                  "version_added": true
+                },
+                "ie": {
+                  "version_added": true
+                },
+                "ie_mobile": {
+                  "version_added": true
+                },
+                "opera": {
+                  "version_added": true
+                },
+                "opera_android": {
+                  "version_added": true
+                },
+                "safari": {
+                  "version_added": true
+                },
+                "safari_ios": {
+                  "version_added": true
+                },
+                "servo": {
+                  "version_added": true
+                }
+              },
+              "status": {
+                "experimental": false,
+                "standard_track": true,
+                "obsolete": false
+              }
+            }
+          }
+        },
+        "HEAD": {
+          "__compat": {
+            "basic_support": {
+              "desc": "Basic support",
+              "support": {
+                "webview_android": {
+                  "version_added": true
+                },
+                "chrome": {
+                  "version_added": true
+                },
+                "chrome_android": {
+                  "version_added": true
+                },
+                "edge": {
+                  "version_added": true
+                },
+                "edge_mobile": {
+                  "version_added": true
+                },
+                "firefox": {
+                  "version_added": true
+                },
+                "firefox_android": {
+                  "version_added": true
+                },
+                "ie": {
+                  "version_added": true
+                },
+                "ie_mobile": {
+                  "version_added": true
+                },
+                "opera": {
+                  "version_added": true
+                },
+                "opera_android": {
+                  "version_added": true
+                },
+                "safari": {
+                  "version_added": true
+                },
+                "safari_ios": {
+                  "version_added": true
+                },
+                "servo": {
+                  "version_added": true
+                }
+              },
+              "status": {
+                "experimental": false,
+                "standard_track": true,
+                "obsolete": false
+              }
+            }
+          }
+        },
+        "OPTIONS": {
+          "__compat": {
+            "basic_support": {
+              "desc": "Basic support",
+              "support": {
+                "webview_android": {
+                  "version_added": true
+                },
+                "chrome": {
+                  "version_added": true
+                },
+                "chrome_android": {
+                  "version_added": true
+                },
+                "edge": {
+                  "version_added": true
+                },
+                "edge_mobile": {
+                  "version_added": true
+                },
+                "firefox": {
+                  "version_added": true
+                },
+                "firefox_android": {
+                  "version_added": true
+                },
+                "ie": {
+                  "version_added": true
+                },
+                "ie_mobile": {
+                  "version_added": true
+                },
+                "opera": {
+                  "version_added": true
+                },
+                "opera_android": {
+                  "version_added": true
+                },
+                "safari": {
+                  "version_added": true
+                },
+                "safari_ios": {
+                  "version_added": true
+                },
+                "servo": {
+                  "version_added": true
+                }
+              },
+              "status": {
+                "experimental": false,
+                "standard_track": true,
+                "obsolete": false
+              }
+            }
+          }
+        },
+        "POST": {
+          "__compat": {
+            "basic_support": {
+              "desc": "Basic support",
+              "support": {
+                "webview_android": {
+                  "version_added": true
+                },
+                "chrome": {
+                  "version_added": true
+                },
+                "chrome_android": {
+                  "version_added": true
+                },
+                "edge": {
+                  "version_added": true
+                },
+                "edge_mobile": {
+                  "version_added": true
+                },
+                "firefox": {
+                  "version_added": true
+                },
+                "firefox_android": {
+                  "version_added": true
+                },
+                "ie": {
+                  "version_added": true
+                },
+                "ie_mobile": {
+                  "version_added": true
+                },
+                "opera": {
+                  "version_added": true
+                },
+                "opera_android": {
+                  "version_added": true
+                },
+                "safari": {
+                  "version_added": true
+                },
+                "safari_ios": {
+                  "version_added": true
+                },
+                "servo": {
+                  "version_added": true
+                }
+              },
+              "status": {
+                "experimental": false,
+                "standard_track": true,
+                "obsolete": false
+              }
+            }
+          }
+        },
+        "PUT": {
+          "__compat": {
+            "basic_support": {
+              "desc": "Basic support",
+              "support": {
+                "webview_android": {
+                  "version_added": true
+                },
+                "chrome": {
+                  "version_added": true
+                },
+                "chrome_android": {
+                  "version_added": true
+                },
+                "edge": {
+                  "version_added": true
+                },
+                "edge_mobile": {
+                  "version_added": true
+                },
+                "firefox": {
+                  "version_added": true
+                },
+                "firefox_android": {
+                  "version_added": true
+                },
+                "ie": {
+                  "version_added": true
+                },
+                "ie_mobile": {
+                  "version_added": true
+                },
+                "opera": {
+                  "version_added": true
+                },
+                "opera_android": {
+                  "version_added": true
+                },
+                "safari": {
+                  "version_added": true
+                },
+                "safari_ios": {
+                  "version_added": true
+                },
+                "servo": {
+                  "version_added": true
+                }
+              },
+              "status": {
+                "experimental": false,
+                "standard_track": true,
+                "obsolete": false
+              }
+            }
+          }
+        }
       }
     }
   }
diff --git a/http/status.json b/http/status.json
index 588195bac65e1..67695a6c8f5cc 100644
--- a/http/status.json
+++ b/http/status.json
@@ -1,1301 +1,1408 @@
 {
-  "100": {
-    "Basic support": {
-      "Android": {
-        "support": true
-      },
-      "Chrome": {
-        "support": true
-      },
-      "Chrome for Android": {
-        "support": true
-      },
-      "Edge": {
-        "support": true
-      },
-      "Edge Mobile": {
-        "support": true
-      },
-      "Firefox": {
-        "support": true
-      },
-      "Firefox for Android": {
-        "support": true
-      },
-      "Internet Explorer": {
-        "support": true
-      },
-      "IE Mobile": {
-        "support": true
-      },
-      "Opera": {
-        "support": true
-      },
-      "Opera Mobile": {
-        "support": true
-      },
-      "Safari": {
-        "support": true
-      },
-      "Safari Mobile": {
-        "support": true
-      },
-      "Servo": {
-        "support": true
-      },
-      "status": {
-        "experimental": false,
-        "standardized": true,
-        "stable": true,
-        "obsolete": false
-      }
-    }
-  },
-  "200": {
-    "Basic support": {
-      "Android": {
-        "support": true
-      },
-      "Chrome": {
-        "support": true
-      },
-      "Chrome for Android": {
-        "support": true
-      },
-      "Edge": {
-        "support": true
-      },
-      "Edge Mobile": {
-        "support": true
-      },
-      "Firefox": {
-        "support": true
-      },
-      "Firefox for Android": {
-        "support": true
-      },
-      "Internet Explorer": {
-        "support": true
-      },
-      "IE Mobile": {
-        "support": true
-      },
-      "Opera": {
-        "support": true
-      },
-      "Opera Mobile": {
-        "support": true
-      },
-      "Safari": {
-        "support": true
-      },
-      "Safari Mobile": {
-        "support": true
-      },
-      "Servo": {
-        "support": true
-      },
-      "status": {
-        "experimental": false,
-        "standardized": true,
-        "stable": true,
-        "obsolete": false
-      }
-    }
-  },
-  "201": {
-    "Basic support": {
-      "Android": {
-        "support": true
-      },
-      "Chrome": {
-        "support": true
-      },
-      "Chrome for Android": {
-        "support": true
-      },
-      "Edge": {
-        "support": true
-      },
-      "Edge Mobile": {
-        "support": true
-      },
-      "Firefox": {
-        "support": true
-      },
-      "Firefox for Android": {
-        "support": true
-      },
-      "Internet Explorer": {
-        "support": true
-      },
-      "IE Mobile": {
-        "support": true
-      },
-      "Opera": {
-        "support": true
-      },
-      "Opera Mobile": {
-        "support": true
-      },
-      "Safari": {
-        "support": true
-      },
-      "Safari Mobile": {
-        "support": true
-      },
-      "Servo": {
-        "support": true
-      },
-      "status": {
-        "experimental": false,
-        "standardized": true,
-        "stable": true,
-        "obsolete": false
-      }
-    }
-  },
-  "204": {
-    "Basic support": {
-      "Android": {
-        "support": true
-      },
-      "Chrome": {
-        "support": true
-      },
-      "Chrome for Android": {
-        "support": true
-      },
-      "Edge": {
-        "support": true
-      },
-      "Edge Mobile": {
-        "support": true
-      },
-      "Firefox": {
-        "support": true
-      },
-      "Firefox for Android": {
-        "support": true
-      },
-      "Internet Explorer": {
-        "support": true
-      },
-      "IE Mobile": {
-        "support": true
-      },
-      "Opera": {
-        "support": true
-      },
-      "Opera Mobile": {
-        "support": true
-      },
-      "Safari": {
-        "support": true
-      },
-      "Safari Mobile": {
-        "support": true
-      },
-      "Servo": {
-        "support": true
-      },
-      "status": {
-        "experimental": false,
-        "standardized": true,
-        "stable": true,
-        "obsolete": false
-      }
-    }
-  },
-  "206": {
-    "Basic support": {
-      "Android": {
-        "support": true
-      },
-      "Chrome": {
-        "support": true
-      },
-      "Chrome for Android": {
-        "support": true
-      },
-      "Edge": {
-        "support": true
-      },
-      "Edge Mobile": {
-        "support": true
-      },
-      "Firefox": {
-        "support": true
-      },
-      "Firefox for Android": {
-        "support": true
-      },
-      "Internet Explorer": {
-        "support": true
-      },
-      "IE Mobile": {
-        "support": true
-      },
-      "Opera": {
-        "support": true
-      },
-      "Opera Mobile": {
-        "support": true
-      },
-      "Safari": {
-        "support": true
-      },
-      "Safari Mobile": {
-        "support": true
-      },
-      "Servo": {
-        "support": true
-      },
-      "status": {
-        "experimental": false,
-        "standardized": true,
-        "stable": true,
-        "obsolete": false
-      }
-    }
-  },
-  "301": {
-    "Basic support": {
-      "Android": {
-        "support": true
-      },
-      "Chrome": {
-        "support": true
-      },
-      "Chrome for Android": {
-        "support": true
-      },
-      "Edge": {
-        "support": true
-      },
-      "Edge Mobile": {
-        "support": true
-      },
-      "Firefox": {
-        "support": true
-      },
-      "Firefox for Android": {
-        "support": true
-      },
-      "Internet Explorer": {
-        "support": true
-      },
-      "IE Mobile": {
-        "support": true
-      },
-      "Opera": {
-        "support": true
-      },
-      "Opera Mobile": {
-        "support": true
-      },
-      "Safari": {
-        "support": true
-      },
-      "Safari Mobile": {
-        "support": true
-      },
-      "Servo": {
-        "support": true
-      },
-      "status": {
-        "experimental": false,
-        "standardized": true,
-        "stable": true,
-        "obsolete": false
-      }
-    }
-  },
-  "302": {
-    "Basic support": {
-      "Android": {
-        "support": true
-      },
-      "Chrome": {
-        "support": true
-      },
-      "Chrome for Android": {
-        "support": true
-      },
-      "Edge": {
-        "support": true
-      },
-      "Edge Mobile": {
-        "support": true
-      },
-      "Firefox": {
-        "support": true
-      },
-      "Firefox for Android": {
-        "support": true
-      },
-      "Internet Explorer": {
-        "support": true
-      },
-      "IE Mobile": {
-        "support": true
-      },
-      "Opera": {
-        "support": true
-      },
-      "Opera Mobile": {
-        "support": true
-      },
-      "Safari": {
-        "support": true
-      },
-      "Safari Mobile": {
-        "support": true
-      },
-      "Servo": {
-        "support": true
-      },
-      "status": {
-        "experimental": false,
-        "standardized": true,
-        "stable": true,
-        "obsolete": false
-      }
-    }
-  },
-  "303": {
-    "Basic support": {
-      "Android": {
-        "support": true
-      },
-      "Chrome": {
-        "support": true
-      },
-      "Chrome for Android": {
-        "support": true
-      },
-      "Edge": {
-        "support": true
-      },
-      "Edge Mobile": {
-        "support": true
-      },
-      "Firefox": {
-        "support": true
-      },
-      "Firefox for Android": {
-        "support": true
-      },
-      "Internet Explorer": {
-        "support": true
-      },
-      "IE Mobile": {
-        "support": true
-      },
-      "Opera": {
-        "support": true
-      },
-      "Opera Mobile": {
-        "support": true
-      },
-      "Safari": {
-        "support": true
-      },
-      "Safari Mobile": {
-        "support": true
-      },
-      "Servo": {
-        "support": true
-      },
-      "status": {
-        "experimental": false,
-        "standardized": true,
-        "stable": true,
-        "obsolete": false
-      }
-    }
-  },
-  "304": {
-    "Basic support": {
-      "Android": {
-        "support": true
-      },
-      "Chrome": {
-        "support": true
-      },
-      "Chrome for Android": {
-        "support": true
-      },
-      "Edge": {
-        "support": true
-      },
-      "Edge Mobile": {
-        "support": true
-      },
-      "Firefox": {
-        "support": true
-      },
-      "Firefox for Android": {
-        "support": true
-      },
-      "Internet Explorer": {
-        "support": true
-      },
-      "IE Mobile": {
-        "support": true
-      },
-      "Opera": {
-        "support": true
-      },
-      "Opera Mobile": {
-        "support": true
-      },
-      "Safari": {
-        "support": true
-      },
-      "Safari Mobile": {
-        "support": true
-      },
-      "Servo": {
-        "support": true
-      },
-      "status": {
-        "experimental": false,
-        "standardized": true,
-        "stable": true,
-        "obsolete": false
-      }
-    }
-  },
-  "307": {
-    "Basic support": {
-      "Android": {
-        "support": true
-      },
-      "Chrome": {
-        "support": true
-      },
-      "Chrome for Android": {
-        "support": true
-      },
-      "Edge": {
-        "support": true
-      },
-      "Edge Mobile": {
-        "support": true
-      },
-      "Firefox": {
-        "support": true
-      },
-      "Firefox for Android": {
-        "support": true
-      },
-      "Internet Explorer": {
-        "support": true
-      },
-      "IE Mobile": {
-        "support": true
-      },
-      "Opera": {
-        "support": true
-      },
-      "Opera Mobile": {
-        "support": true
-      },
-      "Safari": {
-        "support": true
-      },
-      "Safari Mobile": {
-        "support": true
-      },
-      "Servo": {
-        "support": true
-      },
-      "status": {
-        "experimental": false,
-        "standardized": true,
-        "stable": true,
-        "obsolete": false
-      }
-    }
-  },
-  "308": {
-    "Basic support": {
-      "Android": {
-        "support": true
-      },
-      "Chrome": {
-        "support": true
-      },
-      "Chrome for Android": {
-        "support": true
-      },
-      "Edge": {
-        "support": true
-      },
-      "Edge Mobile": {
-        "support": true
-      },
-      "Firefox": {
-        "support": true
-      },
-      "Firefox for Android": {
-        "support": true
-      },
-      "Internet Explorer": {
-        "support": true
-      },
-      "IE Mobile": {
-        "support": true
-      },
-      "Opera": {
-        "support": true
-      },
-      "Opera Mobile": {
-        "support": true
-      },
-      "Safari": {
-        "support": true
-      },
-      "Safari Mobile": {
-        "support": true
-      },
-      "Servo": {
-        "support": true
-      },
-      "status": {
-        "experimental": false,
-        "standardized": true,
-        "stable": true,
-        "obsolete": false
-      }
-    }
-  },
-  "401": {
-    "Basic support": {
-      "Android": {
-        "support": true
-      },
-      "Chrome": {
-        "support": true
-      },
-      "Chrome for Android": {
-        "support": true
-      },
-      "Edge": {
-        "support": true
-      },
-      "Edge Mobile": {
-        "support": true
-      },
-      "Firefox": {
-        "support": true
-      },
-      "Firefox for Android": {
-        "support": true
-      },
-      "Internet Explorer": {
-        "support": true
-      },
-      "IE Mobile": {
-        "support": true
-      },
-      "Opera": {
-        "support": true
-      },
-      "Opera Mobile": {
-        "support": true
-      },
-      "Safari": {
-        "support": true
-      },
-      "Safari Mobile": {
-        "support": true
-      },
-      "Servo": {
-        "support": true
-      },
-      "status": {
-        "experimental": false,
-        "standardized": true,
-        "stable": true,
-        "obsolete": false
-      }
-    }
-  },
-  "403": {
-    "Basic support": {
-      "Android": {
-        "support": true
-      },
-      "Chrome": {
-        "support": true
-      },
-      "Chrome for Android": {
-        "support": true
-      },
-      "Edge": {
-        "support": true
-      },
-      "Edge Mobile": {
-        "support": true
-      },
-      "Firefox": {
-        "support": true
-      },
-      "Firefox for Android": {
-        "support": true
-      },
-      "Internet Explorer": {
-        "support": true
-      },
-      "IE Mobile": {
-        "support": true
-      },
-      "Opera": {
-        "support": true
-      },
-      "Opera Mobile": {
-        "support": true
-      },
-      "Safari": {
-        "support": true
-      },
-      "Safari Mobile": {
-        "support": true
-      },
-      "Servo": {
-        "support": true
-      },
-      "status": {
-        "experimental": false,
-        "standardized": true,
-        "stable": true,
-        "obsolete": false
-      }
-    }
-  },
-  "404": {
-    "Basic support": {
-      "Android": {
-        "support": true
-      },
-      "Chrome": {
-        "support": true
-      },
-      "Chrome for Android": {
-        "support": true
-      },
-      "Edge": {
-        "support": true
-      },
-      "Edge Mobile": {
-        "support": true
-      },
-      "Firefox": {
-        "support": true
-      },
-      "Firefox for Android": {
-        "support": true
-      },
-      "Internet Explorer": {
-        "support": true
-      },
-      "IE Mobile": {
-        "support": true
-      },
-      "Opera": {
-        "support": true
-      },
-      "Opera Mobile": {
-        "support": true
-      },
-      "Safari": {
-        "support": true
-      },
-      "Safari Mobile": {
-        "support": true
-      },
-      "Servo": {
-        "support": true
-      },
-      "status": {
-        "experimental": false,
-        "standardized": true,
-        "stable": true,
-        "obsolete": false
-      }
-    }
-  },
-  "406": {
-    "Basic support": {
-      "Android": {
-        "support": true
-      },
-      "Chrome": {
-        "support": true
-      },
-      "Chrome for Android": {
-        "support": true
-      },
-      "Edge": {
-        "support": true
-      },
-      "Edge Mobile": {
-        "support": true
-      },
-      "Firefox": {
-        "support": true
-      },
-      "Firefox for Android": {
-        "support": true
-      },
-      "Internet Explorer": {
-        "support": true
-      },
-      "IE Mobile": {
-        "support": true
-      },
-      "Opera": {
-        "support": true
-      },
-      "Opera Mobile": {
-        "support": true
-      },
-      "Safari": {
-        "support": true
-      },
-      "Safari Mobile": {
-        "support": true
-      },
-      "Servo": {
-        "support": true
-      },
-      "status": {
-        "experimental": false,
-        "standardized": true,
-        "stable": true,
-        "obsolete": false
-      }
-    }
-  },
-  "407": {
-    "Basic support": {
-      "Android": {
-        "support": true
-      },
-      "Chrome": {
-        "support": true
-      },
-      "Chrome for Android": {
-        "support": true
-      },
-      "Edge": {
-        "support": true
-      },
-      "Edge Mobile": {
-        "support": true
-      },
-      "Firefox": {
-        "support": true
-      },
-      "Firefox for Android": {
-        "support": true
-      },
-      "Internet Explorer": {
-        "support": true
-      },
-      "IE Mobile": {
-        "support": true
-      },
-      "Opera": {
-        "support": true
-      },
-      "Opera Mobile": {
-        "support": true
-      },
-      "Safari": {
-        "support": true
-      },
-      "Safari Mobile": {
-        "support": true
-      },
-      "Servo": {
-        "support": true
-      },
-      "status": {
-        "experimental": false,
-        "standardized": true,
-        "stable": true,
-        "obsolete": false
-      }
-    }
-  },
-  "410": {
-    "Basic support": {
-      "Android": {
-        "support": true
-      },
-      "Chrome": {
-        "support": true
-      },
-      "Chrome for Android": {
-        "support": true
-      },
-      "Edge": {
-        "support": true
-      },
-      "Edge Mobile": {
-        "support": true
-      },
-      "Firefox": {
-        "support": true
-      },
-      "Firefox for Android": {
-        "support": true
-      },
-      "Internet Explorer": {
-        "support": true
-      },
-      "IE Mobile": {
-        "support": true
-      },
-      "Opera": {
-        "support": true
-      },
-      "Opera Mobile": {
-        "support": true
-      },
-      "Safari": {
-        "support": true
-      },
-      "Safari Mobile": {
-        "support": true
-      },
-      "Servo": {
-        "support": true
-      },
-      "status": {
-        "experimental": false,
-        "standardized": true,
-        "stable": true,
-        "obsolete": false
-      }
-    }
-  },
-  "412": {
-    "Basic support": {
-      "Android": {
-        "support": true
-      },
-      "Chrome": {
-        "support": true
-      },
-      "Chrome for Android": {
-        "support": true
-      },
-      "Edge": {
-        "support": true
-      },
-      "Edge Mobile": {
-        "support": true
-      },
-      "Firefox": {
-        "support": true
-      },
-      "Firefox for Android": {
-        "support": true
-      },
-      "Internet Explorer": {
-        "support": true
-      },
-      "IE Mobile": {
-        "support": true
-      },
-      "Opera": {
-        "support": true
-      },
-      "Opera Mobile": {
-        "support": true
-      },
-      "Safari": {
-        "support": true
-      },
-      "Safari Mobile": {
-        "support": true
-      },
-      "Servo": {
-        "support": true
-      },
-      "status": {
-        "experimental": false,
-        "standardized": true,
-        "stable": true,
-        "obsolete": false
-      }
-    }
-  },
-  "416": {
-    "Basic support": {
-      "Android": {
-        "support": true
-      },
-      "Chrome": {
-        "support": true
-      },
-      "Chrome for Android": {
-        "support": true
-      },
-      "Edge": {
-        "support": true
-      },
-      "Edge Mobile": {
-        "support": true
-      },
-      "Firefox": {
-        "support": true
-      },
-      "Firefox for Android": {
-        "support": true
-      },
-      "Internet Explorer": {
-        "support": true
-      },
-      "IE Mobile": {
-        "support": true
-      },
-      "Opera": {
-        "support": true
-      },
-      "Opera Mobile": {
-        "support": true
-      },
-      "Safari": {
-        "support": true
-      },
-      "Safari Mobile": {
-        "support": true
-      },
-      "Servo": {
-        "support": true
-      },
-      "status": {
-        "experimental": false,
-        "standardized": true,
-        "stable": true,
-        "obsolete": false
-      }
-    }
-  },
-  "451": {
-    "Basic support": {
-      "Android": {
-        "support": true
-      },
-      "Chrome": {
-        "support": true
-      },
-      "Chrome for Android": {
-        "support": true
-      },
-      "Edge": {
-        "support": true
-      },
-      "Edge Mobile": {
-        "support": true
-      },
-      "Firefox": {
-        "support": true
-      },
-      "Firefox for Android": {
-        "support": true
-      },
-      "Internet Explorer": {
-        "support": true
-      },
-      "IE Mobile": {
-        "support": true
-      },
-      "Opera": {
-        "support": true
-      },
-      "Opera Mobile": {
-        "support": true
-      },
-      "Safari": {
-        "support": true
-      },
-      "Safari Mobile": {
-        "support": true
-      },
-      "Servo": {
-        "support": true
-      },
-      "status": {
-        "experimental": false,
-        "standardized": true,
-        "stable": true,
-        "obsolete": false
-      }
-    }
-  },
-  "500": {
-    "Basic support": {
-      "Android": {
-        "support": true
-      },
-      "Chrome": {
-        "support": true
-      },
-      "Chrome for Android": {
-        "support": true
-      },
-      "Edge": {
-        "support": true
-      },
-      "Edge Mobile": {
-        "support": true
-      },
-      "Firefox": {
-        "support": true
-      },
-      "Firefox for Android": {
-        "support": true
-      },
-      "Internet Explorer": {
-        "support": true
-      },
-      "IE Mobile": {
-        "support": true
-      },
-      "Opera": {
-        "support": true
-      },
-      "Opera Mobile": {
-        "support": true
-      },
-      "Safari": {
-        "support": true
-      },
-      "Safari Mobile": {
-        "support": true
-      },
-      "Servo": {
-        "support": true
-      },
-      "status": {
-        "experimental": false,
-        "standardized": true,
-        "stable": true,
-        "obsolete": false
-      }
-    }
-  },
-  "501": {
-    "Basic support": {
-      "Android": {
-        "support": true
-      },
-      "Chrome": {
-        "support": true
-      },
-      "Chrome for Android": {
-        "support": true
-      },
-      "Edge": {
-        "support": true
-      },
-      "Edge Mobile": {
-        "support": true
-      },
-      "Firefox": {
-        "support": true
-      },
-      "Firefox for Android": {
-        "support": true
-      },
-      "Internet Explorer": {
-        "support": true
-      },
-      "IE Mobile": {
-        "support": true
-      },
-      "Opera": {
-        "support": true
-      },
-      "Opera Mobile": {
-        "support": true
-      },
-      "Safari": {
-        "support": true
-      },
-      "Safari Mobile": {
-        "support": true
-      },
-      "Servo": {
-        "support": true
-      },
-      "status": {
-        "experimental": false,
-        "standardized": true,
-        "stable": true,
-        "obsolete": false
-      }
-    }
-  },
-  "502": {
-    "Basic support": {
-      "Android": {
-        "support": true
-      },
-      "Chrome": {
-        "support": true
-      },
-      "Chrome for Android": {
-        "support": true
-      },
-      "Edge": {
-        "support": true
-      },
-      "Edge Mobile": {
-        "support": true
-      },
-      "Firefox": {
-        "support": true
-      },
-      "Firefox for Android": {
-        "support": true
-      },
-      "Internet Explorer": {
-        "support": true
-      },
-      "IE Mobile": {
-        "support": true
-      },
-      "Opera": {
-        "support": true
-      },
-      "Opera Mobile": {
-        "support": true
-      },
-      "Safari": {
-        "support": true
-      },
-      "Safari Mobile": {
-        "support": true
-      },
-      "Servo": {
-        "support": true
-      },
-      "status": {
-        "experimental": false,
-        "standardized": true,
-        "stable": true,
-        "obsolete": false
-      }
-    }
-  },
-  "503": {
-    "Basic support": {
-      "Android": {
-        "support": true
-      },
-      "Chrome": {
-        "support": true
-      },
-      "Chrome for Android": {
-        "support": true
-      },
-      "Edge": {
-        "support": true
-      },
-      "Edge Mobile": {
-        "support": true
-      },
-      "Firefox": {
-        "support": true
-      },
-      "Firefox for Android": {
-        "support": true
-      },
-      "Internet Explorer": {
-        "support": true
-      },
-      "IE Mobile": {
-        "support": true
-      },
-      "Opera": {
-        "support": true
-      },
-      "Opera Mobile": {
-        "support": true
-      },
-      "Safari": {
-        "support": true
-      },
-      "Safari Mobile": {
-        "support": true
-      },
-      "Servo": {
-        "support": true
-      },
-      "status": {
-        "experimental": false,
-        "standardized": true,
-        "stable": true,
-        "obsolete": false
-      }
-    }
-  },
-  "504": {
-    "Basic support": {
-      "Android": {
-        "support": true
-      },
-      "Chrome": {
-        "support": true
-      },
-      "Chrome for Android": {
-        "support": true
-      },
-      "Edge": {
-        "support": true
-      },
-      "Edge Mobile": {
-        "support": true
-      },
-      "Firefox": {
-        "support": true
-      },
-      "Firefox for Android": {
-        "support": true
-      },
-      "Internet Explorer": {
-        "support": true
-      },
-      "IE Mobile": {
-        "support": true
-      },
-      "Opera": {
-        "support": true
-      },
-      "Opera Mobile": {
-        "support": true
-      },
-      "Safari": {
-        "support": true
-      },
-      "Safari Mobile": {
-        "support": true
-      },
-      "Servo": {
-        "support": true
-      },
-      "status": {
-        "experimental": false,
-        "standardized": true,
-        "stable": true,
-        "obsolete": false
+  "version": "1.0.0",
+  "data": {
+    "http": {
+      "methods": {
+        "100": {
+          "__compat": {
+            "basic_support": {
+              "desc": "Basic support",
+              "support": {
+                "webview_android": {
+                  "version_added": true
+                },
+                "chrome": {
+                  "version_added": true
+                },
+                "chrome_android": {
+                  "version_added": true
+                },
+                "edge": {
+                  "version_added": true
+                },
+                "edge_mobile": {
+                  "version_added": true
+                },
+                "firefox": {
+                  "version_added": true
+                },
+                "firefox_android": {
+                  "version_added": true
+                },
+                "ie": {
+                  "version_added": true
+                },
+                "ie_mobile": {
+                  "version_added": true
+                },
+                "opera": {
+                  "version_added": true
+                },
+                "opera_android": {
+                  "version_added": true
+                },
+                "safari": {
+                  "version_added": true
+                },
+                "safari_ios": {
+                  "version_added": true
+                },
+                "servo": {
+                  "version_added": true
+                }
+              },
+              "status": {
+                "experimental": false,
+                "standard_track": true,
+                "obsolete": false
+              }
+            }
+          }
+        },
+        "200": {
+          "__compat": {
+            "basic_support": {
+              "desc": "Basic support",
+              "support": {
+                "webview_android": {
+                  "version_added": true
+                },
+                "chrome": {
+                  "version_added": true
+                },
+                "chrome_android": {
+                  "version_added": true
+                },
+                "edge": {
+                  "version_added": true
+                },
+                "edge_mobile": {
+                  "version_added": true
+                },
+                "firefox": {
+                  "version_added": true
+                },
+                "firefox_android": {
+                  "version_added": true
+                },
+                "ie": {
+                  "version_added": true
+                },
+                "ie_mobile": {
+                  "version_added": true
+                },
+                "opera": {
+                  "version_added": true
+                },
+                "opera_android": {
+                  "version_added": true
+                },
+                "safari": {
+                  "version_added": true
+                },
+                "safari_ios": {
+                  "version_added": true
+                },
+                "servo": {
+                  "version_added": true
+                }
+              },
+              "status": {
+                "experimental": false,
+                "standard_track": true,
+                "obsolete": false
+              }
+            }
+          }
+        },
+        "201": {
+          "__compat": {
+            "basic_support": {
+              "desc": "Basic support",
+              "support": {
+                "webview_android": {
+                  "version_added": true
+                },
+                "chrome": {
+                  "version_added": true
+                },
+                "chrome_android": {
+                  "version_added": true
+                },
+                "edge": {
+                  "version_added": true
+                },
+                "edge_mobile": {
+                  "version_added": true
+                },
+                "firefox": {
+                  "version_added": true
+                },
+                "firefox_android": {
+                  "version_added": true
+                },
+                "ie": {
+                  "version_added": true
+                },
+                "ie_mobile": {
+                  "version_added": true
+                },
+                "opera": {
+                  "version_added": true
+                },
+                "opera_android": {
+                  "version_added": true
+                },
+                "safari": {
+                  "version_added": true
+                },
+                "safari_ios": {
+                  "version_added": true
+                },
+                "servo": {
+                  "version_added": true
+                }
+              },
+              "status": {
+                "experimental": false,
+                "standard_track": true,
+                "obsolete": false
+              }
+            }
+          }
+        },
+        "204": {
+          "__compat": {
+            "basic_support": {
+              "desc": "Basic support",
+              "support": {
+                "webview_android": {
+                  "version_added": true
+                },
+                "chrome": {
+                  "version_added": true
+                },
+                "chrome_android": {
+                  "version_added": true
+                },
+                "edge": {
+                  "version_added": true
+                },
+                "edge_mobile": {
+                  "version_added": true
+                },
+                "firefox": {
+                  "version_added": true
+                },
+                "firefox_android": {
+                  "version_added": true
+                },
+                "ie": {
+                  "version_added": true
+                },
+                "ie_mobile": {
+                  "version_added": true
+                },
+                "opera": {
+                  "version_added": true
+                },
+                "opera_android": {
+                  "version_added": true
+                },
+                "safari": {
+                  "version_added": true
+                },
+                "safari_ios": {
+                  "version_added": true
+                },
+                "servo": {
+                  "version_added": true
+                }
+              },
+              "status": {
+                "experimental": false,
+                "standard_track": true,
+                "obsolete": false
+              }
+            }
+          }
+        },
+        "206": {
+          "__compat": {
+            "basic_support": {
+              "desc": "Basic support",
+              "support": {
+                "webview_android": {
+                  "version_added": true
+                },
+                "chrome": {
+                  "version_added": true
+                },
+                "chrome_android": {
+                  "version_added": true
+                },
+                "edge": {
+                  "version_added": true
+                },
+                "edge_mobile": {
+                  "version_added": true
+                },
+                "firefox": {
+                  "version_added": true
+                },
+                "firefox_android": {
+                  "version_added": true
+                },
+                "ie": {
+                  "version_added": true
+                },
+                "ie_mobile": {
+                  "version_added": true
+                },
+                "opera": {
+                  "version_added": true
+                },
+                "opera_android": {
+                  "version_added": true
+                },
+                "safari": {
+                  "version_added": true
+                },
+                "safari_ios": {
+                  "version_added": true
+                },
+                "servo": {
+                  "version_added": true
+                }
+              },
+              "status": {
+                "experimental": false,
+                "standard_track": true,
+                "obsolete": false
+              }
+            }
+          }
+        },
+        "301": {
+          "__compat": {
+            "basic_support": {
+              "desc": "Basic support",
+              "support": {
+                "webview_android": {
+                  "version_added": true
+                },
+                "chrome": {
+                  "version_added": true
+                },
+                "chrome_android": {
+                  "version_added": true
+                },
+                "edge": {
+                  "version_added": true
+                },
+                "edge_mobile": {
+                  "version_added": true
+                },
+                "firefox": {
+                  "version_added": true
+                },
+                "firefox_android": {
+                  "version_added": true
+                },
+                "ie": {
+                  "version_added": true
+                },
+                "ie_mobile": {
+                  "version_added": true
+                },
+                "opera": {
+                  "version_added": true
+                },
+                "opera_android": {
+                  "version_added": true
+                },
+                "safari": {
+                  "version_added": true
+                },
+                "safari_ios": {
+                  "version_added": true
+                },
+                "servo": {
+                  "version_added": true
+                }
+              },
+              "status": {
+                "experimental": false,
+                "standard_track": true,
+                "obsolete": false
+              }
+            }
+          }
+        },
+        "302": {
+          "__compat": {
+            "basic_support": {
+              "desc": "Basic support",
+              "support": {
+                "webview_android": {
+                  "version_added": true
+                },
+                "chrome": {
+                  "version_added": true
+                },
+                "chrome_android": {
+                  "version_added": true
+                },
+                "edge": {
+                  "version_added": true
+                },
+                "edge_mobile": {
+                  "version_added": true
+                },
+                "firefox": {
+                  "version_added": true
+                },
+                "firefox_android": {
+                  "version_added": true
+                },
+                "ie": {
+                  "version_added": true
+                },
+                "ie_mobile": {
+                  "version_added": true
+                },
+                "opera": {
+                  "version_added": true
+                },
+                "opera_android": {
+                  "version_added": true
+                },
+                "safari": {
+                  "version_added": true
+                },
+                "safari_ios": {
+                  "version_added": true
+                },
+                "servo": {
+                  "version_added": true
+                }
+              },
+              "status": {
+                "experimental": false,
+                "standard_track": true,
+                "obsolete": false
+              }
+            }
+          }
+        },
+        "303": {
+          "__compat": {
+            "basic_support": {
+              "desc": "Basic support",
+              "support": {
+                "webview_android": {
+                  "version_added": true
+                },
+                "chrome": {
+                  "version_added": true
+                },
+                "chrome_android": {
+                  "version_added": true
+                },
+                "edge": {
+                  "version_added": true
+                },
+                "edge_mobile": {
+                  "version_added": true
+                },
+                "firefox": {
+                  "version_added": true
+                },
+                "firefox_android": {
+                  "version_added": true
+                },
+                "ie": {
+                  "version_added": true
+                },
+                "ie_mobile": {
+                  "version_added": true
+                },
+                "opera": {
+                  "version_added": true
+                },
+                "opera_android": {
+                  "version_added": true
+                },
+                "safari": {
+                  "version_added": true
+                },
+                "safari_ios": {
+                  "version_added": true
+                },
+                "servo": {
+                  "version_added": true
+                }
+              },
+              "status": {
+                "experimental": false,
+                "standard_track": true,
+                "obsolete": false
+              }
+            }
+          }
+        },
+        "304": {
+          "__compat": {
+            "basic_support": {
+              "desc": "Basic support",
+              "support": {
+                "webview_android": {
+                  "version_added": true
+                },
+                "chrome": {
+                  "version_added": true
+                },
+                "chrome_android": {
+                  "version_added": true
+                },
+                "edge": {
+                  "version_added": true
+                },
+                "edge_mobile": {
+                  "version_added": true
+                },
+                "firefox": {
+                  "version_added": true
+                },
+                "firefox_android": {
+                  "version_added": true
+                },
+                "ie": {
+                  "version_added": true
+                },
+                "ie_mobile": {
+                  "version_added": true
+                },
+                "opera": {
+                  "version_added": true
+                },
+                "opera_android": {
+                  "version_added": true
+                },
+                "safari": {
+                  "version_added": true
+                },
+                "safari_ios": {
+                  "version_added": true
+                },
+                "servo": {
+                  "version_added": true
+                }
+              },
+              "status": {
+                "experimental": false,
+                "standard_track": true,
+                "obsolete": false
+              }
+            }
+          }
+        },
+        "307": {
+          "__compat": {
+            "basic_support": {
+              "desc": "Basic support",
+              "support": {
+                "webview_android": {
+                  "version_added": true
+                },
+                "chrome": {
+                  "version_added": true
+                },
+                "chrome_android": {
+                  "version_added": true
+                },
+                "edge": {
+                  "version_added": true
+                },
+                "edge_mobile": {
+                  "version_added": true
+                },
+                "firefox": {
+                  "version_added": true
+                },
+                "firefox_android": {
+                  "version_added": true
+                },
+                "ie": {
+                  "version_added": true
+                },
+                "ie_mobile": {
+                  "version_added": true
+                },
+                "opera": {
+                  "version_added": true
+                },
+                "opera_android": {
+                  "version_added": true
+                },
+                "safari": {
+                  "version_added": true
+                },
+                "safari_ios": {
+                  "version_added": true
+                },
+                "servo": {
+                  "version_added": true
+                }
+              },
+              "status": {
+                "experimental": false,
+                "standard_track": true,
+                "obsolete": false
+              }
+            }
+          }
+        },
+        "308": {
+          "__compat": {
+            "basic_support": {
+              "desc": "Basic support",
+              "support": {
+                "webview_android": {
+                  "version_added": true
+                },
+                "chrome": {
+                  "version_added": true
+                },
+                "chrome_android": {
+                  "version_added": true
+                },
+                "edge": {
+                  "version_added": true
+                },
+                "edge_mobile": {
+                  "version_added": true
+                },
+                "firefox": {
+                  "version_added": true
+                },
+                "firefox_android": {
+                  "version_added": true
+                },
+                "ie": {
+                  "version_added": true
+                },
+                "ie_mobile": {
+                  "version_added": true
+                },
+                "opera": {
+                  "version_added": true
+                },
+                "opera_android": {
+                  "version_added": true
+                },
+                "safari": {
+                  "version_added": true
+                },
+                "safari_ios": {
+                  "version_added": true
+                },
+                "servo": {
+                  "version_added": true
+                }
+              },
+              "status": {
+                "experimental": false,
+                "standard_track": true,
+                "obsolete": false
+              }
+            }
+          }
+        },
+        "401": {
+          "__compat": {
+            "basic_support": {
+              "desc": "Basic support",
+              "support": {
+                "webview_android": {
+                  "version_added": true
+                },
+                "chrome": {
+                  "version_added": true
+                },
+                "chrome_android": {
+                  "version_added": true
+                },
+                "edge": {
+                  "version_added": true
+                },
+                "edge_mobile": {
+                  "version_added": true
+                },
+                "firefox": {
+                  "version_added": true
+                },
+                "firefox_android": {
+                  "version_added": true
+                },
+                "ie": {
+                  "version_added": true
+                },
+                "ie_mobile": {
+                  "version_added": true
+                },
+                "opera": {
+                  "version_added": true
+                },
+                "opera_android": {
+                  "version_added": true
+                },
+                "safari": {
+                  "version_added": true
+                },
+                "safari_ios": {
+                  "version_added": true
+                },
+                "servo": {
+                  "version_added": true
+                }
+              },
+              "status": {
+                "experimental": false,
+                "standard_track": true,
+                "obsolete": false
+              }
+            }
+          }
+        },
+        "403": {
+          "__compat": {
+            "basic_support": {
+              "desc": "Basic support",
+              "status": {
+                "webview_android": {
+                  "version_added": true
+                },
+                "chrome": {
+                  "version_added": true
+                },
+                "chrome_android": {
+                  "version_added": true
+                },
+                "edge": {
+                  "version_added": true
+                },
+                "edge_mobile": {
+                  "version_added": true
+                },
+                "firefox": {
+                  "version_added": true
+                },
+                "firefox_android": {
+                  "version_added": true
+                },
+                "ie": {
+                  "version_added": true
+                },
+                "ie_mobile": {
+                  "version_added": true
+                },
+                "opera": {
+                  "version_added": true
+                },
+                "opera_android": {
+                  "version_added": true
+                },
+                "safari": {
+                  "version_added": true
+                },
+                "safari_ios": {
+                  "version_added": true
+                },
+                "servo": {
+                  "version_added": true
+                }
+              },
+              "status": {
+                "experimental": false,
+                "standard_track": true,
+                "obsolete": false
+              }
+            }
+          }
+        },
+        "404": {
+          "__compat": {
+            "basic_support": {
+              "desc": "Basic support",
+              "support": {
+                "webview_android": {
+                  "version_added": true
+                },
+                "chrome": {
+                  "version_added": true
+                },
+                "chrome_android": {
+                  "version_added": true
+                },
+                "edge": {
+                  "version_added": true
+                },
+                "edge_mobile": {
+                  "version_added": true
+                },
+                "firefox": {
+                  "version_added": true
+                },
+                "firefox_android": {
+                  "version_added": true
+                },
+                "ie": {
+                  "version_added": true
+                },
+                "ie_mobile": {
+                  "version_added": true
+                },
+                "opera": {
+                  "version_added": true
+                },
+                "opera_android": {
+                  "version_added": true
+                },
+                "safari": {
+                  "version_added": true
+                },
+                "safari_ios": {
+                  "version_added": true
+                },
+                "servo": {
+                  "version_added": true
+                }
+              },
+              "status": {
+                "experimental": false,
+                "standard_track": true,
+                "obsolete": false
+              }
+            }
+          }
+        },
+        "406": {
+          "__compat": {
+            "basic_support": {
+              "desc": "Basic support",
+              "support": {
+                "webview_android": {
+                  "version_added": true
+                },
+                "chrome": {
+                  "version_added": true
+                },
+                "chrome_android": {
+                  "version_added": true
+                },
+                "edge": {
+                  "version_added": true
+                },
+                "edge_mobile": {
+                  "version_added": true
+                },
+                "firefox": {
+                  "version_added": true
+                },
+                "firefox_android": {
+                  "version_added": true
+                },
+                "ie": {
+                  "version_added": true
+                },
+                "ie_mobile": {
+                  "version_added": true
+                },
+                "opera": {
+                  "version_added": true
+                },
+                "opera_android": {
+                  "version_added": true
+                },
+                "safari": {
+                  "version_added": true
+                },
+                "safari_ios": {
+                  "version_added": true
+                },
+                "servo": {
+                  "version_added": true
+                }
+              },
+              "status": {
+                "experimental": false,
+                "standard_track": true,
+                "obsolete": false
+              }
+            }
+          }
+        },
+        "407": {
+          "__compat": {
+            "basic_support": {
+              "desc": "Basic support",
+              "status": {
+                "webview_android": {
+                  "version_added": true
+                },
+                "chrome": {
+                  "version_added": true
+                },
+                "chrome_android": {
+                  "version_added": true
+                },
+                "edge": {
+                  "version_added": true
+                },
+                "edge_mobile": {
+                  "version_added": true
+                },
+                "firefox": {
+                  "version_added": true
+                },
+                "firefox_android": {
+                  "version_added": true
+                },
+                "ie": {
+                  "version_added": true
+                },
+                "ie_mobile": {
+                  "version_added": true
+                },
+                "opera": {
+                  "version_added": true
+                },
+                "opera_android": {
+                  "version_added": true
+                },
+                "safari": {
+                  "version_added": true
+                },
+                "safari_ios": {
+                  "version_added": true
+                },
+                "servo": {
+                  "version_added": true
+                }
+              },
+              "status": {
+                "experimental": false,
+                "standard_track": true,
+                "obsolete": false
+              }
+            }
+          }
+        },
+        "410": {
+          "__compat": {
+            "basic_support": {
+              "desc": "Basic support",
+              "support": {
+                "webview_android": {
+                  "version_added": true
+                },
+                "chrome": {
+                  "version_added": true
+                },
+                "chrome_android": {
+                  "version_added": true
+                },
+                "edge": {
+                  "version_added": true
+                },
+                "edge_mobile": {
+                  "version_added": true
+                },
+                "firefox": {
+                  "version_added": true
+                },
+                "firefox_android": {
+                  "version_added": true
+                },
+                "ie": {
+                  "version_added": true
+                },
+                "ie_mobile": {
+                  "version_added": true
+                },
+                "opera": {
+                  "version_added": true
+                },
+                "opera_android": {
+                  "version_added": true
+                },
+                "safari": {
+                  "version_added": true
+                },
+                "safari_ios": {
+                  "version_added": true
+                },
+                "servo": {
+                  "version_added": true
+                }
+              },
+              "status": {
+                "experimental": false,
+                "standard_track": true,
+                "obsolete": false
+              }
+            }
+          }
+        },
+        "412": {
+          "__compat": {
+            "basic_support": {
+              "desc": "Basic support",
+              "support": {
+                "webview_android": {
+                  "version_added": true
+                },
+                "chrome": {
+                  "version_added": true
+                },
+                "chrome_android": {
+                  "version_added": true
+                },
+                "edge": {
+                  "version_added": true
+                },
+                "edge_mobile": {
+                  "version_added": true
+                },
+                "firefox": {
+                  "version_added": true
+                },
+                "firefox_android": {
+                  "version_added": true
+                },
+                "ie": {
+                  "version_added": true
+                },
+                "ie_mobile": {
+                  "version_added": true
+                },
+                "opera": {
+                  "version_added": true
+                },
+                "opera_android": {
+                  "version_added": true
+                },
+                "safari": {
+                  "version_added": true
+                },
+                "safari_ios": {
+                  "version_added": true
+                },
+                "servo": {
+                  "version_added": true
+                }
+              },
+              "status": {
+                "experimental": false,
+                "standard_track": true,
+                "obsolete": false
+              }
+            }
+          }
+        },
+        "416": {
+          "__compat": {
+            "basic_support": {
+              "desc": "Basic support",
+              "status": {
+                "webview_android": {
+                  "version_added": true
+                },
+                "chrome": {
+                  "version_added": true
+                },
+                "chrome_android": {
+                  "version_added": true
+                },
+                "edge": {
+                  "version_added": true
+                },
+                "edge_mobile": {
+                  "version_added": true
+                },
+                "firefox": {
+                  "version_added": true
+                },
+                "firefox_android": {
+                  "version_added": true
+                },
+                "ie": {
+                  "version_added": true
+                },
+                "ie_mobile": {
+                  "version_added": true
+                },
+                "opera": {
+                  "version_added": true
+                },
+                "opera_android": {
+                  "version_added": true
+                },
+                "safari": {
+                  "version_added": true
+                },
+                "safari_ios": {
+                  "version_added": true
+                },
+                "servo": {
+                  "version_added": true
+                }
+              },
+              "status": {
+                "experimental": false,
+                "standard_track": true,
+                "obsolete": false
+              }
+            }
+          }
+        },
+        "451": {
+          "__compat": {
+            "basic_support": {
+              "desc": "Basic support",
+              "support": {
+                "webview_android": {
+                  "version_added": true
+                },
+                "chrome": {
+                  "version_added": true
+                },
+                "chrome_android": {
+                  "version_added": true
+                },
+                "edge": {
+                  "version_added": true
+                },
+                "edge_mobile": {
+                  "version_added": true
+                },
+                "firefox": {
+                  "version_added": true
+                },
+                "firefox_android": {
+                  "version_added": true
+                },
+                "ie": {
+                  "version_added": true
+                },
+                "ie_mobile": {
+                  "version_added": true
+                },
+                "opera": {
+                  "version_added": true
+                },
+                "opera_android": {
+                  "version_added": true
+                },
+                "safari": {
+                  "version_added": true
+                },
+                "safari_ios": {
+                  "version_added": true
+                },
+                "servo": {
+                  "version_added": true
+                }
+              },
+              "status": {
+                "experimental": false,
+                "standard_track": true,
+                "obsolete": false
+              }
+            }
+          }
+        },
+        "500": {
+          "__compat": {
+            "basic_support": {
+              "desc": "Basic support",
+              "support": {
+                "webview_android": {
+                  "version_added": true
+                },
+                "chrome": {
+                  "version_added": true
+                },
+                "chrome_android": {
+                  "version_added": true
+                },
+                "edge": {
+                  "version_added": true
+                },
+                "edge_mobile": {
+                  "version_added": true
+                },
+                "firefox": {
+                  "version_added": true
+                },
+                "firefox_android": {
+                  "version_added": true
+                },
+                "ie": {
+                  "version_added": true
+                },
+                "ie_mobile": {
+                  "version_added": true
+                },
+                "opera": {
+                  "version_added": true
+                },
+                "opera_android": {
+                  "version_added": true
+                },
+                "safari": {
+                  "version_added": true
+                },
+                "safari_ios": {
+                  "version_added": true
+                },
+                "servo": {
+                  "version_added": true
+                }
+              },
+              "status": {
+                "experimental": false,
+                "standard_track": true,
+                "obsolete": false
+              }
+            }
+          }
+        },
+        "501": {
+          "__compat": {
+            "basic_support": {
+              "desc": "Basic support",
+              "support": {
+                "webview_android": {
+                  "version_added": true
+                },
+                "chrome": {
+                  "version_added": true
+                },
+                "chrome_android": {
+                  "version_added": true
+                },
+                "edge": {
+                  "version_added": true
+                },
+                "edge_mobile": {
+                  "version_added": true
+                },
+                "firefox": {
+                  "version_added": true
+                },
+                "firefox_android": {
+                  "version_added": true
+                },
+                "ie": {
+                  "version_added": true
+                },
+                "ie_mobile": {
+                  "version_added": true
+                },
+                "opera": {
+                  "version_added": true
+                },
+                "opera_android": {
+                  "version_added": true
+                },
+                "safari": {
+                  "version_added": true
+                },
+                "safari_ios": {
+                  "version_added": true
+                },
+                "servo": {
+                  "version_added": true
+                }
+              },
+              "status": {
+                "experimental": false,
+                "standard_track": true,
+                "obsolete": false
+              }
+            }
+          }
+        },
+        "502": {
+          "__compat": {
+            "basic_support": {
+              "desc": "Basic support",
+              "support": {
+                "webview_android": {
+                  "version_added": true
+                },
+                "chrome": {
+                  "version_added": true
+                },
+                "chrome_android": {
+                  "version_added": true
+                },
+                "edge": {
+                  "version_added": true
+                },
+                "edge_mobile": {
+                  "version_added": true
+                },
+                "firefox": {
+                  "version_added": true
+                },
+                "firefox_android": {
+                  "version_added": true
+                },
+                "ie": {
+                  "version_added": true
+                },
+                "ie_mobile": {
+                  "version_added": true
+                },
+                "opera": {
+                  "version_added": true
+                },
+                "opera_android": {
+                  "version_added": true
+                },
+                "safari": {
+                  "version_added": true
+                },
+                "safari_ios": {
+                  "version_added": true
+                },
+                "servo": {
+                  "version_added": true
+                }
+              },
+              "status": {
+                "experimental": false,
+                "standard_track": true,
+                "obsolete": false
+              }
+            }
+          }
+        },
+        "503": {
+          "__compat": {
+            "basic_support": {
+              "desc": "Basic support",
+              "support": {
+                "webview_android": {
+                  "version_added": true
+                },
+                "chrome": {
+                  "version_added": true
+                },
+                "chrome_android": {
+                  "version_added": true
+                },
+                "edge": {
+                  "version_added": true
+                },
+                "edge_mobile": {
+                  "version_added": true
+                },
+                "firefox": {
+                  "version_added": true
+                },
+                "firefox_android": {
+                  "version_added": true
+                },
+                "ie": {
+                  "version_added": true
+                },
+                "ie_mobile": {
+                  "version_added": true
+                },
+                "opera": {
+                  "version_added": true
+                },
+                "opera_android": {
+                  "version_added": true
+                },
+                "safari": {
+                  "version_added": true
+                },
+                "safari_ios": {
+                  "version_added": true
+                },
+                "servo": {
+                  "version_added": true
+                }
+              },
+              "status": {
+                "experimental": false,
+                "standard_track": true,
+                "obsolete": false
+              }
+            }
+          }
+        },
+        "504": {
+          "__compat": {
+            "basic_support": {
+              "desc": "Basic support",
+              "support": {
+                "webview_android": {
+                  "version_added": true
+                },
+                "chrome": {
+                  "version_added": true
+                },
+                "chrome_android": {
+                  "version_added": true
+                },
+                "edge": {
+                  "version_added": true
+                },
+                "edge_mobile": {
+                  "version_added": true
+                },
+                "firefox": {
+                  "version_added": true
+                },
+                "firefox_android": {
+                  "version_added": true
+                },
+                "ie": {
+                  "version_added": true
+                },
+                "ie_mobile": {
+                  "version_added": true
+                },
+                "opera": {
+                  "version_added": true
+                },
+                "opera_android": {
+                  "version_added": true
+                },
+                "safari": {
+                  "version_added": true
+                },
+                "safari_ios": {
+                  "version_added": true
+                },
+                "servo": {
+                  "version_added": true
+                }
+              },
+              "status": {
+                "experimental": false,
+                "standard_track": true,
+                "obsolete": false
+              }
+            }
+          }
+        }
       }
     }
   }
diff --git a/javascript/promise.json b/javascript/promise.json
index 33c7bb61cb0a1..db45e3ebd34aa 100644
--- a/javascript/promise.json
+++ b/javascript/promise.json
@@ -1,446 +1,483 @@
 {
-  "Promise": {
-    "Basic support": {
-      "Android": {
-        "support": "4.4.4"
-      },
-      "Chrome": {
-        "support": "32.0"
-      },
-      "Chrome for Android": {
-        "support": "32.0"
-      },
-      "Edge": {
-        "support": true
-      },
-      "Edge Mobile": {
-        "support": true
-      },
-      "Firefox": {
-        "support": "29.0",
-        "notes": ["Constructor requires a new operator since version 37."]
-      },
-      "Firefox for Android": {
-        "support": "29",
-        "notes": ["Constructor requires a new operator since version 37."]
-      },
-      "Internet Explorer": {
-        "support": false
-      },
-      "IE Mobile": {
-        "support": false
-      },
-      "Node.js": {
-        "support": "0.12",
-        "notes": ["Constructor requires a new operator since version 4."]
-      },
-      "Opera": {
-        "support": "19"
-      },
-      "Opera Mobile": {
-        "support": true
-      },
-      "Safari": {
-        "support": "7.1",
-        "notes": ["Constructor requires a new operator since version 10."]
-      },
-      "Safari Mobile": {
-        "support": "8.0",
-        "notes": ["Constructor requires a new operator since version 10."]
-      },
-      "Servo": {
-        "support": false
-      },
-      "status": {
-        "experimental": false,
-        "standardized": true,
-        "stable": true,
-        "obsolete": false
-      }
-    }
-  },
-  "Promise.all": {
-    "Basic support": {
-      "Android": {
-        "support": "4.4.4"
-      },
-      "Chrome": {
-        "support": "32.0"
-      },
-      "Chrome for Android": {
-        "support": "32.0"
-      },
-      "Edge": {
-        "support": true
-      },
-      "Edge Mobile": {
-        "support": true
-      },
-      "Firefox": {
-        "support": "29.0"
-      },
-      "Firefox for Android": {
-        "support": "29"
-      },
-      "Internet Explorer": {
-        "support": false
-      },
-      "IE Mobile": {
-        "support": false
-      },
-      "Node.js": {
-        "support": "0.12"
-      },
-      "Opera": {
-        "support": "19"
-      },
-      "Opera Mobile": {
-        "support": true
-      },
-      "Safari": {
-        "support": "7.1"
-      },
-      "Safari Mobile": {
-        "support": "8.0"
-      },
-      "Servo": {
-        "support": false
-      },
-      "status": {
-        "experimental": false,
-        "standardized": true,
-        "stable": true,
-        "obsolete": false
-      }
-    }
-  },
-  "Promise.prototype": {
-    "Basic support": {
-      "Android": {
-        "support": "4.4.4"
-      },
-      "Chrome": {
-        "support": "32.0"
-      },
-      "Chrome for Android": {
-        "support": "32.0"
-      },
-      "Edge": {
-        "support": true
-      },
-      "Edge Mobile": {
-        "support": true
-      },
-      "Firefox": {
-        "support": "29.0"
-      },
-      "Firefox for Android": {
-        "support": "29"
-      },
-      "Internet Explorer": {
-        "support": false
-      },
-      "IE Mobile": {
-        "support": false
-      },
-      "Node.js": {
-        "support": "0.12"
-      },
-      "Opera": {
-        "support": "19"
-      },
-      "Opera Mobile": {
-        "support": true
-      },
-      "Safari": {
-        "support": "7.1"
-      },
-      "Safari Mobile": {
-        "support": "8.0"
-      },
-      "Servo": {
-        "support": false
-      },
-      "status": {
-        "experimental": false,
-        "standardized": true,
-        "stable": true,
-        "obsolete": false
-      }
-    }
-  },
-  "Promise.prototype.catch": {
-    "Basic support": {
-      "Android": {
-        "support": "4.4.4"
-      },
-      "Chrome": {
-        "support": "32.0"
-      },
-      "Chrome for Android": {
-        "support": "32.0"
-      },
-      "Edge": {
-        "support": true
-      },
-      "Edge Mobile": {
-        "support": true
-      },
-      "Firefox": {
-        "support": "29.0"
-      },
-      "Firefox for Android": {
-        "support": "29"
-      },
-      "Internet Explorer": {
-        "support": false
-      },
-      "IE Mobile": {
-        "support": false
-      },
-      "Node.js": {
-        "support": "0.12"
-      },
-      "Opera": {
-        "support": "19"
-      },
-      "Opera Mobile": {
-        "support": true
-      },
-      "Safari": {
-        "support": "7.1"
-      },
-      "Safari Mobile": {
-        "support": "8.0"
-      },
-      "Servo": {
-        "support": false
-      },
-      "status": {
-        "experimental": false,
-        "standardized": true,
-        "stable": true,
-        "obsolete": false
-      }
-    }
-  },
-  "Promise.prototype.then": {
-    "Basic support": {
-      "Android": {
-        "support": "4.4.4"
-      },
-      "Chrome": {
-        "support": "32.0"
-      },
-      "Chrome for Android": {
-        "support": "32.0"
-      },
-      "Edge": {
-        "support": true
-      },
-      "Edge Mobile": {
-        "support": true
-      },
-      "Firefox": {
-        "support": "29.0"
-      },
-      "Firefox for Android": {
-        "support": "29"
-      },
-      "Internet Explorer": {
-        "support": false
-      },
-      "IE Mobile": {
-        "support": false
-      },
-      "Node.js": {
-        "support": "0.12"
-      },
-      "Opera": {
-        "support": "19"
-      },
-      "Opera Mobile": {
-        "support": true
-      },
-      "Safari": {
-        "support": "7.1"
-      },
-      "Safari Mobile": {
-        "support": "8.0"
-      },
-      "Servo": {
-        "support": false
-      },
-      "status": {
-        "experimental": false,
-        "standardized": true,
-        "stable": true,
-        "obsolete": false
-      }
-    }
-  },
-  "Promise.race": {
-    "Basic support": {
-      "Android": {
-        "support": "4.4.4"
-      },
-      "Chrome": {
-        "support": "32.0"
-      },
-      "Chrome for Android": {
-        "support": "32.0"
-      },
-      "Edge": {
-        "support": true
-      },
-      "Edge Mobile": {
-        "support": true
-      },
-      "Firefox": {
-        "support": "29.0"
-      },
-      "Firefox for Android": {
-        "support": "29"
-      },
-      "Internet Explorer": {
-        "support": false
-      },
-      "IE Mobile": {
-        "support": false
-      },
-      "Node.js": {
-        "support": "0.12"
-      },
-      "Opera": {
-        "support": "19"
-      },
-      "Opera Mobile": {
-        "support": true
-      },
-      "Safari": {
-        "support": "7.1"
-      },
-      "Safari Mobile": {
-        "support": "8.0"
-      },
-      "Servo": {
-        "support": false
-      },
-      "status": {
-        "experimental": false,
-        "standardized": true,
-        "stable": true,
-        "obsolete": false
-      }
-    }
-  },
-  "Promise.reject": {
-    "Basic support": {
-      "Android": {
-        "support": "4.4.4"
-      },
-      "Chrome": {
-        "support": "32.0"
-      },
-      "Chrome for Android": {
-        "support": "32.0"
-      },
-      "Edge": {
-        "support": true
-      },
-      "Edge Mobile": {
-        "support": true
-      },
-      "Firefox": {
-        "support": "29.0"
-      },
-      "Firefox for Android": {
-        "support": "29"
-      },
-      "Internet Explorer": {
-        "support": false
-      },
-      "IE Mobile": {
-        "support": false
-      },
-      "Node.js": {
-        "support": "0.12"
-      },
-      "Opera": {
-        "support": "19"
-      },
-      "Opera Mobile": {
-        "support": true
-      },
-      "Safari": {
-        "support": "7.1"
-      },
-      "Safari Mobile": {
-        "support": "8.0"
-      },
-      "Servo": {
-        "support": false
-      },
-      "status": {
-        "experimental": false,
-        "standardized": true,
-        "stable": true,
-        "obsolete": false
-      }
-    }
-  },
-  "Promise.resolve": {
-    "Basic support": {
-      "Android": {
-        "support": "4.4.4"
-      },
-      "Chrome": {
-        "support": "32.0"
-      },
-      "Chrome for Android": {
-        "support": "32.0"
-      },
-      "Edge": {
-        "support": true
-      },
-      "Edge Mobile": {
-        "support": true
-      },
-      "Firefox": {
-        "support": "29.0"
-      },
-      "Firefox for Android": {
-        "support": "29"
-      },
-      "Internet Explorer": {
-        "support": false
-      },
-      "IE Mobile": {
-        "support": false
-      },
-      "Node.js": {
-        "support": "0.12"
-      },
-      "Opera": {
-        "support": "19"
-      },
-      "Opera Mobile": {
-        "support": true
-      },
-      "Safari": {
-        "support": "7.1"
-      },
-      "Safari Mobile": {
-        "support": "8.0"
-      },
-      "Servo": {
-        "support": false
-      },
-      "status": {
-        "experimental": false,
-        "standardized": true,
-        "stable": true,
-        "obsolete": false
+  "version": "1.0.0",
+  "data": {
+    "javascript": {
+      "Promise": {
+        "__compat": {
+          "basic_support": {
+            "desc": "Basic support",
+            "support": {
+              "webview_android": {
+                "version_added": "4.4.4"
+              },
+              "chrome": {
+                "version_added": "32.0"
+              },
+              "chrome_android": {
+                "version_added": "32.0"
+              },
+              "edge": {
+                "version_added": true
+              },
+              "edge_mobile": {
+                "version_added": true
+              },
+              "firefox": {
+                "version_added": "29.0",
+                "notes": ["Constructor requires a new operator since version 37."]
+              },
+              "firefox_android": {
+                "version_added": "29",
+                "notes": ["Constructor requires a new operator since version 37."]
+              },
+              "ie": {
+                "version_added": false
+              },
+              "ie_mobile": {
+                "version_added": false
+              },
+              "Node.js": {
+                "version_added": "0.12",
+                "notes": ["Constructor requires a new operator since version 4."]
+              },
+              "opera": {
+                "version_added": "19"
+              },
+              "opera_android": {
+                "version_added": true
+              },
+              "safari": {
+                "version_added": "7.1",
+                "notes": ["Constructor requires a new operator since version 10."]
+              },
+              "safari_ios": {
+                "version_added": "8.0",
+                "notes": ["Constructor requires a new operator since version 10."]
+              },
+              "servo": {
+                "version_added": false
+              }
+            },
+            "status": {
+              "experimental": false,
+              "standard_track": true,
+              "obsolete": false
+            }
+          }
+        }
+      },
+      "Promise.all": {
+        "__compat": {
+          "basic_support": {
+            "desc": "Basic support",
+            "support": {
+              "webview_android": {
+                "version_added": "4.4.4"
+              },
+              "chrome": {
+                "version_added": "32.0"
+              },
+              "chrome_android": {
+                "version_added": "32.0"
+              },
+              "edge": {
+                "version_added": true
+              },
+              "edge_mobile": {
+                "version_added": true
+              },
+              "firefox": {
+                "version_added": "29.0"
+              },
+              "firefox_android": {
+                "version_added": "29"
+              },
+              "ie": {
+                "version_added": false
+              },
+              "ie_mobile": {
+                "version_added": false
+              },
+              "Node.js": {
+                "version_added": "0.12"
+              },
+              "opera": {
+                "version_added": "19"
+              },
+              "opera_android": {
+                "version_added": true
+              },
+              "safari": {
+                "version_added": "7.1"
+              },
+              "safari_ios": {
+                "version_added": "8.0"
+              },
+              "servo": {
+                "version_added": false
+              }
+            },
+            "status": {
+              "experimental": false,
+              "standard_track": true,
+              "obsolete": false
+            }
+          }
+        }
+      },
+      "Promise.prototype": {
+        "__compat": {
+          "basic_support": {
+            "desc": "Basic support",
+            "support": {
+              "webview_android": {
+                "version_added": "4.4.4"
+              },
+              "chrome": {
+                "version_added": "32.0"
+              },
+              "chrome_android": {
+                "version_added": "32.0"
+              },
+              "edge": {
+                "version_added": true
+              },
+              "edge_mobile": {
+                "version_added": true
+              },
+              "firefox": {
+                "version_added": "29.0"
+              },
+              "firefox_android": {
+                "version_added": "29"
+              },
+              "ie": {
+                "version_added": false
+              },
+              "ie_mobile": {
+                "version_added": false
+              },
+              "Node.js": {
+                "version_added": "0.12"
+              },
+              "opera": {
+                "version_added": "19"
+              },
+              "opera_android": {
+                "version_added": true
+              },
+              "safari": {
+                "version_added": "7.1"
+              },
+              "safari_ios": {
+                "version_added": "8.0"
+              },
+              "servo": {
+                "version_added": false
+              }
+            },
+            "status": {
+              "experimental": false,
+              "standard_track": true,
+              "obsolete": false
+            }
+          }
+        }
+      },
+      "Promise.prototype.catch": {
+        "__compat": {
+          "basic_support": {
+            "desc": "Basic support",
+            "support": {
+              "webview_android": {
+                "version_added": "4.4.4"
+              },
+              "chrome": {
+                "version_added": "32.0"
+              },
+              "chrome_android": {
+                "version_added": "32.0"
+              },
+              "edge": {
+                "version_added": true
+              },
+              "edge_mobile": {
+                "version_added": true
+              },
+              "firefox": {
+                "version_added": "29.0"
+              },
+              "firefox_android": {
+                "version_added": "29"
+              },
+              "ie": {
+                "version_added": false
+              },
+              "ie_mobile": {
+                "version_added": false
+              },
+              "Node.js": {
+                "version_added": "0.12"
+              },
+              "opera": {
+                "version_added": "19"
+              },
+              "opera_android": {
+                "version_added": true
+              },
+              "safari": {
+                "version_added": "7.1"
+              },
+              "safari_ios": {
+                "version_added": "8.0"
+              },
+              "servo": {
+                "version_added": false
+              }
+            },
+            "status": {
+              "experimental": false,
+              "standard_track": true,
+              "obsolete": false
+            }
+          }
+        }
+      },
+      "Promise.prototype.then": {
+        "__compat": {
+          "basic_support": {
+            "desc": "Basic support",
+            "support": {
+              "webview_android": {
+                "version_added": "4.4.4"
+              },
+              "chrome": {
+                "version_added": "32.0"
+              },
+              "chrome_android": {
+                "version_added": "32.0"
+              },
+              "edge": {
+                "version_added": true
+              },
+              "edge_mobile": {
+                "version_added": true
+              },
+              "firefox": {
+                "version_added": "29.0"
+              },
+              "firefox_android": {
+                "version_added": "29"
+              },
+              "ie": {
+                "version_added": false
+              },
+              "ie_mobile": {
+                "version_added": false
+              },
+              "Node.js": {
+                "version_added": "0.12"
+              },
+              "opera": {
+                "version_added": "19"
+              },
+              "opera_android": {
+                "version_added": true
+              },
+              "safari": {
+                "version_added": "7.1"
+              },
+              "safari_ios": {
+                "version_added": "8.0"
+              },
+              "servo": {
+                "version_added": false
+              }
+            },
+            "status": {
+              "experimental": false,
+              "standard_track": true,
+              "obsolete": false
+            }
+          }
+        }
+      },
+      "Promise.race": {
+        "__compat": {
+          "basic_support": {
+            "desc": "Basic support",
+            "support": {
+              "webview_android": {
+                "version_added": "4.4.4"
+              },
+              "chrome": {
+                "version_added": "32.0"
+              },
+              "chrome_android": {
+                "version_added": "32.0"
+              },
+              "edge": {
+                "version_added": true
+              },
+              "edge_mobile": {
+                "version_added": true
+              },
+              "firefox": {
+                "version_added": "29.0"
+              },
+              "firefox_android": {
+                "version_added": "29"
+              },
+              "ie": {
+                "version_added": false
+              },
+              "ie_mobile": {
+                "version_added": false
+              },
+              "Node.js": {
+                "version_added": "0.12"
+              },
+              "opera": {
+                "version_added": "19"
+              },
+              "opera_android": {
+                "version_added": true
+              },
+              "safari": {
+                "version_added": "7.1"
+              },
+              "safari_ios": {
+                "version_added": "8.0"
+              },
+              "servo": {
+                "version_added": false
+              }
+            },
+            "status": {
+              "experimental": false,
+              "standard_track": true,
+              "obsolete": false
+            }
+          }
+        }
+      },
+      "Promise.reject": {
+        "__compat": {
+          "basic_support": {
+            "desc": "Basic support",
+            "support": {
+              "webview_android": {
+                "version_added": "4.4.4"
+              },
+              "chrome": {
+                "version_added": "32.0"
+              },
+              "chrome_android": {
+                "version_added": "32.0"
+              },
+              "edge": {
+                "version_added": true
+              },
+              "edge_mobile": {
+                "version_added": true
+              },
+              "firefox": {
+                "version_added": "29.0"
+              },
+              "firefox_android": {
+                "version_added": "29"
+              },
+              "ie": {
+                "version_added": false
+              },
+              "ie_mobile": {
+                "version_added": false
+              },
+              "Node.js": {
+                "version_added": "0.12"
+              },
+              "opera": {
+                "version_added": "19"
+              },
+              "opera_android": {
+                "version_added": true
+              },
+              "safari": {
+                "version_added": "7.1"
+              },
+              "safari_ios": {
+                "version_added": "8.0"
+              },
+              "servo": {
+                "version_added": false
+              }
+            },
+            "status": {
+              "experimental": false,
+              "standard_track": true,
+              "obsolete": false
+            }
+          }
+        }
+      },
+      "Promise.resolve": {
+        "__compat": {
+          "basic_support": {
+            "desc": "Basic support",
+            "support": {
+              "webview_android": {
+                "version_added": "4.4.4"
+              },
+              "chrome": {
+                "version_added": "32.0"
+              },
+              "chrome_android": {
+                "version_added": "32.0"
+              },
+              "edge": {
+                "version_added": true
+              },
+              "edge_mobile": {
+                "version_added": true
+              },
+              "firefox": {
+                "version_added": "29.0"
+              },
+              "firefox_android": {
+                "version_added": "29"
+              },
+              "ie": {
+                "version_added": false
+              },
+              "ie_mobile": {
+                "version_added": false
+              },
+              "Node.js": {
+                "version_added": "0.12"
+              },
+              "opera": {
+                "version_added": "19"
+              },
+              "opera_android": {
+                "version_added": true
+              },
+              "safari": {
+                "version_added": "7.1"
+              },
+              "safari_ios": {
+                "version_added": "8.0"
+              },
+              "servo": {
+                "version_added": false
+              }
+            },
+            "status": {
+              "experimental": false,
+              "standard_track": true,
+              "obsolete": false
+            }
+          }
+        }
       }
     }
   }
diff --git a/webextensions/browser-compat-data.schema.json b/webextensions/browser-compat-data.schema.json
index 258982d325b85..3bd71e4f56a9f 100644
--- a/webextensions/browser-compat-data.schema.json
+++ b/webextensions/browser-compat-data.schema.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/draft-04/schema#",
+  "$schema": "http://json-schema.org/schema#",
 
   "definitions": {