diff --git a/declarations/comment.js b/declarations/comment.js
index a737ef123..64268e630 100644
--- a/declarations/comment.js
+++ b/declarations/comment.js
@@ -71,7 +71,9 @@ declare type CommentTag = {
 declare type CommentMembers = {
   static: Array<Comment>,
   instance: Array<Comment>,
-  events: Array<Comment>
+  events: Array<Comment>,
+  global: Array<Comment>,
+  inner: Array<Comment>
 };
 
 declare type CommentExample = {
@@ -84,6 +86,20 @@ declare type Remark = {
   children: Array<Object>
 };
 
+declare type Access = 'private' | 'public' | 'protected';
+declare type Scope = 'instance' | 'static' | 'inner' | 'global';
+declare type Kind = 'class' |
+  'constant' |
+  'event' |
+  'external' |
+  'file' |
+  'function' |
+  'member' |
+  'mixin' |
+  'module' |
+  'namespace' |
+  'typedef';
+
 declare type Comment = {
   errors: Array<CommentError>,
   tags: Array<CommentTag>,
@@ -106,10 +122,11 @@ declare type Comment = {
   members: CommentMembers,
 
   name?: string,
-  kind?: string,
+  kind?: Kind,
+
   memberof?: string,
-  scope?: string,
-  access?: string,
+  scope?: Scope,
+  access?: Access,
   alias?: string,
 
   copyright?: string,
@@ -126,6 +143,12 @@ declare type Comment = {
 
   path?: Array<{
     name: string,
-    scope: string
+    scope: Scope
   }>
 };
+
+declare type ReducedComment = {
+  name: string,
+  kind: ?Kind,
+  scope?: ?Scope
+}
diff --git a/default_theme/index._ b/default_theme/index._
index 1934773aa..99392f6d8 100644
--- a/default_theme/index._
+++ b/default_theme/index._
@@ -56,6 +56,18 @@
                       <% }) %>
                     </ul>
                   <% } %>
+                  <% if (doc.members.inner && doc.members.inner.length) { %>
+                    <ul class='list-reset py1-ul pl1'>
+                      <li class='h5'><span>Inner members</span></li>
+                      <% doc.members.inner.forEach(function(member) { %>
+                      <li><a
+                        href='#<%=member.namespace%>'
+                        class='regular pre-open'>
+                        #<%- member.name %>
+                      </a></li>
+                      <% }) %>
+                    </ul>
+                  <% } %>
                   <% if (doc.members.events && doc.members.events.length) { %>
                     <ul class='list-reset py1-ul pl1'>
                       <li class='h5'>Events</li>
diff --git a/lib/hierarchy.js b/lib/hierarchy.js
index 422d31362..0c17fcffe 100644
--- a/lib/hierarchy.js
+++ b/lib/hierarchy.js
@@ -10,12 +10,18 @@ var hasOwnProperty = Object.prototype.hasOwnProperty;
  */
 let isEvent = member => member.kind === 'event';
 
-/*::
-declare type ReducedComment = {
-  name: string,
-  kind: ?string,
-  scope?: ?string
-} */
+/**
+ * We need to have members of all valid JSDoc scopes.
+ * @private
+ */
+let getMembers = () => ({
+  global: Object.create(null),
+  inner: Object.create(null),
+  instance: Object.create(null),
+  events: Object.create(null),
+  static: Object.create(null)
+});
+
 
 /**
  * Pick only relevant properties from a comment to store them in
@@ -49,12 +55,10 @@ function pick(comment/*: Comment */)/*: ?ReducedComment */ {
 module.exports = function (comments/*: Array<Comment>*/) {
   var id = 0,
     root = {
-      members: {
-        instance: Object.create(null),
-        static: Object.create(null)
-      }
+      members: getMembers()
     };
 
+
   comments.forEach(comment => {
     var path = [];
 
@@ -86,10 +90,7 @@ module.exports = function (comments/*: Array<Comment>*/) {
       if (!hasOwnProperty.call(node.members[scope], name)) {
         node.members[scope][name] = {
           comments: [],
-          members: {
-            instance: Object.create(null),
-            static: Object.create(null)
-          }
+          members: getMembers()
         };
       }
 
@@ -138,7 +139,7 @@ module.exports = function (comments/*: Array<Comment>*/) {
           comment.members[scope] = node.members[scope];
         }
 
-        var events = comment.members.events || [];
+        var events = comment.members.events;
         var groups = [];
 
         if (comment.members.instance.length) {
@@ -155,6 +156,20 @@ module.exports = function (comments/*: Array<Comment>*/) {
           comment.members.static = groups[false] || [];
         }
 
+        if (comment.members.inner.length) {
+          groups = _.groupBy(comment.members.inner, isEvent);
+
+          events = events.concat(groups[true] || []);
+          comment.members.inner = groups[false] || [];
+        }
+
+        if (comment.members.global.length) {
+          groups = _.groupBy(comment.members.global, isEvent);
+
+          events = events.concat(groups[true] || []);
+          comment.members.global = groups[false] || [];
+        }
+
         comment.members.events = events;
 
         comment.path = path.map(pick)
@@ -163,7 +178,9 @@ module.exports = function (comments/*: Array<Comment>*/) {
 
         var scopeChars = {
           instance: '#',
-          static: '.'
+          static: '.',
+          inner: '~',
+          global: ''
         };
 
         comment.namespace = comment.path.reduce((memo, part) => {
diff --git a/lib/output/markdown_ast.js b/lib/output/markdown_ast.js
index 1dd95acff..8c9748fb4 100644
--- a/lib/output/markdown_ast.js
+++ b/lib/output/markdown_ast.js
@@ -212,12 +212,18 @@ function buildMarkdownAST(comments/*: Array<Comment> */, config/*: Documentation
     .concat(throwsSection(comment))
     .concat(returnsSection(comment))
     .concat(metaSection(comment))
+    .concat(!!comment.members.global.length &&
+      comment.members.global.reduce((memo, child) =>
+        memo.concat(generate(depth + 1, child)), []))
     .concat(!!comment.members.instance.length &&
       comment.members.instance.reduce((memo, child) =>
         memo.concat(generate(depth + 1, child)), []))
     .concat(!!comment.members.static.length &&
       comment.members.static.reduce((memo, child) =>
         memo.concat(generate(depth + 1, child)), []))
+    .concat(!!comment.members.inner.length &&
+      comment.members.inner.reduce((memo, child) =>
+        memo.concat(generate(depth + 1, child)), []))
     .filter(Boolean);
   }
 
diff --git a/lib/parse.js b/lib/parse.js
index 2a547cb65..176f99032 100644
--- a/lib/parse.js
+++ b/lib/parse.js
@@ -21,6 +21,7 @@ var flatteners = {
    * @returns {undefined} has side-effects
    */
   'access': function (result, tag) {
+    // doctrine ensures that tag.access is valid
     result.access = tag.access;
   },
   'alias': flattenName,
@@ -208,6 +209,7 @@ var flatteners = {
    * @returns {undefined} has side-effects
    */
   'kind': function (result, tag) {
+    // doctrine ensures that tag.kind is valid
     result.kind = tag.kind;
   },
   'lends': flattenDescription,
diff --git a/lib/serve/error_page.js b/lib/serve/error_page.js
index 443fe26d4..ec2fcafd9 100644
--- a/lib/serve/error_page.js
+++ b/lib/serve/error_page.js
@@ -1,4 +1,5 @@
 /* @flow */
+/* eslint no-console: 0 */
 'use strict';
 var File = require('vinyl');
 var ansiHTML = require('ansi-html');
diff --git a/test/fixture/_external-deps-included.json b/test/fixture/_external-deps-included.json
index 7968ca9cf..33c6f92e3 100644
--- a/test/fixture/_external-deps-included.json
+++ b/test/fixture/_external-deps-included.json
@@ -121,9 +121,11 @@
     "name": "foo",
     "kind": "function",
     "members": {
+      "global": [],
+      "inner": [],
       "instance": [],
-      "static": [],
-      "events": []
+      "events": [],
+      "static": []
     },
     "path": [
       {
@@ -291,9 +293,11 @@
     "name": "main",
     "kind": "function",
     "members": {
+      "global": [],
+      "inner": [],
       "instance": [],
-      "static": [],
-      "events": []
+      "events": [],
+      "static": []
     },
     "path": [
       {
@@ -461,9 +465,11 @@
     "name": "index",
     "kind": "function",
     "members": {
+      "global": [],
+      "inner": [],
       "instance": [],
-      "static": [],
-      "events": []
+      "events": [],
+      "static": []
     },
     "path": [
       {
diff --git a/test/fixture/_multi-file-input.json b/test/fixture/_multi-file-input.json
index d3a6bf704..11a72d624 100644
--- a/test/fixture/_multi-file-input.json
+++ b/test/fixture/_multi-file-input.json
@@ -238,9 +238,11 @@
     "name": "returnTwo",
     "kind": "function",
     "members": {
+      "global": [],
+      "inner": [],
       "instance": [],
-      "static": [],
-      "events": []
+      "events": [],
+      "static": []
     },
     "path": [
       {
@@ -408,9 +410,11 @@
     "name": "simple.input",
     "kind": "function",
     "members": {
+      "global": [],
+      "inner": [],
       "instance": [],
-      "static": [],
-      "events": []
+      "events": [],
+      "static": []
     },
     "path": [
       {
diff --git a/test/fixture/boolean-literal-type.output.json b/test/fixture/boolean-literal-type.output.json
index 69345a958..fb5f85589 100644
--- a/test/fixture/boolean-literal-type.output.json
+++ b/test/fixture/boolean-literal-type.output.json
@@ -72,9 +72,11 @@
     "name": "f",
     "kind": "function",
     "members": {
+      "global": [],
+      "inner": [],
       "instance": [],
-      "static": [],
-      "events": []
+      "events": [],
+      "static": []
     },
     "path": [
       {
diff --git a/test/fixture/class.output.json b/test/fixture/class.output.json
index 2f517cc09..fd28ff3fc 100644
--- a/test/fixture/class.output.json
+++ b/test/fixture/class.output.json
@@ -167,6 +167,8 @@
     "kind": "class",
     "name": "MyClass",
     "members": {
+      "global": [],
+      "inner": [],
       "instance": [
         {
           "description": {
@@ -400,9 +402,11 @@
           "memberof": "MyClass",
           "scope": "instance",
           "members": {
+            "global": [],
+            "inner": [],
             "instance": [],
-            "static": [],
-            "events": []
+            "events": [],
+            "static": []
           },
           "path": [
             {
@@ -575,9 +579,11 @@
           "memberof": "MyClass",
           "scope": "instance",
           "members": {
+            "global": [],
+            "inner": [],
             "instance": [],
-            "static": [],
-            "events": []
+            "events": [],
+            "static": []
           },
           "path": [
             {
@@ -593,8 +599,8 @@
           "namespace": "MyClass#getUndefined"
         }
       ],
-      "static": [],
-      "events": []
+      "events": [],
+      "static": []
     },
     "path": [
       {
diff --git a/test/fixture/document-exported-export-default-object.output.json b/test/fixture/document-exported-export-default-object.output.json
index 74cd9bffa..fda6f1de9 100644
--- a/test/fixture/document-exported-export-default-object.output.json
+++ b/test/fixture/document-exported-export-default-object.output.json
@@ -35,9 +35,11 @@
     "todos": [],
     "name": "document-exported-export-default-object.input",
     "members": {
+      "global": [],
+      "inner": [],
       "instance": [],
-      "static": [],
-      "events": []
+      "events": [],
+      "static": []
     },
     "path": [
       {
@@ -82,9 +84,11 @@
     "todos": [],
     "name": "x",
     "members": {
+      "global": [],
+      "inner": [],
       "instance": [],
-      "static": [],
-      "events": []
+      "events": [],
+      "static": []
     },
     "path": [
       {
diff --git a/test/fixture/document-exported-export-default-value.output.json b/test/fixture/document-exported-export-default-value.output.json
index 8b6095ade..78ffad1f7 100644
--- a/test/fixture/document-exported-export-default-value.output.json
+++ b/test/fixture/document-exported-export-default-value.output.json
@@ -35,9 +35,11 @@
     "todos": [],
     "name": "document-exported-export-default-value.input",
     "members": {
+      "global": [],
+      "inner": [],
       "instance": [],
-      "static": [],
-      "events": []
+      "events": [],
+      "static": []
     },
     "path": [
       {
diff --git a/test/fixture/document-exported.output.json b/test/fixture/document-exported.output.json
index 230b19314..671a4b4a1 100644
--- a/test/fixture/document-exported.output.json
+++ b/test/fixture/document-exported.output.json
@@ -36,6 +36,8 @@
     "name": "z",
     "kind": "class",
     "members": {
+      "global": [],
+      "inner": [],
       "instance": [
         {
           "description": "",
@@ -76,9 +78,11 @@
           "memberof": "z",
           "scope": "instance",
           "members": {
+            "global": [],
+            "inner": [],
             "instance": [],
-            "static": [],
-            "events": []
+            "events": [],
+            "static": []
           },
           "path": [
             {
@@ -94,8 +98,8 @@
           "namespace": "z#zMethod"
         }
       ],
-      "static": [],
-      "events": []
+      "events": [],
+      "static": []
     },
     "path": [
       {
@@ -148,9 +152,11 @@
     "name": "x",
     "kind": "function",
     "members": {
+      "global": [],
+      "inner": [],
       "instance": [],
-      "static": [],
-      "events": []
+      "events": [],
+      "static": []
     },
     "path": [
       {
@@ -197,6 +203,8 @@
     "name": "Class",
     "kind": "class",
     "members": {
+      "global": [],
+      "inner": [],
       "instance": [
         {
           "description": "",
@@ -237,9 +245,11 @@
           "memberof": "Class",
           "scope": "instance",
           "members": {
+            "global": [],
+            "inner": [],
             "instance": [],
-            "static": [],
-            "events": []
+            "events": [],
+            "static": []
           },
           "path": [
             {
@@ -293,9 +303,11 @@
           "memberof": "Class",
           "scope": "instance",
           "members": {
+            "global": [],
+            "inner": [],
             "instance": [],
-            "static": [],
-            "events": []
+            "events": [],
+            "static": []
           },
           "path": [
             {
@@ -355,9 +367,11 @@
           "memberof": "Class",
           "scope": "instance",
           "members": {
+            "global": [],
+            "inner": [],
             "instance": [],
-            "static": [],
-            "events": []
+            "events": [],
+            "static": []
           },
           "path": [
             {
@@ -373,6 +387,7 @@
           "namespace": "Class#classSetter"
         }
       ],
+      "events": [],
       "static": [
         {
           "description": "",
@@ -413,9 +428,11 @@
           "memberof": "Class",
           "scope": "static",
           "members": {
+            "global": [],
+            "inner": [],
             "instance": [],
-            "static": [],
-            "events": []
+            "events": [],
+            "static": []
           },
           "path": [
             {
@@ -469,9 +486,11 @@
           "memberof": "Class",
           "scope": "static",
           "members": {
+            "global": [],
+            "inner": [],
             "instance": [],
-            "static": [],
-            "events": []
+            "events": [],
+            "static": []
           },
           "path": [
             {
@@ -531,9 +550,11 @@
           "memberof": "Class",
           "scope": "static",
           "members": {
+            "global": [],
+            "inner": [],
             "instance": [],
-            "static": [],
-            "events": []
+            "events": [],
+            "static": []
           },
           "path": [
             {
@@ -548,8 +569,7 @@
           ],
           "namespace": "Class.staticSetter"
         }
-      ],
-      "events": []
+      ]
     },
     "path": [
       {
@@ -600,9 +620,11 @@
       "name": "boolean"
     },
     "members": {
+      "global": [],
+      "inner": [],
       "instance": [],
-      "static": [],
-      "events": []
+      "events": [],
+      "static": []
     },
     "path": [
       {
@@ -648,9 +670,11 @@
     "todos": [],
     "name": "y2Default",
     "members": {
+      "global": [],
+      "inner": [],
       "instance": [],
-      "static": [],
-      "events": []
+      "events": [],
+      "static": []
     },
     "path": [
       {
@@ -764,9 +788,11 @@
     "name": "y4",
     "kind": "function",
     "members": {
+      "global": [],
+      "inner": [],
       "instance": [],
-      "static": [],
-      "events": []
+      "events": [],
+      "static": []
     },
     "path": [
       {
@@ -812,7 +838,10 @@
     "todos": [],
     "name": "object",
     "members": {
+      "global": [],
+      "inner": [],
       "instance": [],
+      "events": [],
       "static": [
         {
           "description": "",
@@ -852,9 +881,11 @@
           "memberof": "object",
           "scope": "static",
           "members": {
+            "global": [],
+            "inner": [],
             "instance": [],
-            "static": [],
-            "events": []
+            "events": [],
+            "static": []
           },
           "path": [
             {
@@ -906,9 +937,11 @@
           "memberof": "object",
           "scope": "static",
           "members": {
+            "global": [],
+            "inner": [],
             "instance": [],
-            "static": [],
-            "events": []
+            "events": [],
+            "static": []
           },
           "path": [
             {
@@ -922,8 +955,7 @@
           ],
           "namespace": "object.func"
         }
-      ],
-      "events": []
+      ]
     },
     "path": [
       {
@@ -969,9 +1001,11 @@
     "name": "method",
     "kind": "function",
     "members": {
+      "global": [],
+      "inner": [],
       "instance": [],
-      "static": [],
-      "events": []
+      "events": [],
+      "static": []
     },
     "path": [
       {
@@ -1018,9 +1052,11 @@
     "name": "getter",
     "kind": "member",
     "members": {
+      "global": [],
+      "inner": [],
       "instance": [],
-      "static": [],
-      "events": []
+      "events": [],
+      "static": []
     },
     "path": [
       {
@@ -1073,9 +1109,11 @@
     "name": "setter",
     "kind": "member",
     "members": {
+      "global": [],
+      "inner": [],
       "instance": [],
-      "static": [],
-      "events": []
+      "events": [],
+      "static": []
     },
     "path": [
       {
@@ -1122,9 +1160,11 @@
     "name": "f1",
     "kind": "function",
     "members": {
+      "global": [],
+      "inner": [],
       "instance": [],
-      "static": [],
-      "events": []
+      "events": [],
+      "static": []
     },
     "path": [
       {
@@ -1171,9 +1211,11 @@
     "name": "f3",
     "kind": "function",
     "members": {
+      "global": [],
+      "inner": [],
       "instance": [],
-      "static": [],
-      "events": []
+      "events": [],
+      "static": []
     },
     "path": [
       {
@@ -1224,9 +1266,11 @@
       "name": "number"
     },
     "members": {
+      "global": [],
+      "inner": [],
       "instance": [],
-      "static": [],
-      "events": []
+      "events": [],
+      "static": []
     },
     "path": [
       {
@@ -1277,9 +1321,11 @@
       "name": "string"
     },
     "members": {
+      "global": [],
+      "inner": [],
       "instance": [],
-      "static": [],
-      "events": []
+      "events": [],
+      "static": []
     },
     "path": [
       {
@@ -1330,9 +1376,11 @@
       "name": "string"
     },
     "members": {
+      "global": [],
+      "inner": [],
       "instance": [],
-      "static": [],
-      "events": []
+      "events": [],
+      "static": []
     },
     "path": [
       {
@@ -1389,9 +1437,11 @@
     "name": "f4",
     "kind": "function",
     "members": {
+      "global": [],
+      "inner": [],
       "instance": [],
-      "static": [],
-      "events": []
+      "events": [],
+      "static": []
     },
     "path": [
       {
@@ -1437,9 +1487,11 @@
     "todos": [],
     "name": "o1",
     "members": {
+      "global": [],
+      "inner": [],
       "instance": [],
-      "static": [],
-      "events": []
+      "events": [],
+      "static": []
     },
     "path": [
       {
@@ -1485,9 +1537,11 @@
     "name": "om1",
     "kind": "function",
     "members": {
+      "global": [],
+      "inner": [],
       "instance": [],
-      "static": [],
-      "events": []
+      "events": [],
+      "static": []
     },
     "path": [
       {
@@ -1595,9 +1649,11 @@
     "name": "f5",
     "kind": "function",
     "members": {
+      "global": [],
+      "inner": [],
       "instance": [],
-      "static": [],
-      "events": []
+      "events": [],
+      "static": []
     },
     "path": [
       {
@@ -1643,9 +1699,11 @@
     "todos": [],
     "name": "o2",
     "members": {
+      "global": [],
+      "inner": [],
       "instance": [],
-      "static": [],
-      "events": []
+      "events": [],
+      "static": []
     },
     "path": [
       {
@@ -1691,9 +1749,11 @@
     "name": "om2",
     "kind": "function",
     "members": {
+      "global": [],
+      "inner": [],
       "instance": [],
-      "static": [],
-      "events": []
+      "events": [],
+      "static": []
     },
     "path": [
       {
diff --git a/test/fixture/es6-class.output.json b/test/fixture/es6-class.output.json
index cb01e1dbb..2c76b4bf4 100644
--- a/test/fixture/es6-class.output.json
+++ b/test/fixture/es6-class.output.json
@@ -92,9 +92,11 @@
     "name": "Foo",
     "kind": "class",
     "members": {
+      "global": [],
+      "inner": [],
       "instance": [],
-      "static": [],
-      "events": []
+      "events": [],
+      "static": []
     },
     "path": [
       {
@@ -192,6 +194,8 @@
     "name": "Bar",
     "kind": "class",
     "members": {
+      "global": [],
+      "inner": [],
       "instance": [
         {
           "description": {
@@ -304,9 +308,11 @@
           "memberof": "Bar",
           "scope": "instance",
           "members": {
+            "global": [],
+            "inner": [],
             "instance": [],
-            "static": [],
-            "events": []
+            "events": [],
+            "static": []
           },
           "path": [
             {
@@ -420,9 +426,11 @@
           "memberof": "Bar",
           "scope": "instance",
           "members": {
+            "global": [],
+            "inner": [],
             "instance": [],
-            "static": [],
-            "events": []
+            "events": [],
+            "static": []
           },
           "path": [
             {
@@ -437,8 +445,8 @@
           "namespace": "Bar#bar"
         }
       ],
-      "static": [],
-      "events": []
+      "events": [],
+      "static": []
     },
     "path": [
       {
diff --git a/test/fixture/es6-default2.output.json b/test/fixture/es6-default2.output.json
index f75e389b3..5388784fe 100644
--- a/test/fixture/es6-default2.output.json
+++ b/test/fixture/es6-default2.output.json
@@ -49,9 +49,11 @@
     "name": "es6-default2.input",
     "kind": "function",
     "members": {
+      "global": [],
+      "inner": [],
       "instance": [],
-      "static": [],
-      "events": []
+      "events": [],
+      "static": []
     },
     "path": [
       {
diff --git a/test/fixture/es6-import.output.json b/test/fixture/es6-import.output.json
index c1126f032..97eac7c72 100644
--- a/test/fixture/es6-import.output.json
+++ b/test/fixture/es6-import.output.json
@@ -163,9 +163,11 @@
     "name": "multiplyTwice",
     "kind": "function",
     "members": {
+      "global": [],
+      "inner": [],
       "instance": [],
-      "static": [],
-      "events": []
+      "events": [],
+      "static": []
     },
     "path": [
       {
@@ -262,9 +264,11 @@
     "todos": [],
     "name": "es6-ext",
     "members": {
+      "global": [],
+      "inner": [],
       "instance": [],
-      "static": [],
-      "events": []
+      "events": [],
+      "static": []
     },
     "path": [
       {
@@ -431,9 +435,11 @@
     "name": "simple.input",
     "kind": "function",
     "members": {
+      "global": [],
+      "inner": [],
       "instance": [],
-      "static": [],
-      "events": []
+      "events": [],
+      "static": []
     },
     "path": [
       {
diff --git a/test/fixture/es6.input.js b/test/fixture/es6.input.js
index 4f88d9a69..fcef40a07 100644
--- a/test/fixture/es6.input.js
+++ b/test/fixture/es6.input.js
@@ -88,6 +88,13 @@ function functionWithRest(...someParams) {
  * So does this one, with types
  */
 function functionWithRestAndType(...someParams: number) {
+
+  /**
+   * This is an inner member. We are still trying to figure out
+   * what these are for.
+   * @inner
+   */
+  var x = 10;
 }
 
 // FUNCTION TYPES
diff --git a/test/fixture/es6.output.json b/test/fixture/es6.output.json
index b4d8eafae..95be6730b 100644
--- a/test/fixture/es6.output.json
+++ b/test/fixture/es6.output.json
@@ -120,9 +120,11 @@
     "name": "destructure",
     "kind": "function",
     "members": {
+      "global": [],
+      "inner": [],
       "instance": [],
-      "static": [],
-      "events": []
+      "events": [],
+      "static": []
     },
     "path": [
       {
@@ -255,9 +257,11 @@
     "name": "destructure",
     "kind": "function",
     "members": {
+      "global": [],
+      "inner": [],
       "instance": [],
-      "static": [],
-      "events": []
+      "events": [],
+      "static": []
     },
     "path": [
       {
@@ -520,9 +524,11 @@
     "name": "multiply",
     "kind": "function",
     "members": {
+      "global": [],
+      "inner": [],
       "instance": [],
-      "static": [],
-      "events": []
+      "events": [],
+      "static": []
     },
     "path": [
       {
@@ -620,6 +626,8 @@
     "name": "Sink",
     "kind": "class",
     "members": {
+      "global": [],
+      "inner": [],
       "instance": [
         {
           "description": {
@@ -711,9 +719,11 @@
           "memberof": "Sink",
           "scope": "instance",
           "members": {
+            "global": [],
+            "inner": [],
             "instance": [],
-            "static": [],
-            "events": []
+            "events": [],
+            "static": []
           },
           "path": [
             {
@@ -818,9 +828,11 @@
           "memberof": "Sink",
           "scope": "instance",
           "members": {
+            "global": [],
+            "inner": [],
             "instance": [],
-            "static": [],
-            "events": []
+            "events": [],
+            "static": []
           },
           "path": [
             {
@@ -929,9 +941,11 @@
           "memberof": "Sink",
           "scope": "instance",
           "members": {
+            "global": [],
+            "inner": [],
             "instance": [],
-            "static": [],
-            "events": []
+            "events": [],
+            "static": []
           },
           "path": [
             {
@@ -1129,9 +1143,11 @@
           "memberof": "Sink",
           "scope": "instance",
           "members": {
+            "global": [],
+            "inner": [],
             "instance": [],
-            "static": [],
-            "events": []
+            "events": [],
+            "static": []
           },
           "path": [
             {
@@ -1147,6 +1163,7 @@
           "namespace": "Sink#constructor"
         }
       ],
+      "events": [],
       "static": [
         {
           "description": {
@@ -1238,9 +1255,11 @@
           "memberof": "Sink",
           "scope": "static",
           "members": {
+            "global": [],
+            "inner": [],
             "instance": [],
-            "static": [],
-            "events": []
+            "events": [],
+            "static": []
           },
           "path": [
             {
@@ -1255,8 +1274,7 @@
           ],
           "namespace": "Sink.hello"
         }
-      ],
-      "events": []
+      ]
     },
     "path": [
       {
@@ -1424,9 +1442,11 @@
     "name": "makeABasket",
     "kind": "function",
     "members": {
+      "global": [],
+      "inner": [],
       "instance": [],
-      "static": [],
-      "events": []
+      "events": [],
+      "static": []
     },
     "path": [
       {
@@ -1682,9 +1702,11 @@
     "name": "makeASink",
     "kind": "function",
     "members": {
+      "global": [],
+      "inner": [],
       "instance": [],
-      "static": [],
-      "events": []
+      "events": [],
+      "static": []
     },
     "path": [
       {
@@ -1791,9 +1813,11 @@
     "name": "functionWithRest",
     "kind": "function",
     "members": {
+      "global": [],
+      "inner": [],
       "instance": [],
-      "static": [],
-      "events": []
+      "events": [],
+      "static": []
     },
     "path": [
       {
@@ -1874,7 +1898,7 @@
           "column": 0
         },
         "end": {
-          "line": 91,
+          "line": 98,
           "column": 1
         }
       }
@@ -1904,9 +1928,11 @@
     "name": "functionWithRestAndType",
     "kind": "function",
     "members": {
+      "global": [],
+      "inner": [],
       "instance": [],
-      "static": [],
-      "events": []
+      "events": [],
+      "static": []
     },
     "path": [
       {
@@ -1972,22 +1998,22 @@
     "tags": [],
     "loc": {
       "start": {
-        "line": 95,
+        "line": 102,
         "column": 0
       },
       "end": {
-        "line": 97,
+        "line": 104,
         "column": 3
       }
     },
     "context": {
       "loc": {
         "start": {
-          "line": 98,
+          "line": 105,
           "column": 0
         },
         "end": {
-          "line": 98,
+          "line": 105,
           "column": 24
         }
       }
@@ -2004,9 +2030,11 @@
     "name": "foo",
     "kind": "function",
     "members": {
+      "global": [],
+      "inner": [],
       "instance": [],
-      "static": [],
-      "events": []
+      "events": [],
+      "static": []
     },
     "path": [
       {
@@ -2082,22 +2110,22 @@
     ],
     "loc": {
       "start": {
-        "line": 102,
+        "line": 109,
         "column": 0
       },
       "end": {
-        "line": 105,
+        "line": 112,
         "column": 3
       }
     },
     "context": {
       "loc": {
         "start": {
-          "line": 106,
+          "line": 113,
           "column": 0
         },
         "end": {
-          "line": 106,
+          "line": 113,
           "column": 38
         }
       }
@@ -2174,9 +2202,11 @@
     "name": "es6.input",
     "kind": "function",
     "members": {
+      "global": [],
+      "inner": [],
       "instance": [],
-      "static": [],
-      "events": []
+      "events": [],
+      "static": []
     },
     "path": [
       {
@@ -2242,22 +2272,22 @@
     "tags": [],
     "loc": {
       "start": {
-        "line": 108,
+        "line": 115,
         "column": 0
       },
       "end": {
-        "line": 110,
+        "line": 117,
         "column": 3
       }
     },
     "context": {
       "loc": {
         "start": {
-          "line": 111,
+          "line": 118,
           "column": 0
         },
         "end": {
-          "line": 113,
+          "line": 120,
           "column": 1
         }
       }
@@ -2280,9 +2310,11 @@
     "name": "veryImportantTransform",
     "kind": "function",
     "members": {
+      "global": [],
+      "inner": [],
       "instance": [],
-      "static": [],
-      "events": []
+      "events": [],
+      "static": []
     },
     "path": [
       {
@@ -2354,22 +2386,22 @@
     ],
     "loc": {
       "start": {
-        "line": 123,
+        "line": 130,
         "column": 0
       },
       "end": {
-        "line": 126,
+        "line": 133,
         "column": 3
       }
     },
     "context": {
       "loc": {
         "start": {
-          "line": 127,
+          "line": 134,
           "column": 0
         },
         "end": {
-          "line": 127,
+          "line": 134,
           "column": 27
         }
       }
@@ -2387,9 +2419,11 @@
     "name": "iAmProtected",
     "kind": "function",
     "members": {
+      "global": [],
+      "inner": [],
       "instance": [],
-      "static": [],
-      "events": []
+      "events": [],
+      "static": []
     },
     "path": [
       {
@@ -2461,22 +2495,22 @@
     ],
     "loc": {
       "start": {
-        "line": 129,
+        "line": 136,
         "column": 0
       },
       "end": {
-        "line": 132,
+        "line": 139,
         "column": 3
       }
     },
     "context": {
       "loc": {
         "start": {
-          "line": 133,
+          "line": 140,
           "column": 0
         },
         "end": {
-          "line": 133,
+          "line": 140,
           "column": 24
         }
       }
@@ -2494,9 +2528,11 @@
     "name": "iAmPublic",
     "kind": "function",
     "members": {
+      "global": [],
+      "inner": [],
       "instance": [],
-      "static": [],
-      "events": []
+      "events": [],
+      "static": []
     },
     "path": [
       {
@@ -2562,22 +2598,22 @@
     "tags": [],
     "loc": {
       "start": {
-        "line": 141,
+        "line": 148,
         "column": 0
       },
       "end": {
-        "line": 143,
+        "line": 150,
         "column": 3
       }
     },
     "context": {
       "loc": {
         "start": {
-          "line": 144,
+          "line": 151,
           "column": 0
         },
         "end": {
-          "line": 144,
+          "line": 151,
           "column": 42
         }
       }
@@ -2593,9 +2629,11 @@
     "todos": [],
     "name": "execute",
     "members": {
+      "global": [],
+      "inner": [],
       "instance": [],
-      "static": [],
-      "events": []
+      "events": [],
+      "static": []
     },
     "path": [
       {
@@ -2660,22 +2698,22 @@
     "tags": [],
     "loc": {
       "start": {
-        "line": 146,
+        "line": 153,
         "column": 0
       },
       "end": {
-        "line": 146,
+        "line": 153,
         "column": 32
       }
     },
     "context": {
       "loc": {
         "start": {
-          "line": 147,
+          "line": 154,
           "column": 0
         },
         "end": {
-          "line": 153,
+          "line": 160,
           "column": 1
         }
       }
@@ -2687,7 +2725,7 @@
       {
         "title": "param",
         "name": "array1",
-        "lineNumber": 148,
+        "lineNumber": 155,
         "type": {
           "type": "TypeApplication",
           "expression": {
@@ -2705,7 +2743,7 @@
       {
         "title": "param",
         "name": "array2",
-        "lineNumber": 149,
+        "lineNumber": 156,
         "type": {
           "type": "TypeApplication",
           "expression": {
@@ -2770,9 +2808,11 @@
     "name": "isArrayEqualWith",
     "kind": "function",
     "members": {
+      "global": [],
+      "inner": [],
       "instance": [],
-      "static": [],
-      "events": []
+      "events": [],
+      "static": []
     },
     "path": [
       {
diff --git a/test/fixture/event.output.json b/test/fixture/event.output.json
index e34cd3413..5db9fa967 100644
--- a/test/fixture/event.output.json
+++ b/test/fixture/event.output.json
@@ -245,9 +245,11 @@
     "kind": "event",
     "name": "Map#mousemove",
     "members": {
+      "global": [],
+      "inner": [],
       "instance": [],
-      "static": [],
-      "events": []
+      "events": [],
+      "static": []
     },
     "path": [
       {
diff --git a/test/fixture/example-caption.output.json b/test/fixture/example-caption.output.json
index fba5a26bd..fbe9d6d85 100644
--- a/test/fixture/example-caption.output.json
+++ b/test/fixture/example-caption.output.json
@@ -219,9 +219,11 @@
     "name": "foo",
     "kind": "function",
     "members": {
+      "global": [],
+      "inner": [],
       "instance": [],
-      "static": [],
-      "events": []
+      "events": [],
+      "static": []
     },
     "path": [
       {
diff --git a/test/fixture/external.output.json b/test/fixture/external.output.json
index b7f770108..92a116ccc 100644
--- a/test/fixture/external.output.json
+++ b/test/fixture/external.output.json
@@ -121,9 +121,11 @@
     "name": "foo",
     "kind": "function",
     "members": {
+      "global": [],
+      "inner": [],
       "instance": [],
-      "static": [],
-      "events": []
+      "events": [],
+      "static": []
     },
     "path": [
       {
diff --git a/test/fixture/factory.output.json b/test/fixture/factory.output.json
index 1b16eea16..8173663b3 100644
--- a/test/fixture/factory.output.json
+++ b/test/fixture/factory.output.json
@@ -157,9 +157,11 @@
     "name": "area",
     "kind": "function",
     "members": {
+      "global": [],
+      "inner": [],
       "instance": [],
-      "static": [],
-      "events": []
+      "events": [],
+      "static": []
     },
     "path": [
       {
@@ -220,9 +222,11 @@
     "kind": "class",
     "name": "area",
     "members": {
+      "global": [],
+      "inner": [],
       "instance": [],
-      "static": [],
-      "events": []
+      "events": [],
+      "static": []
     },
     "path": [
       {
@@ -340,9 +344,11 @@
     "memberof": "chart",
     "scope": "static",
     "members": {
+      "global": [],
+      "inner": [],
       "instance": [],
-      "static": [],
-      "events": []
+      "events": [],
+      "static": []
     },
     "path": [
       {
diff --git a/test/fixture/html/nested.config-output.html b/test/fixture/html/nested.config-output.html
index c5ce6d5fa..534109b8d 100644
--- a/test/fixture/html/nested.config-output.html
+++ b/test/fixture/html/nested.config-output.html
@@ -97,6 +97,7 @@ <h3 class='mb0 no-anchor'>documentation</h3>
                     </ul>
                   
                   
+                  
                     <ul class='list-reset py1-ul pl1'>
                       <li class='h5'>Events</li>
                       
@@ -175,6 +176,7 @@ <h3 class='mb0 no-anchor'>documentation</h3>
                     </ul>
                   
                   
+                  
                 </div>
                 
                 </li>
@@ -202,6 +204,7 @@ <h3 class='mb0 no-anchor'>documentation</h3>
                   
                   
                   
+                  
                 </div>
                 
                 </li>
diff --git a/test/fixture/html/nested.output.files b/test/fixture/html/nested.output.files
index 0e7da8b2b..13a20901c 100644
--- a/test/fixture/html/nested.output.files
+++ b/test/fixture/html/nested.output.files
@@ -87,6 +87,7 @@
                     </ul>
                   
                   
+                  
                     <ul class='list-reset py1-ul pl1'>
                       <li class='h5'>Events</li>
                       
@@ -165,6 +166,7 @@
                     </ul>
                   
                   
+                  
                 </div>
                 
                 </li>
@@ -192,6 +194,7 @@
                   
                   
                   
+                  
                 </div>
                 
                 </li>
diff --git a/test/fixture/infer-private.output.json b/test/fixture/infer-private.output.json
index 238054aec..431535636 100644
--- a/test/fixture/infer-private.output.json
+++ b/test/fixture/infer-private.output.json
@@ -87,6 +87,8 @@
     "name": "C",
     "kind": "class",
     "members": {
+      "global": [],
+      "inner": [],
       "instance": [
         {
           "description": {
@@ -178,9 +180,11 @@
           "memberof": "C",
           "scope": "instance",
           "members": {
+            "global": [],
+            "inner": [],
             "instance": [],
-            "static": [],
-            "events": []
+            "events": [],
+            "static": []
           },
           "path": [
             {
@@ -196,8 +200,8 @@
           "namespace": "C#m"
         }
       ],
-      "static": [],
-      "events": []
+      "events": [],
+      "static": []
     },
     "path": [
       {
diff --git a/test/fixture/inheritance.output.json b/test/fixture/inheritance.output.json
index ceffdaf3c..e0c55a4c5 100644
--- a/test/fixture/inheritance.output.json
+++ b/test/fixture/inheritance.output.json
@@ -92,9 +92,11 @@
     "name": "SpecialArray",
     "kind": "class",
     "members": {
+      "global": [],
+      "inner": [],
       "instance": [],
-      "static": [],
-      "events": []
+      "events": [],
+      "static": []
     },
     "path": [
       {
@@ -161,9 +163,11 @@
     "memberof": "module",
     "scope": "static",
     "members": {
+      "global": [],
+      "inner": [],
       "instance": [],
-      "static": [],
-      "events": []
+      "events": [],
+      "static": []
     },
     "path": [
       {
diff --git a/test/fixture/inline-link.output.json b/test/fixture/inline-link.output.json
index 8d6da3d3b..95ae461d5 100644
--- a/test/fixture/inline-link.output.json
+++ b/test/fixture/inline-link.output.json
@@ -229,9 +229,11 @@
     "name": "addOne",
     "kind": "function",
     "members": {
+      "global": [],
+      "inner": [],
       "instance": [],
-      "static": [],
-      "events": []
+      "events": [],
+      "static": []
     },
     "path": [
       {
@@ -650,9 +652,11 @@
     "name": "inline-link.input",
     "kind": "function",
     "members": {
+      "global": [],
+      "inner": [],
       "instance": [],
-      "static": [],
-      "events": []
+      "events": [],
+      "static": []
     },
     "path": [
       {
diff --git a/test/fixture/internal.output.json b/test/fixture/internal.output.json
index b7f770108..92a116ccc 100644
--- a/test/fixture/internal.output.json
+++ b/test/fixture/internal.output.json
@@ -121,9 +121,11 @@
     "name": "foo",
     "kind": "function",
     "members": {
+      "global": [],
+      "inner": [],
       "instance": [],
-      "static": [],
-      "events": []
+      "events": [],
+      "static": []
     },
     "path": [
       {
diff --git a/test/fixture/literal_types.output.json b/test/fixture/literal_types.output.json
index 05a2aec1e..858b92501 100644
--- a/test/fixture/literal_types.output.json
+++ b/test/fixture/literal_types.output.json
@@ -107,9 +107,11 @@
     "name": "f",
     "kind": "function",
     "members": {
+      "global": [],
+      "inner": [],
       "instance": [],
-      "static": [],
-      "events": []
+      "events": [],
+      "static": []
     },
     "path": [
       {
@@ -191,9 +193,11 @@
     "name": "g",
     "kind": "function",
     "members": {
+      "global": [],
+      "inner": [],
       "instance": [],
-      "static": [],
-      "events": []
+      "events": [],
+      "static": []
     },
     "path": [
       {
diff --git a/test/fixture/memberedclass.output.json b/test/fixture/memberedclass.output.json
index 5f744fd15..23a82c5cf 100644
--- a/test/fixture/memberedclass.output.json
+++ b/test/fixture/memberedclass.output.json
@@ -106,6 +106,8 @@
     "name": "MyClass",
     "memberof": "com.Test",
     "members": {
+      "global": [],
+      "inner": [],
       "instance": [
         {
           "description": {
@@ -339,9 +341,11 @@
           "memberof": "com.Test.MyClass",
           "scope": "instance",
           "members": {
+            "global": [],
+            "inner": [],
             "instance": [],
-            "static": [],
-            "events": []
+            "events": [],
+            "static": []
           },
           "path": [
             {
@@ -357,6 +361,7 @@
           "namespace": "MyClass#getFoo"
         }
       ],
+      "events": [],
       "static": [
         {
           "description": {
@@ -516,9 +521,11 @@
           "memberof": "com.Test.MyClass",
           "scope": "static",
           "members": {
+            "global": [],
+            "inner": [],
             "instance": [],
-            "static": [],
-            "events": []
+            "events": [],
+            "static": []
           },
           "path": [
             {
@@ -533,8 +540,7 @@
           ],
           "namespace": "MyClass.getUndefined"
         }
-      ],
-      "events": []
+      ]
     },
     "path": [
       {
diff --git a/test/fixture/merge-infered-type.output.json b/test/fixture/merge-infered-type.output.json
index 34a57c58b..61f6b15c2 100644
--- a/test/fixture/merge-infered-type.output.json
+++ b/test/fixture/merge-infered-type.output.json
@@ -257,9 +257,11 @@
     "name": "addFive",
     "kind": "function",
     "members": {
+      "global": [],
+      "inner": [],
       "instance": [],
-      "static": [],
-      "events": []
+      "events": [],
+      "static": []
     },
     "path": [
       {
diff --git a/test/fixture/meta.output.json b/test/fixture/meta.output.json
index d1f4d258b..8181094f5 100644
--- a/test/fixture/meta.output.json
+++ b/test/fixture/meta.output.json
@@ -232,9 +232,11 @@
     "name": "meta.input",
     "kind": "function",
     "members": {
+      "global": [],
+      "inner": [],
       "instance": [],
-      "static": [],
-      "events": []
+      "events": [],
+      "static": []
     },
     "path": [
       {
diff --git a/test/fixture/multisignature.output.json b/test/fixture/multisignature.output.json
index aa98ebe77..ba7426e9a 100644
--- a/test/fixture/multisignature.output.json
+++ b/test/fixture/multisignature.output.json
@@ -163,9 +163,11 @@
     "name": "getTheTime",
     "kind": "function",
     "members": {
+      "global": [],
+      "inner": [],
       "instance": [],
-      "static": [],
-      "events": []
+      "events": [],
+      "static": []
     },
     "path": [
       {
@@ -403,9 +405,11 @@
     "name": "getTheTime",
     "kind": "function",
     "members": {
+      "global": [],
+      "inner": [],
       "instance": [],
-      "static": [],
-      "events": []
+      "events": [],
+      "static": []
     },
     "path": [
       {
diff --git a/test/fixture/nearby_params.output.json b/test/fixture/nearby_params.output.json
index 9c910f9b3..a8f367ebd 100644
--- a/test/fixture/nearby_params.output.json
+++ b/test/fixture/nearby_params.output.json
@@ -512,9 +512,11 @@
     "kind": "function",
     "name": "sessions.create",
     "members": {
+      "global": [],
+      "inner": [],
       "instance": [],
-      "static": [],
-      "events": []
+      "events": [],
+      "static": []
     },
     "path": [
       {
diff --git a/test/fixture/nest_params.output.json b/test/fixture/nest_params.output.json
index d45d2b42d..265b19938 100644
--- a/test/fixture/nest_params.output.json
+++ b/test/fixture/nest_params.output.json
@@ -350,9 +350,11 @@
     "name": "foo",
     "kind": "function",
     "members": {
+      "global": [],
+      "inner": [],
       "instance": [],
-      "static": [],
-      "events": []
+      "events": [],
+      "static": []
     },
     "path": [
       {
@@ -821,9 +823,11 @@
     "todos": [],
     "name": "foo",
     "members": {
+      "global": [],
+      "inner": [],
       "instance": [],
-      "static": [],
-      "events": []
+      "events": [],
+      "static": []
     },
     "path": [
       {
diff --git a/test/fixture/newline-in-description.output.json b/test/fixture/newline-in-description.output.json
index ea76bdb60..11dac1a0d 100644
--- a/test/fixture/newline-in-description.output.json
+++ b/test/fixture/newline-in-description.output.json
@@ -168,9 +168,11 @@
     "throws": [],
     "todos": [],
     "members": {
+      "global": [],
+      "inner": [],
       "instance": [],
-      "static": [],
-      "events": []
+      "events": [],
+      "static": []
     },
     "path": [],
     "namespace": ""
diff --git a/test/fixture/no-name.output.json b/test/fixture/no-name.output.json
index 5bbbeaefb..79026c20e 100644
--- a/test/fixture/no-name.output.json
+++ b/test/fixture/no-name.output.json
@@ -110,9 +110,11 @@
     "throws": [],
     "todos": [],
     "members": {
+      "global": [],
+      "inner": [],
       "instance": [],
-      "static": [],
-      "events": []
+      "events": [],
+      "static": []
     },
     "path": [],
     "namespace": ""
diff --git a/test/fixture/optional-record-field-type.output.json b/test/fixture/optional-record-field-type.output.json
index b39cb57d2..2f633ef1e 100644
--- a/test/fixture/optional-record-field-type.output.json
+++ b/test/fixture/optional-record-field-type.output.json
@@ -82,9 +82,11 @@
       ]
     },
     "members": {
+      "global": [],
+      "inner": [],
       "instance": [],
-      "static": [],
-      "events": []
+      "events": [],
+      "static": []
     },
     "path": [
       {
diff --git a/test/fixture/params.output.json b/test/fixture/params.output.json
index ec85f63aa..4cad94599 100644
--- a/test/fixture/params.output.json
+++ b/test/fixture/params.output.json
@@ -194,9 +194,11 @@
     "name": "addThem",
     "kind": "function",
     "members": {
+      "global": [],
+      "inner": [],
       "instance": [],
-      "static": [],
-      "events": []
+      "events": [],
+      "static": []
     },
     "path": [
       {
@@ -381,9 +383,11 @@
     "name": "fishesAndFoxes",
     "kind": "function",
     "members": {
+      "global": [],
+      "inner": [],
       "instance": [],
-      "static": [],
-      "events": []
+      "events": [],
+      "static": []
     },
     "path": [
       {
@@ -506,9 +510,11 @@
     "name": "withDefault",
     "kind": "function",
     "members": {
+      "global": [],
+      "inner": [],
       "instance": [],
-      "static": [],
-      "events": []
+      "events": [],
+      "static": []
     },
     "path": [
       {
@@ -606,6 +612,8 @@
     "name": "Foo",
     "kind": "class",
     "members": {
+      "global": [],
+      "inner": [],
       "instance": [
         {
           "description": {
@@ -770,9 +778,11 @@
           "memberof": "Foo",
           "scope": "instance",
           "members": {
+            "global": [],
+            "inner": [],
             "instance": [],
-            "static": [],
-            "events": []
+            "events": [],
+            "static": []
           },
           "path": [
             {
@@ -788,8 +798,8 @@
           "namespace": "Foo#method"
         }
       ],
-      "static": [],
-      "events": []
+      "events": [],
+      "static": []
     },
     "path": [
       {
@@ -1248,9 +1258,11 @@
     "kind": "class",
     "name": "Address6",
     "members": {
+      "global": [],
+      "inner": [],
       "instance": [],
-      "static": [],
-      "events": []
+      "events": [],
+      "static": []
     },
     "path": [
       {
@@ -1797,9 +1809,11 @@
     "kind": "class",
     "name": "GeoJSONSource",
     "members": {
+      "global": [],
+      "inner": [],
       "instance": [],
-      "static": [],
-      "events": []
+      "events": [],
+      "static": []
     },
     "path": [
       {
@@ -2047,9 +2061,11 @@
     "name": "myfunc",
     "kind": "constant",
     "members": {
+      "global": [],
+      "inner": [],
       "instance": [],
-      "static": [],
-      "events": []
+      "events": [],
+      "static": []
     },
     "path": [
       {
@@ -2217,9 +2233,11 @@
     "name": "foo",
     "kind": "function",
     "members": {
+      "global": [],
+      "inner": [],
       "instance": [],
-      "static": [],
-      "events": []
+      "events": [],
+      "static": []
     },
     "path": [
       {
diff --git a/test/fixture/polyglot/blend.json b/test/fixture/polyglot/blend.json
index 2f77adbc8..ab09462fa 100644
--- a/test/fixture/polyglot/blend.json
+++ b/test/fixture/polyglot/blend.json
@@ -182,9 +182,11 @@
     "todos": [],
     "name": "hexToUInt32Color",
     "members": {
+      "global": [],
+      "inner": [],
       "instance": [],
-      "static": [],
-      "events": []
+      "events": [],
+      "static": []
     },
     "path": [
       {
diff --git a/test/fixture/react-jsx.output.json b/test/fixture/react-jsx.output.json
index 298cf5575..1ffc1ba8f 100644
--- a/test/fixture/react-jsx.output.json
+++ b/test/fixture/react-jsx.output.json
@@ -87,9 +87,11 @@
     "name": "apples",
     "kind": "function",
     "members": {
+      "global": [],
+      "inner": [],
       "instance": [],
-      "static": [],
-      "events": []
+      "events": [],
+      "static": []
     },
     "path": [
       {
diff --git a/test/fixture/simple-hashbang.output.json b/test/fixture/simple-hashbang.output.json
index 453b89139..f03bd9afb 100644
--- a/test/fixture/simple-hashbang.output.json
+++ b/test/fixture/simple-hashbang.output.json
@@ -157,9 +157,11 @@
     "name": "simple-hashbang.input",
     "kind": "function",
     "members": {
+      "global": [],
+      "inner": [],
       "instance": [],
-      "static": [],
-      "events": []
+      "events": [],
+      "static": []
     },
     "path": [
       {
diff --git a/test/fixture/simple-two.output.json b/test/fixture/simple-two.output.json
index 9036ad0da..a6d86ceea 100644
--- a/test/fixture/simple-two.output.json
+++ b/test/fixture/simple-two.output.json
@@ -238,9 +238,11 @@
     "name": "returnTwo",
     "kind": "function",
     "members": {
+      "global": [],
+      "inner": [],
       "instance": [],
-      "static": [],
-      "events": []
+      "events": [],
+      "static": []
     },
     "path": [
       {
diff --git a/test/fixture/simple.output.github.json b/test/fixture/simple.output.github.json
index 14359fd38..fee8d21ce 100644
--- a/test/fixture/simple.output.github.json
+++ b/test/fixture/simple.output.github.json
@@ -158,9 +158,11 @@
     "name": "simple.input",
     "kind": "function",
     "members": {
+      "global": [],
+      "inner": [],
       "instance": [],
-      "static": [],
-      "events": []
+      "events": [],
+      "static": []
     },
     "path": [
       {
diff --git a/test/fixture/simple.output.json b/test/fixture/simple.output.json
index 5637943ad..94432e345 100644
--- a/test/fixture/simple.output.json
+++ b/test/fixture/simple.output.json
@@ -157,9 +157,11 @@
     "name": "simple.input",
     "kind": "function",
     "members": {
+      "global": [],
+      "inner": [],
       "instance": [],
-      "static": [],
-      "events": []
+      "events": [],
+      "static": []
     },
     "path": [
       {
diff --git a/test/fixture/sort-order-alpha.output.json b/test/fixture/sort-order-alpha.output.json
index f4e2faf10..c2ae8e8f9 100644
--- a/test/fixture/sort-order-alpha.output.json
+++ b/test/fixture/sort-order-alpha.output.json
@@ -36,9 +36,11 @@
     "name": "a",
     "kind": "function",
     "members": {
+      "global": [],
+      "inner": [],
       "instance": [],
-      "static": [],
-      "events": []
+      "events": [],
+      "static": []
     },
     "path": [
       {
@@ -85,9 +87,11 @@
     "name": "b",
     "kind": "function",
     "members": {
+      "global": [],
+      "inner": [],
       "instance": [],
-      "static": [],
-      "events": []
+      "events": [],
+      "static": []
     },
     "path": [
       {
@@ -134,6 +138,8 @@
     "name": "C",
     "kind": "class",
     "members": {
+      "global": [],
+      "inner": [],
       "instance": [
         {
           "description": "",
@@ -174,9 +180,11 @@
           "memberof": "C",
           "scope": "instance",
           "members": {
+            "global": [],
+            "inner": [],
             "instance": [],
-            "static": [],
-            "events": []
+            "events": [],
+            "static": []
           },
           "path": [
             {
@@ -230,9 +238,11 @@
           "memberof": "C",
           "scope": "instance",
           "members": {
+            "global": [],
+            "inner": [],
             "instance": [],
-            "static": [],
-            "events": []
+            "events": [],
+            "static": []
           },
           "path": [
             {
@@ -286,9 +296,11 @@
           "memberof": "C",
           "scope": "instance",
           "members": {
+            "global": [],
+            "inner": [],
             "instance": [],
-            "static": [],
-            "events": []
+            "events": [],
+            "static": []
           },
           "path": [
             {
@@ -342,9 +354,11 @@
           "memberof": "C",
           "scope": "instance",
           "members": {
+            "global": [],
+            "inner": [],
             "instance": [],
-            "static": [],
-            "events": []
+            "events": [],
+            "static": []
           },
           "path": [
             {
@@ -360,8 +374,8 @@
           "namespace": "C#A"
         }
       ],
-      "static": [],
-      "events": []
+      "events": [],
+      "static": []
     },
     "path": [
       {
@@ -408,6 +422,8 @@
     "name": "D",
     "kind": "class",
     "members": {
+      "global": [],
+      "inner": [],
       "instance": [
         {
           "description": "",
@@ -448,9 +464,11 @@
           "memberof": "D",
           "scope": "instance",
           "members": {
+            "global": [],
+            "inner": [],
             "instance": [],
-            "static": [],
-            "events": []
+            "events": [],
+            "static": []
           },
           "path": [
             {
@@ -504,9 +522,11 @@
           "memberof": "D",
           "scope": "instance",
           "members": {
+            "global": [],
+            "inner": [],
             "instance": [],
-            "static": [],
-            "events": []
+            "events": [],
+            "static": []
           },
           "path": [
             {
@@ -560,9 +580,11 @@
           "memberof": "D",
           "scope": "instance",
           "members": {
+            "global": [],
+            "inner": [],
             "instance": [],
-            "static": [],
-            "events": []
+            "events": [],
+            "static": []
           },
           "path": [
             {
@@ -616,9 +638,11 @@
           "memberof": "D",
           "scope": "instance",
           "members": {
+            "global": [],
+            "inner": [],
             "instance": [],
-            "static": [],
-            "events": []
+            "events": [],
+            "static": []
           },
           "path": [
             {
@@ -634,8 +658,8 @@
           "namespace": "D#A"
         }
       ],
-      "static": [],
-      "events": []
+      "events": [],
+      "static": []
     },
     "path": [
       {
diff --git a/test/fixture/sorting/output.json b/test/fixture/sorting/output.json
index 705f499b8..65df1ea6f 100644
--- a/test/fixture/sorting/output.json
+++ b/test/fixture/sorting/output.json
@@ -87,9 +87,11 @@
     "name": "bananas",
     "kind": "function",
     "members": {
+      "global": [],
+      "inner": [],
       "instance": [],
-      "static": [],
-      "events": []
+      "events": [],
+      "static": []
     },
     "path": [
       {
@@ -187,9 +189,11 @@
     "name": "carrots",
     "kind": "function",
     "members": {
+      "global": [],
+      "inner": [],
       "instance": [],
-      "static": [],
-      "events": []
+      "events": [],
+      "static": []
     },
     "path": [
       {
@@ -287,9 +291,11 @@
     "name": "apples",
     "kind": "function",
     "members": {
+      "global": [],
+      "inner": [],
       "instance": [],
-      "static": [],
-      "events": []
+      "events": [],
+      "static": []
     },
     "path": [
       {
diff --git a/test/fixture/string-literal-key.output.json b/test/fixture/string-literal-key.output.json
index f159e0ba9..a92400ba9 100644
--- a/test/fixture/string-literal-key.output.json
+++ b/test/fixture/string-literal-key.output.json
@@ -44,9 +44,11 @@
     "name": "MyContainerObject",
     "kind": "constant",
     "members": {
+      "global": [],
+      "inner": [],
       "instance": [],
-      "static": [],
-      "events": []
+      "events": [],
+      "static": []
     },
     "path": [
       {
@@ -143,9 +145,11 @@
     "todos": [],
     "name": "foo",
     "members": {
+      "global": [],
+      "inner": [],
       "instance": [],
-      "static": [],
-      "events": []
+      "events": [],
+      "static": []
     },
     "path": [
       {
diff --git a/test/fixture/system-import.output.json b/test/fixture/system-import.output.json
index 5637943ad..94432e345 100644
--- a/test/fixture/system-import.output.json
+++ b/test/fixture/system-import.output.json
@@ -157,9 +157,11 @@
     "name": "simple.input",
     "kind": "function",
     "members": {
+      "global": [],
+      "inner": [],
       "instance": [],
-      "static": [],
-      "events": []
+      "events": [],
+      "static": []
     },
     "path": [
       {
diff --git a/test/fixture/this-class.output.json b/test/fixture/this-class.output.json
index 6441556d2..b62cb5464 100644
--- a/test/fixture/this-class.output.json
+++ b/test/fixture/this-class.output.json
@@ -50,9 +50,11 @@
     "kind": "module",
     "name": "bookshelf",
     "members": {
+      "global": [],
+      "inner": [],
       "instance": [],
-      "static": [],
-      "events": []
+      "events": [],
+      "static": []
     },
     "path": [
       {
@@ -112,6 +114,8 @@
     "kind": "class",
     "name": "Book",
     "members": {
+      "global": [],
+      "inner": [],
       "instance": [
         {
           "description": {
@@ -202,9 +206,11 @@
           "memberof": "Book",
           "scope": "instance",
           "members": {
+            "global": [],
+            "inner": [],
             "instance": [],
-            "static": [],
-            "events": []
+            "events": [],
+            "static": []
           },
           "path": [
             {
@@ -219,8 +225,8 @@
           "namespace": "Book#title"
         }
       ],
-      "static": [],
-      "events": []
+      "events": [],
+      "static": []
     },
     "path": [
       {
@@ -280,6 +286,8 @@
     "kind": "class",
     "name": "BookShelf",
     "members": {
+      "global": [],
+      "inner": [],
       "instance": [
         {
           "description": {
@@ -370,9 +378,11 @@
           "memberof": "BookShelf",
           "scope": "instance",
           "members": {
+            "global": [],
+            "inner": [],
             "instance": [],
-            "static": [],
-            "events": []
+            "events": [],
+            "static": []
           },
           "path": [
             {
@@ -387,8 +397,8 @@
           "namespace": "BookShelf#title"
         }
       ],
-      "static": [],
-      "events": []
+      "events": [],
+      "static": []
     },
     "path": [
       {
diff --git a/test/fixture/type_application.output.json b/test/fixture/type_application.output.json
index 50d5dcb33..d2c81ef6a 100644
--- a/test/fixture/type_application.output.json
+++ b/test/fixture/type_application.output.json
@@ -185,9 +185,11 @@
     "kind": "class",
     "name": "Address6",
     "members": {
+      "global": [],
+      "inner": [],
       "instance": [],
-      "static": [],
-      "events": []
+      "events": [],
+      "static": []
     },
     "path": [
       {
diff --git a/test/fixture/var-function-param-return.output.json b/test/fixture/var-function-param-return.output.json
index 66d9c42c1..be9937633 100644
--- a/test/fixture/var-function-param-return.output.json
+++ b/test/fixture/var-function-param-return.output.json
@@ -54,9 +54,11 @@
     "name": "f",
     "kind": "function",
     "members": {
+      "global": [],
+      "inner": [],
       "instance": [],
-      "static": [],
-      "events": []
+      "events": [],
+      "static": []
     },
     "path": [
       {