diff --git a/lib/browser.json b/lib/browser.json
new file mode 100644
index 0000000..dd8bff4
--- /dev/null
+++ b/lib/browser.json
@@ -0,0 +1,19 @@
+{
+  "id": "browser.json#",
+  "type": "object",
+  "required": [
+    "name",
+    "version"
+  ],
+  "properties": {
+    "name": {
+      "type": "string"
+    },
+    "version": {
+      "type": "string"
+    },
+    "comment": {
+      "type": "string"
+    }
+  }
+}
diff --git a/lib/record.json b/lib/header.json
similarity index 90%
rename from lib/record.json
rename to lib/header.json
index dd2a927..2b17040 100644
--- a/lib/record.json
+++ b/lib/header.json
@@ -1,5 +1,5 @@
 {
-  "id": "record.json#",
+  "id": "header.json#",
   "type": "object",
   "required": [
     "name",
diff --git a/lib/index.js b/lib/index.js
index d01d302..fa5b21a 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -1,5 +1,6 @@
 'use strict'
 
+const browser = require('./browser.json')
 const cache = require('./cache.json')
 const cacheEntry = require('./cacheEntry.json')
 const content = require('./content.json')
@@ -7,17 +8,19 @@ const cookie = require('./cookie.json')
 const creator = require('./creator.json')
 const entry = require('./entry.json')
 const har = require('./har.json')
+const header = require('./header.json')
 const index = require('./index.js')
 const log = require('./log.json')
 const page = require('./page.json')
 const pageTimings = require('./pageTimings.json')
 const postData = require('./postData.json')
-const record = require('./record.json')
+const query = require('./query.json')
 const request = require('./request.json')
 const response = require('./response.json')
 const timings = require('./timings.json')
 
 module.exports = {
+  browser,
   cache,
   cacheEntry,
   content,
@@ -25,12 +28,13 @@ module.exports = {
   creator,
   entry,
   har,
+  header,
   index,
   log,
   page,
   pageTimings,
   postData,
-  record,
+  query,
   request,
   response,
   timings
diff --git a/lib/log.json b/lib/log.json
index c235903..402e9b4 100644
--- a/lib/log.json
+++ b/lib/log.json
@@ -14,7 +14,7 @@
       "$ref": "creator.json#"
     },
     "browser": {
-      "$ref": "creator.json#"
+      "$ref": "browser.json#"
     },
     "pages": {
       "type": "array",
diff --git a/lib/query.json b/lib/query.json
new file mode 100644
index 0000000..fa1b8af
--- /dev/null
+++ b/lib/query.json
@@ -0,0 +1,19 @@
+{
+  "id": "query.json#",
+  "type": "object",
+  "required": [
+    "name",
+    "value"
+  ],
+  "properties": {
+    "name": {
+      "type": "string"
+    },
+    "value": {
+      "type": "string"
+    },
+    "comment": {
+      "type": "string"
+    }
+  }
+}
diff --git a/lib/request.json b/lib/request.json
index d225747..06435d3 100644
--- a/lib/request.json
+++ b/lib/request.json
@@ -31,13 +31,13 @@
     "headers": {
       "type": "array",
       "items": {
-        "$ref": "record.json#"
+        "$ref": "header.json#"
       }
     },
     "queryString": {
       "type": "array",
       "items": {
-        "$ref": "record.json#"
+        "$ref": "query.json#"
       }
     },
     "postData": {
diff --git a/lib/response.json b/lib/response.json
index a9e0ba3..f27c397 100644
--- a/lib/response.json
+++ b/lib/response.json
@@ -31,7 +31,7 @@
     "headers": {
       "type": "array",
       "items": {
-        "$ref": "record.json#"
+        "$ref": "header.json#"
       }
     },
     "content": {