diff --git a/CMakeLists.txt b/CMakeLists.txt
index edebc5100d..3d747b9cce 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -561,12 +561,19 @@ if (MRDOCS_BUILD_TESTS)
             message(FATAL_ERROR "Java is needed to run xml-lint")
         endif()
 
+        # Generate mrdocs.rnc via the --schemas option, then
+        # convert it to a .rng for xmllint validation.
+        add_custom_command(
+            COMMAND mrdocs --schemas=${CMAKE_CURRENT_BINARY_DIR}
+            OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/mrdocs.rnc
+            DEPENDS mrdocs
+            COMMENT "Generating mrdocs.rnc from --schemas")
         add_custom_command(
             COMMAND ${Java_JAVA_EXECUTABLE} -jar ${CMAKE_CURRENT_SOURCE_DIR}/util/trang.jar
-                ${CMAKE_CURRENT_SOURCE_DIR}/mrdocs.rnc ${CMAKE_CURRENT_BINARY_DIR}/mrdocs.rng
-            OUTPUT mrdocs.rng
-            DEPENDS mrdocs.rnc)
-        add_custom_target(mrdocs_rng ALL DEPENDS mrdocs.rng)
+                ${CMAKE_CURRENT_BINARY_DIR}/mrdocs.rnc ${CMAKE_CURRENT_BINARY_DIR}/mrdocs.rng
+            OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/mrdocs.rng
+            DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/mrdocs.rnc)
+        add_custom_target(mrdocs_rng ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/mrdocs.rng)
 
         file(GLOB_RECURSE XML_SOURCES CONFIGURE_DEPENDS test-files/golden-tests/*.xml)
         add_test(NAME xml-lint
diff --git a/include/mrdocs/Metadata/DocComment/Block/ParamDirection.hpp b/include/mrdocs/Metadata/DocComment/Block/ParamDirection.hpp
index bff93b938e..16c063aaaf 100644
--- a/include/mrdocs/Metadata/DocComment/Block/ParamDirection.hpp
+++ b/include/mrdocs/Metadata/DocComment/Block/ParamDirection.hpp
@@ -16,6 +16,7 @@
 
 #include <mrdocs/Platform.hpp>
 #include <mrdocs/Dom.hpp>
+#include <mrdocs/Support/Describe.hpp>
 
 namespace mrdocs::doc {
 
@@ -33,23 +34,7 @@ enum class ParamDirection
     inout
 };
 
-/** Return the name of the ParamDirection as a string.
-*/
-MRDOCS_DECL
-dom::String
-toString(ParamDirection kind) noexcept;
-
-/** Return the ParamDirection from a @ref dom::Value string.
-*/
-inline
-void
-tag_invoke(
-    dom::ValueFromTag,
-    dom::Value& v,
-    ParamDirection const kind)
-{
-    v = toString(kind);
-}
+MRDOCS_DESCRIBE_ENUM(ParamDirection, none, in, out, inout)
 
 } // mrdocs::doc
 
diff --git a/include/mrdocs/Metadata/Specifiers/AccessKind.hpp b/include/mrdocs/Metadata/Specifiers/AccessKind.hpp
index 39d78e98fb..d780d0ee2d 100644
--- a/include/mrdocs/Metadata/Specifiers/AccessKind.hpp
+++ b/include/mrdocs/Metadata/Specifiers/AccessKind.hpp
@@ -14,7 +14,7 @@
 
 #include <mrdocs/Platform.hpp>
 #include <mrdocs/Dom.hpp>
-#include <string>
+#include <mrdocs/Support/Describe.hpp>
 
 namespace mrdocs {
 
@@ -41,25 +41,7 @@ enum class AccessKind
     Private,
 };
 
-/** Convert access specifier to its string form.
-*/
-MRDOCS_DECL
-dom::String
-toString(AccessKind kind) noexcept;
-
-/** Return the AccessKind as a @ref dom::Value string.
-*/
-inline
-void
-tag_invoke(
-    dom::ValueFromTag,
-    dom::Value& v,
-    AccessKind const kind)
-{
-    v = toString(kind);
-}
-
-
+MRDOCS_DESCRIBE_ENUM(AccessKind, None, Public, Protected, Private)
 
 } // mrdocs
 
diff --git a/include/mrdocs/Metadata/Specifiers/ConstexprKind.hpp b/include/mrdocs/Metadata/Specifiers/ConstexprKind.hpp
index 0375e7bed7..6cf86ea30b 100644
--- a/include/mrdocs/Metadata/Specifiers/ConstexprKind.hpp
+++ b/include/mrdocs/Metadata/Specifiers/ConstexprKind.hpp
@@ -13,7 +13,7 @@
 #define MRDOCS_API_METADATA_SPECIFIERS_CONSTEXPRKIND_HPP
 
 #include <mrdocs/Platform.hpp>
-#include <string>
+#include <mrdocs/Support/Describe.hpp>
 
 namespace mrdocs {
 
@@ -33,23 +33,7 @@ enum class ConstexprKind
     Consteval,
 };
 
-/** Convert a constexpr/consteval specifier kind to a string.
-*/
-MRDOCS_DECL
-dom::String
-toString(ConstexprKind kind) noexcept;
-
-/** Return the ConstexprKind as a @ref dom::Value string.
-*/
-inline
-void
-tag_invoke(
-    dom::ValueFromTag,
-    dom::Value& v,
-    ConstexprKind const kind)
-{
-    v = toString(kind);
-}
+MRDOCS_DESCRIBE_ENUM(ConstexprKind, None, Constexpr, Consteval)
 
 } // mrdocs
 
diff --git a/include/mrdocs/Metadata/Specifiers/OperatorKind.hpp b/include/mrdocs/Metadata/Specifiers/OperatorKind.hpp
index 669c6f1386..ea4be01bf7 100644
--- a/include/mrdocs/Metadata/Specifiers/OperatorKind.hpp
+++ b/include/mrdocs/Metadata/Specifiers/OperatorKind.hpp
@@ -120,18 +120,6 @@ enum class OperatorKind
     Coawait,
 };
 
-/** Map an operator kind to a DOM value (its underlying integer).
-*/
-inline
-void
-tag_invoke(
-    dom::ValueFromTag,
-    dom::Value& v,
-    OperatorKind kind)
-{
-    v = static_cast<std::underlying_type_t<OperatorKind>>(kind);
-}
-
 /** Determines whether the operator is potentially unary.
 */
 MRDOCS_DECL
@@ -156,6 +144,18 @@ getOperatorName(
     OperatorKind kind,
     bool include_keyword = false) noexcept;
 
+/** Map an operator kind to a DOM value.
+*/
+inline
+void
+tag_invoke(
+    dom::ValueFromTag,
+    dom::Value& v,
+    OperatorKind kind)
+{
+    v = getOperatorName(kind);
+}
+
 /** Return the short name of an operator as a string.
 */
 MRDOCS_DECL
diff --git a/include/mrdocs/Metadata/Specifiers/StorageClassKind.hpp b/include/mrdocs/Metadata/Specifiers/StorageClassKind.hpp
index e09b153c0a..1a8746fe86 100644
--- a/include/mrdocs/Metadata/Specifiers/StorageClassKind.hpp
+++ b/include/mrdocs/Metadata/Specifiers/StorageClassKind.hpp
@@ -14,7 +14,7 @@
 
 #include <mrdocs/Platform.hpp>
 #include <mrdocs/Dom.hpp>
-#include <string>
+#include <mrdocs/Support/Describe.hpp>
 
 namespace mrdocs {
 
@@ -40,23 +40,7 @@ enum class StorageClassKind
     Register
 };
 
-/** Convert a storage class kind to its string form.
-*/
-MRDOCS_DECL
-dom::String
-toString(StorageClassKind kind) noexcept;
-
-/** Return the StorageClassKind as a @ref dom::Value string.
-*/
-inline
-void
-tag_invoke(
-    dom::ValueFromTag,
-    dom::Value& v,
-    StorageClassKind const kind)
-{
-    v = toString(kind);
-}
+MRDOCS_DESCRIBE_ENUM(StorageClassKind, None, Extern, Static, Auto, Register)
 
 } // mrdocs
 
diff --git a/include/mrdocs/Metadata/Type/TypeKind.hpp b/include/mrdocs/Metadata/Type/TypeKind.hpp
index dc1221192b..851e3294d7 100644
--- a/include/mrdocs/Metadata/Type/TypeKind.hpp
+++ b/include/mrdocs/Metadata/Type/TypeKind.hpp
@@ -29,9 +29,9 @@ MRDOCS_DECL
 dom::String
 toString(TypeKind kind) noexcept;
 
-inline
 /** Map a TypeKind into a DOM value.
 */
+inline
 void
 tag_invoke(
     dom::ValueFromTag,
diff --git a/include/mrdocs/Schemas/DomDescriptions.hpp b/include/mrdocs/Schemas/DomDescriptions.hpp
new file mode 100644
index 0000000000..f115668e76
--- /dev/null
+++ b/include/mrdocs/Schemas/DomDescriptions.hpp
@@ -0,0 +1,761 @@
+//
+// Licensed under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+// Copyright (c) 2026 Gennaro Prota (gennaro.prota@gmail.com)
+//
+// Official repository: https://github.com/cppalliance/mrdocs
+//
+
+#ifndef MRDOCS_API_SCHEMAS_DOMDESCRIPTIONS_HPP
+#define MRDOCS_API_SCHEMAS_DOMDESCRIPTIONS_HPP
+
+#include <string_view>
+
+/** Hand-curated descriptions for the JSON Schema produced by
+    @ref DomSchemaWriter.
+
+    The DOM that Handlebars templates see is a projection of the
+    C++ corpus types. Its field names and shapes are derived
+    automatically by reflection, but the *meaning* of each field
+    cannot be inferred from the C++ types alone (e.g. the C++ doc
+    comment describes the C++ class, not the DOM projection;
+    synthesized fields like `class` or `isSeeBelow` have no C++
+    counterpart at all).
+
+    This header carries a small lookup table indexed by
+    `(typeName, memberName)`. The schema writer consults it when
+    emitting each `$defs` entry and each property; matched entries
+    become `description` fields in the JSON Schema and propagate
+    automatically to any human-readable rendering of it.
+
+    A `memberName` of `""` denotes the type-level description.
+*/
+namespace mrdocs::schema {
+
+/** A single description entry.
+
+    `type` matches the readable type name produced by
+    `readableTypeName<T>()` (e.g. `"FunctionSymbol"`,
+    `"NamedType"`).
+
+    `member` matches the DOM-normalized field name (the
+    C++ identifier with its first letter lowercased), or
+    `""` for a description of the type itself.
+*/
+struct DomDescription
+{
+    std::string_view type;
+    std::string_view member;
+    std::string_view text;
+};
+
+/** Retrieve the description for `(type, member)`, or `""` if
+    no entry exists.
+*/
+constexpr std::string_view
+findDomDescription(
+    std::string_view type,
+    std::string_view member = "") noexcept;
+
+namespace detail {
+
+inline constexpr DomDescription kDomDescriptions[] = {
+    // ----- Symbol (base) -------------------------------------------
+    {"Symbol", "",
+     "Common base of every C++ symbol the corpus exposes. "
+     "Concrete symbols (function, record, namespace, etc.) "
+     "extend this with their kind-specific fields."},
+    {"Symbol", "name",
+     "Unqualified name of the symbol, as written in the source."},
+    {"Symbol", "id",
+     "Stable, base64-encoded identifier used for cross-references "
+     "between DOM objects."},
+    {"Symbol", "kind",
+     "Discriminator selecting the symbol kind (e.g. "
+     "`\"function\"`, `\"record\"`). Each concrete symbol type "
+     "constrains this field to a single literal value."},
+    {"Symbol", "access",
+     "Access specifier (`\"public\"`, `\"protected\"`, "
+     "`\"private\"`); empty for namespace-scope members."},
+    {"Symbol", "extraction",
+     "Why the symbol was extracted: `\"regular\"`, "
+     "`\"see-below\"`, `\"implementation-defined\"`, or "
+     "`\"dependency\"`."},
+    {"Symbol", "isCopyFromInherited",
+     "True when the symbol is a synthesized copy of an "
+     "inherited member (see the `inherit-base-members` "
+     "configuration option)."},
+    {"Symbol", "parent",
+     "Identifier of the enclosing scope, or empty when the "
+     "symbol lives in the global namespace."},
+    {"Symbol", "doc",
+     "Parsed documentation comment attached to the symbol, "
+     "or absent when the symbol is undocumented."},
+    {"Symbol", "loc",
+     "Source location information for the symbol's declaration "
+     "and definition."},
+
+    // ----- Symbol synthesized fields -------------------------------
+    {"Symbol", "class",
+     "Tag set to the literal `\"symbol\"`. Lets templates "
+     "discriminate symbol DOM objects from auxiliary types "
+     "(`type`, `name`, etc.) without inspecting `kind`."},
+    {"Symbol", "isRegular",
+     "Convenience boolean equivalent to "
+     "`extraction === \"regular\"`."},
+    {"Symbol", "isSeeBelow",
+     "Convenience boolean equivalent to "
+     "`extraction === \"see-below\"`."},
+    {"Symbol", "isImplementationDefined",
+     "Convenience boolean equivalent to "
+     "`extraction === \"implementation-defined\"`."},
+    {"Symbol", "isDependency",
+     "Convenience boolean equivalent to "
+     "`extraction === \"dependency\"`."},
+
+    // ----- FunctionSymbol ------------------------------------------
+    {"FunctionSymbol", "",
+     "A function declaration, including free functions, "
+     "member functions, constructors, destructors, and "
+     "user-defined operators."},
+    {"FunctionSymbol", "params",
+     "Function parameter list, in declaration order."},
+    {"FunctionSymbol", "returnType",
+     "Return type. Absent for constructors and destructors."},
+    {"FunctionSymbol", "template",
+     "Template head if this is a function template; absent "
+     "for non-templates."},
+    {"FunctionSymbol", "funcClass",
+     "Special-function classification (`\"constructor\"`, "
+     "`\"destructor\"`, `\"conversion\"`, etc.) or empty for "
+     "ordinary functions."},
+    {"FunctionSymbol", "noexcept",
+     "Rendered `noexcept` specifier, if any."},
+    {"FunctionSymbol", "requires",
+     "Trailing `requires`-clause expression as written."},
+    {"FunctionSymbol", "isVariadic",
+     "True when the function accepts a C-style `...` "
+     "argument list."},
+    {"FunctionSymbol", "isDefaulted",
+     "True when the function is `= default`."},
+    {"FunctionSymbol", "isExplicitlyDefaulted",
+     "True when the function carries an explicit `= default` "
+     "in source (not just an implicit defaulted special "
+     "member)."},
+    {"FunctionSymbol", "isDeleted",
+     "True when the function is `= delete` (whether written "
+     "explicitly or implied by language rules)."},
+    {"FunctionSymbol", "isDeletedAsWritten",
+     "True only when the function is `= delete` as written in "
+     "source; distinguishes user-deleted from implicitly "
+     "deleted."},
+    {"FunctionSymbol", "isNoReturn",
+     "True when the function is marked `[[noreturn]]`."},
+    {"FunctionSymbol", "hasOverrideAttr",
+     "True when the function carries the `override` "
+     "specifier."},
+    {"FunctionSymbol", "hasTrailingReturn",
+     "True when the function uses trailing-return-type "
+     "syntax (`auto … -> T`)."},
+    {"FunctionSymbol", "isNodiscard",
+     "True when the function is marked `[[nodiscard]]`."},
+    {"FunctionSymbol", "isExplicitObjectMemberFunction",
+     "True when the function declares an explicit object "
+     "parameter (deducing-this member function)."},
+    {"FunctionSymbol", "constexpr",
+     "Constexpr level: `\"constexpr\"`, `\"consteval\"`, or "
+     "empty."},
+    {"FunctionSymbol", "overloadedOperator",
+     "Overloaded operator name (e.g. `\"operator+\"`) or "
+     "empty if not an operator."},
+    {"FunctionSymbol", "storageClass",
+     "Storage class: `\"static\"`, `\"extern\"`, etc., or "
+     "empty."},
+    {"FunctionSymbol", "isRecordMethod",
+     "True when the function is a member of a class, struct, "
+     "or union."},
+    {"FunctionSymbol", "isVirtual",
+     "True when the function is virtual (whether by `virtual` "
+     "keyword or by overriding a virtual function)."},
+    {"FunctionSymbol", "isVirtualAsWritten",
+     "True only when the `virtual` keyword appears in source."},
+    {"FunctionSymbol", "isPure",
+     "True when the function is pure virtual (`= 0`)."},
+    {"FunctionSymbol", "isConst",
+     "True when the function is a `const` member function."},
+    {"FunctionSymbol", "isVolatile",
+     "True when the function is a `volatile` member "
+     "function."},
+    {"FunctionSymbol", "isFinal",
+     "True when the function is declared `final`."},
+    {"FunctionSymbol", "refQualifier",
+     "Reference qualifier on the implicit object parameter: "
+     "`\"&\"`, `\"&&\"`, or empty."},
+    {"FunctionSymbol", "explicit",
+     "Rendered `explicit` specifier (with optional condition) "
+     "for constructors and conversion functions."},
+    {"FunctionSymbol", "attributes",
+     "Attributes attached to the declaration."},
+
+    // ----- RecordSymbol --------------------------------------------
+    {"RecordSymbol", "",
+     "A class, struct, or union declaration."},
+    {"RecordSymbol", "keyKind",
+     "The introducing keyword: `\"class\"`, `\"struct\"`, "
+     "or `\"union\"`."},
+    {"RecordSymbol", "isFinal",
+     "True if the class is declared `final`."},
+    {"RecordSymbol", "bases",
+     "Direct base classes, in declaration order."},
+    {"RecordSymbol", "template",
+     "Template head if this is a class template; absent "
+     "for non-templates."},
+    {"RecordSymbol", "interface",
+     "Per-access summary of the record's members (public, "
+     "protected, private, plus aggregated views)."},
+    {"RecordSymbol", "isTypeDef",
+     "True when the record was introduced by an anonymous "
+     "`typedef struct { … } Name;` declaration."},
+    {"RecordSymbol", "isFinalDestructor",
+     "True when the record's destructor is declared `final`."},
+    {"RecordSymbol", "derived",
+     "Identifiers of records that derive from this one and "
+     "appear in the corpus."},
+    {"RecordSymbol", "friends",
+     "List of friend declarations attached to the record."},
+
+    // ----- NamespaceSymbol -----------------------------------------
+    {"NamespaceSymbol", "",
+     "A namespace declaration. The implicit global namespace "
+     "appears as a namespace symbol with an empty name and "
+     "no parent."},
+    {"NamespaceSymbol", "isInline",
+     "True if the namespace is declared `inline`."},
+    {"NamespaceSymbol", "isAnonymous",
+     "True if the namespace has no name in source."},
+    {"NamespaceSymbol", "members",
+     "All members of the namespace, grouped into tranches "
+     "by kind."},
+    {"NamespaceSymbol", "usingDirectives",
+     "List of `using namespace` directives found in this "
+     "namespace's scope."},
+
+    // ----- EnumSymbol ----------------------------------------------
+    {"EnumSymbol", "",
+     "An enum declaration (scoped or unscoped)."},
+    {"EnumSymbol", "scoped",
+     "True for `enum class` / `enum struct`; false for "
+     "unscoped enums."},
+    {"EnumSymbol", "underlyingType",
+     "Underlying integer type, when an explicit one was "
+     "specified."},
+    {"EnumSymbol", "constants",
+     "Identifiers of the enum's constants, in declaration "
+     "order."},
+
+    // ----- EnumConstantSymbol --------------------------------------
+    {"EnumConstantSymbol", "",
+     "A single enumerator within an enum declaration."},
+    {"EnumConstantSymbol", "initializer",
+     "Initializer expression as written, or empty when the "
+     "enumerator takes its implicit value."},
+
+    // ----- TypedefSymbol -------------------------------------------
+    {"TypedefSymbol", "",
+     "A type alias declaration (`typedef` or `using`)."},
+    {"TypedefSymbol", "type",
+     "Aliased type."},
+    {"TypedefSymbol", "isUsing",
+     "True for `using`-style aliases; false for the "
+     "`typedef` keyword."},
+    {"TypedefSymbol", "template",
+     "Template head if this is an alias template; absent "
+     "for non-templates."},
+
+    // ----- VariableSymbol ------------------------------------------
+    {"VariableSymbol", "",
+     "A variable declaration: namespace-scope variable, "
+     "static data member, or non-static data member."},
+    {"VariableSymbol", "type",
+     "Declared type of the variable."},
+    {"VariableSymbol", "template",
+     "Template head if this is a variable template."},
+    {"VariableSymbol", "initializer",
+     "Initializer expression as written, or empty when the "
+     "variable has no initializer."},
+    {"VariableSymbol", "storageClass",
+     "Storage class: `\"static\"`, `\"extern\"`, "
+     "`\"thread_local\"`, etc., or empty."},
+    {"VariableSymbol", "isInline",
+     "True when the variable is declared `inline`."},
+    {"VariableSymbol", "isConstexpr",
+     "True when the variable is declared `constexpr`."},
+    {"VariableSymbol", "isConstinit",
+     "True when the variable is declared `constinit`."},
+    {"VariableSymbol", "isThreadLocal",
+     "True when the variable has thread-storage duration."},
+    {"VariableSymbol", "isMaybeUnused",
+     "True when the variable carries `[[maybe_unused]]`."},
+    {"VariableSymbol", "isDeprecated",
+     "True when the variable carries `[[deprecated]]`."},
+    {"VariableSymbol", "hasNoUniqueAddress",
+     "True when the data member carries "
+     "`[[no_unique_address]]`."},
+    {"VariableSymbol", "isRecordField",
+     "True when the variable is a non-static data member of "
+     "a class, struct, or union."},
+    {"VariableSymbol", "isMutable",
+     "True when the data member is declared `mutable`."},
+    {"VariableSymbol", "isVariant",
+     "True when the data member is part of an anonymous "
+     "union."},
+    {"VariableSymbol", "isBitfield",
+     "True when the data member is a bit-field."},
+    {"VariableSymbol", "bitfieldWidth",
+     "Bit-field width expression, when the member is a "
+     "bit-field."},
+    {"VariableSymbol", "attributes",
+     "Attributes attached to the declaration."},
+
+    // ----- ConceptSymbol -------------------------------------------
+    {"ConceptSymbol", "",
+     "A concept declaration."},
+    {"ConceptSymbol", "template",
+     "Concept's template parameter list."},
+    {"ConceptSymbol", "constraint",
+     "Constraint expression that defines the concept."},
+
+    // ----- GuideSymbol ---------------------------------------------
+    {"GuideSymbol", "",
+     "A user-provided class-template deduction guide."},
+    {"GuideSymbol", "deduced",
+     "Deduced class-template specialization the guide produces."},
+    {"GuideSymbol", "template",
+     "Template parameters of the deduction guide."},
+    {"GuideSymbol", "params",
+     "Parameter list used for argument deduction."},
+    {"GuideSymbol", "explicit",
+     "Rendered `explicit` specifier, if any."},
+
+    // ----- NamespaceAliasSymbol ------------------------------------
+    {"NamespaceAliasSymbol", "",
+     "A namespace-alias declaration "
+     "(`namespace alias = target;`)."},
+    {"NamespaceAliasSymbol", "aliasedSymbol",
+     "Reference to the namespace this alias refers to."},
+
+    // ----- UsingSymbol ---------------------------------------------
+    {"UsingSymbol", "",
+     "A `using`-declaration (introduces names from another "
+     "scope, including using-enum)."},
+    {"UsingSymbol", "class",
+     "Kind of `using`-declaration: ordinary, typename, or "
+     "enum."},
+    {"UsingSymbol", "introducedName",
+     "Name introduced into the current scope, qualified by "
+     "the source scope."},
+    {"UsingSymbol", "shadowDeclarations",
+     "Symbols brought into scope by the using-declaration."},
+
+    // ----- OverloadsSymbol -----------------------------------------
+    {"OverloadsSymbol", "",
+     "An aggregate of overloaded functions sharing a name. "
+     "Used to group overload sets in the corpus."},
+    {"OverloadsSymbol", "funcClass",
+     "Shared special-function classification of the overload "
+     "set, when applicable."},
+    {"OverloadsSymbol", "overloadedOperator",
+     "Shared overloaded-operator name when the overload set "
+     "is for an operator."},
+    {"OverloadsSymbol", "members",
+     "Identifiers of the function declarations belonging to "
+     "this overload set."},
+    {"OverloadsSymbol", "returnType",
+     "Common return type when every overload shares it; "
+     "absent otherwise."},
+
+    // ----- Polymorphic union types ---------------------------------
+    {"Type", "",
+     "A C++ type. The DOM serializes the most-derived kind "
+     "(named, pointer, reference, array, function, etc.); see "
+     "the `oneOf` entries for the per-kind shape."},
+    {"Name", "",
+     "A (possibly qualified) name occurring in source, "
+     "such as the name of a base class or the type referenced "
+     "by a `NamedType`."},
+    {"Block", "",
+     "A block-level node in a parsed documentation comment "
+     "(paragraphs, lists, headings, and command blocks like "
+     "`@brief` / `@param` / `@returns`)."},
+    {"Inline", "",
+     "An inline-level node in a parsed documentation comment "
+     "(text, emphasis, code spans, references, etc.)."},
+
+    // ----- Type variants -------------------------------------------
+    {"NamedType", "",
+     "A type referred to by name (a class, an enum, a typedef, "
+     "or a fundamental type like `int`)."},
+    {"NamedType", "name",
+     "The name as written, including any qualifications and "
+     "template arguments."},
+    {"NamedType", "fundamentalType",
+     "Fundamental-type tag (`\"int\"`, `\"double\"`, …) when "
+     "the named type is a built-in type; empty otherwise."},
+
+    {"DecltypeType", "",
+     "A type expressed as `decltype(expr)`."},
+    {"DecltypeType", "operand",
+     "The expression inside `decltype(...)`."},
+
+    {"AutoType", "",
+     "A placeholder type introduced by `auto` or "
+     "`decltype(auto)`."},
+    {"AutoType", "keyword",
+     "Which placeholder was used: `\"auto\"` or "
+     "`\"decltype(auto)\"`."},
+    {"AutoType", "constraint",
+     "Concept constraint applied to the placeholder, if any."},
+
+    {"LValueReferenceType", "",
+     "An lvalue-reference type (`T&`)."},
+    {"LValueReferenceType", "pointeeType",
+     "The referenced type."},
+
+    {"RValueReferenceType", "",
+     "An rvalue-reference type (`T&&`)."},
+    {"RValueReferenceType", "pointeeType",
+     "The referenced type."},
+
+    {"PointerType", "",
+     "A pointer type (`T*`)."},
+    {"PointerType", "pointeeType",
+     "The pointed-to type."},
+
+    {"MemberPointerType", "",
+     "A pointer-to-member type (`T C::*`)."},
+    {"MemberPointerType", "parentType",
+     "The class type the pointer is a member of."},
+    {"MemberPointerType", "pointeeType",
+     "The type of the member being pointed to."},
+
+    {"ArrayType", "",
+     "An array type (`T[N]`)."},
+    {"ArrayType", "elementType",
+     "The element type."},
+    {"ArrayType", "bounds",
+     "Array bound expression as written, or empty for "
+     "unknown-bound arrays."},
+
+    {"FunctionType", "",
+     "A function type (used for function pointers, "
+     "pointers-to-members, etc.)."},
+    {"FunctionType", "returnType",
+     "The return type."},
+    {"FunctionType", "paramTypes",
+     "Parameter types, in declaration order."},
+    {"FunctionType", "refQualifier",
+     "Reference qualifier on the implicit object parameter "
+     "(for member-function types): `\"&\"`, `\"&&\"`, or "
+     "empty."},
+    {"FunctionType", "exceptionSpec",
+     "Rendered exception specification, if any."},
+    {"FunctionType", "isVariadic",
+     "True when the function type accepts a C-style `...` "
+     "argument list."},
+
+    // ----- Name variants -------------------------------------------
+    {"IdentifierName", "",
+     "A plain (possibly qualified) name without template "
+     "arguments, e.g. `std::vector` or `MyClass::nested`."},
+    {"SpecializationName", "",
+     "A template-id: a name applied to template arguments, "
+     "e.g. `std::vector<int>` or `Outer<T>::Inner`."},
+    {"SpecializationName", "templateArgs",
+     "Template arguments applied to the name, in declaration "
+     "order."},
+
+    // ----- Param ---------------------------------------------------
+    {"Param", "",
+     "A function parameter."},
+    {"Param", "name",
+     "Parameter name as written in the declaration. Empty "
+     "for unnamed parameters."},
+    {"Param", "type",
+     "Declared parameter type."},
+    {"Param", "default",
+     "Default argument expression as written, or absent if "
+     "the parameter has no default."},
+
+    // ----- Location ------------------------------------------------
+    {"Location", "",
+     "A source location (file path plus line/column)."},
+    {"Location", "fullPath",
+     "Absolute path to the source file."},
+    {"Location", "shortPath",
+     "Path relative to the configured source root, suitable "
+     "for display."},
+    {"Location", "sourcePath",
+     "Path relative to the source-root setting, used for "
+     "documentation cross-references."},
+    {"Location", "lineNumber",
+     "1-based line number of the location."},
+    {"Location", "columnNumber",
+     "1-based column number of the location."},
+    {"Location", "documented",
+     "True when a doc comment was attached at this location."},
+
+    // ----- TArg variants -------------------------------------------
+    {"TypeTArg", "",
+     "A template argument that is a type, e.g. `int` in "
+     "`std::vector<int>`."},
+    {"TypeTArg", "type",
+     "The argument type."},
+
+    {"ConstantTArg", "",
+     "A template argument that is a non-type value, e.g. "
+     "`42` in `std::array<int, 42>`."},
+    {"ConstantTArg", "value",
+     "The argument expression as written."},
+
+    {"TemplateTArg", "",
+     "A template argument that is itself a template, used "
+     "for template-template parameters."},
+    {"TemplateTArg", "template",
+     "Identifier of the referenced template."},
+    {"TemplateTArg", "name",
+     "Name of the template as written."},
+
+    // ----- TParam variants -----------------------------------------
+    {"TypeTParam", "",
+     "A type template parameter (`template <typename T>` or "
+     "`template <class T>`)."},
+    {"TypeTParam", "keyKind",
+     "Introducing keyword: `\"typename\"` or `\"class\"`."},
+    {"TypeTParam", "constraint",
+     "Concept constraint applied to the parameter, if any."},
+
+    {"ConstantTParam", "",
+     "A non-type template parameter "
+     "(`template <int N>`, `template <auto V>`, ...)."},
+    {"ConstantTParam", "type",
+     "Declared type of the parameter."},
+
+    {"TemplateTParam", "",
+     "A template template parameter "
+     "(`template <template <typename> class C>`)."},
+    {"TemplateTParam", "params",
+     "Inner template parameter list of the parameter."},
+
+    // ----- Block variants ------------------------------------------
+    {"AdmonitionBlock", "",
+     "An admonition (note, warning, etc.) container "
+     "introduced by `@note`, `@warning`, and similar "
+     "commands."},
+    {"AdmonitionBlock", "admonish",
+     "Admonition kind: `\"note\"`, `\"tip\"`, "
+     "`\"important\"`, `\"caution\"`, or `\"warning\"`."},
+
+    {"BriefBlock", "",
+     "The brief description of a symbol, sourced from a "
+     "`@brief` command, `@copybrief` reference, or the first "
+     "sentence of the doc comment."},
+    {"BriefBlock", "copiedFrom",
+     "Identifier of the symbol the brief was copied from "
+     "via `@copybrief`, or empty."},
+
+    {"CodeBlock", "",
+     "A fenced code block in the doc comment."},
+    {"CodeBlock", "literal",
+     "Verbatim contents of the code block."},
+    {"CodeBlock", "info",
+     "Info string after the opening fence (typically the "
+     "language identifier, e.g. `\"cpp\"`)."},
+
+    {"DefinitionListBlock", "",
+     "A definition list (terms with descriptions)."},
+    {"DefinitionListBlock", "items",
+     "Definition-list items, each pairing a term with its "
+     "description."},
+
+    {"FootnoteDefinitionBlock", "",
+     "A footnote definition referenced by a "
+     "`FootnoteReferenceInline` elsewhere in the comment."},
+    {"FootnoteDefinitionBlock", "label",
+     "Label that footnote references use to point at this "
+     "definition."},
+
+    {"HeadingBlock", "",
+     "A heading within the doc comment."},
+    {"HeadingBlock", "level",
+     "Heading depth (1 for top-level, 2 for second-level, "
+     "and so on)."},
+
+    {"ListBlock", "",
+     "An ordered or unordered list."},
+    {"ListBlock", "items",
+     "List items, each holding a sequence of blocks."},
+    {"ListBlock", "listKind",
+     "Whether the list is ordered or unordered."},
+
+    {"MathBlock", "",
+     "A display-math block."},
+    {"MathBlock", "literal",
+     "Verbatim TeX/LaTeX source for the formula."},
+
+    {"ParagraphBlock", "",
+     "A paragraph: a sequence of inline elements terminated "
+     "by a blank line."},
+
+    {"ParamBlock", "",
+     "Documentation of a function parameter, sourced from a "
+     "`@param` command."},
+    {"ParamBlock", "name",
+     "Name of the documented parameter (matches a parameter "
+     "of the enclosing function)."},
+    {"ParamBlock", "direction",
+     "Parameter direction (`\"in\"`, `\"out\"`, "
+     "`\"inout\"`), or empty when unspecified."},
+
+    {"PostconditionBlock", "",
+     "A `@post` clause describing a function postcondition."},
+
+    {"PreconditionBlock", "",
+     "A `@pre` clause describing a function precondition."},
+
+    {"QuoteBlock", "",
+     "A block-level quotation, holding nested blocks."},
+
+    {"ReturnsBlock", "",
+     "Documentation of the function's return value, sourced "
+     "from a `@returns` / `@return` command."},
+
+    {"SeeBlock", "",
+     "A `@see` cross-reference clause."},
+
+    {"TParamBlock", "",
+     "Documentation of a template parameter, sourced from a "
+     "`@tparam` command."},
+    {"TParamBlock", "name",
+     "Name of the documented template parameter."},
+
+    {"TableBlock", "",
+     "A table with header and body rows."},
+    {"TableBlock", "alignments",
+     "Per-column alignment for the table."},
+    {"TableBlock", "items",
+     "Rows of the table, each a sequence of cells."},
+
+    {"ThematicBreakBlock", "",
+     "A horizontal rule (`---`) separating sections."},
+
+    {"ThrowsBlock", "",
+     "Documentation of an exception thrown by the function, "
+     "sourced from a `@throws` / `@throw` / `@exception` "
+     "command."},
+    {"ThrowsBlock", "exception",
+     "Name of the exception type the function may throw."},
+
+    // ----- Inline variants -----------------------------------------
+    {"CodeInline", "",
+     "An inline code span (`` `like this` ``)."},
+
+    {"CopyDetailsInline", "",
+     "A pending `@copydetails` reference. Resolved during "
+     "doc-comment finalization; surviving instances indicate "
+     "an unresolved reference."},
+    {"CopyDetailsInline", "string",
+     "The reference string as written after `@copydetails`."},
+    {"CopyDetailsInline", "id",
+     "Identifier of the referenced symbol once resolved, or "
+     "empty if the reference could not be resolved."},
+
+    {"EmphInline", "",
+     "Emphasized inline text (typically rendered italic)."},
+
+    {"FootnoteReferenceInline", "",
+     "An inline reference pointing at a "
+     "`FootnoteDefinitionBlock` with the matching label."},
+    {"FootnoteReferenceInline", "label",
+     "Label of the footnote being referenced."},
+
+    {"HighlightInline", "",
+     "Inline text rendered with highlight (e.g. `<mark>`) "
+     "styling."},
+
+    {"ImageInline", "",
+     "An inline image."},
+    {"ImageInline", "src",
+     "Image source URL or path."},
+    {"ImageInline", "alt",
+     "Alternative text for the image."},
+
+    {"LineBreakInline", "",
+     "A hard line break within a paragraph "
+     "(`<br>`-equivalent)."},
+
+    {"LinkInline", "",
+     "A hyperlink whose visible text is the contained "
+     "inlines."},
+    {"LinkInline", "href",
+     "Target URL of the link."},
+
+    {"MathInline", "",
+     "An inline math span."},
+    {"MathInline", "literal",
+     "Verbatim TeX/LaTeX source for the formula."},
+
+    {"ReferenceInline", "",
+     "A cross-reference to a symbol in the corpus, produced "
+     "by `@ref`, `@p`, or implicit name lookup."},
+    {"ReferenceInline", "literal",
+     "The reference text as written in the doc comment."},
+    {"ReferenceInline", "id",
+     "Identifier of the resolved target, or empty when the "
+     "reference could not be resolved."},
+
+    {"SoftBreakInline", "",
+     "A soft line break within a paragraph (rendered as "
+     "whitespace by most generators)."},
+
+    {"StrikethroughInline", "",
+     "Inline text with strikethrough styling."},
+
+    {"StrongInline", "",
+     "Strongly emphasized inline text (typically rendered "
+     "bold)."},
+
+    {"SubscriptInline", "",
+     "Inline text rendered as subscript."},
+
+    {"SuperscriptInline", "",
+     "Inline text rendered as superscript."},
+
+    {"TextInline", "",
+     "A run of plain text within a paragraph or other "
+     "inline container."},
+    {"TextInline", "literal",
+     "Verbatim text content."},
+};
+
+} // namespace detail
+
+constexpr std::string_view
+findDomDescription(
+    std::string_view const type,
+    std::string_view const member) noexcept
+{
+    for (auto const& entry : detail::kDomDescriptions)
+    {
+        if (entry.type == type && entry.member == member)
+        {
+            return entry.text;
+        }
+    }
+    return {};
+}
+
+} // namespace mrdocs::schema
+
+#endif // MRDOCS_API_SCHEMAS_DOMDESCRIPTIONS_HPP
diff --git a/include/mrdocs/Schemas/DomSchemaWriter.hpp b/include/mrdocs/Schemas/DomSchemaWriter.hpp
new file mode 100644
index 0000000000..2d07f0a7ab
--- /dev/null
+++ b/include/mrdocs/Schemas/DomSchemaWriter.hpp
@@ -0,0 +1,564 @@
+//
+// Licensed under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+// Copyright (c) 2026 Gennaro Prota (gennaro.prota@gmail.com)
+//
+// Official repository: https://github.com/cppalliance/mrdocs
+//
+
+#ifndef MRDOCS_API_SCHEMAS_DOMSCHEMAWRITER_HPP
+#define MRDOCS_API_SCHEMAS_DOMSCHEMAWRITER_HPP
+
+#include <mrdocs/Dom/Array.hpp>
+#include <mrdocs/Dom/Object.hpp>
+#include <mrdocs/Dom/Value.hpp>
+#include <mrdocs/Metadata.hpp>
+#include <mrdocs/Schemas/DomDescriptions.hpp>
+#include <mrdocs/Support/Describe.hpp>
+#include <mrdocs/Support/EnumToString.hpp>
+#include <mrdocs/Support/MapReflectedType.hpp>
+#include <mrdocs/Support/TypeTraits.hpp>
+#include <string>
+#include <string_view>
+#include <type_traits>
+#include <vector>
+
+/** Schema writers for the MrDocs output formats.
+
+    Houses the JSON-Schema writer for the DOM (Handlebars) objects
+    and the RELAX NG Compact writer for the XML generator's output.
+    The writers are driven by reflection over described types.
+*/
+namespace mrdocs::schema {
+
+//------------------------------------------------
+// Type -> JSON Schema dispatch
+//------------------------------------------------
+
+/** Return a JSON Schema `$ref` for a described struct type.
+*/
+template <typename T>
+dom::Object refSchema()
+{
+    dom::Object schema;
+    std::string ref = "#/$defs/";
+    ref += readableTypeName<T>();
+    schema.set("$ref", ref);
+    return schema;
+}
+
+/** Return the JSON Schema for a single member type.
+
+    Mirrors the type dispatch in MapReflectedType.hpp's `mapMember()`.
+*/
+template <typename T>
+dom::Object
+memberSchema()
+{
+    using Type = std::decay_t<T>;
+    dom::Object schema;
+
+    if constexpr (std::is_same_v<Type, bool>)
+    {
+        schema.set("type", "boolean");
+    }
+    else if constexpr (std::is_same_v<Type, std::string> ||
+                       std::is_same_v<Type, dom::String>)
+    {
+        schema.set("type", "string");
+    }
+    else if constexpr (std::is_integral_v<Type>)
+    {
+        schema.set("type", "integer");
+    }
+    else if constexpr (std::is_same_v<Type, SymbolID>)
+    {
+        schema.set("type", "string");
+        schema.set("description", "Base64-encoded symbol ID");
+    }
+    else if constexpr (std::is_base_of_v<ExprInfo, Type>)
+    {
+        // ExprInfo maps to its Written string in the DOM.
+        schema.set("type", "string");
+        schema.set("description", "C++ expression as written");
+    }
+    else if constexpr (describe::has_describe_enumerators<Type>::value)
+    {
+        schema.set("type", "string");
+        dom::Array values;
+        describe::for_each(
+            describe::describe_enumerators<Type>{},
+            [&](auto const& D) {
+                values.push_back(toKebabCase(D.name));
+            });
+        schema.set("enum", std::move(values));
+    }
+    // Non-described enums with manual toString() or getOperatorName()
+    // (described enums already handled above).
+    else if constexpr (std::is_enum_v<Type>)
+    {
+        schema.set("type", "string");
+    }
+    // Non-described structs with custom ValueFrom that
+    // serialize as strings (e.g. NoexceptInfo, ExplicitInfo).
+    else if constexpr (dom::HasValueFromWithoutContext<Type>)
+    {
+        schema.set("type", "string");
+    }
+    else if constexpr (mrdocs::detail::is_optional_v<Type>)
+    {
+        // Unwrap optionals — the member is simply not in "required".
+        schema = memberSchema<typename Type::value_type>();
+    }
+    else if constexpr (mrdocs::detail::is_vector_v<Type>)
+    {
+        schema.set("type", "array");
+        schema.set("items", memberSchema<typename Type::value_type>());
+    }
+    else if constexpr (mrdocs::detail::is_polymorphic_v<Type>)
+    {
+        // Polymorphic types use a $ref to their oneOf definition.
+        schema = refSchema<typename Type::value_type>();
+    }
+    else if constexpr (describe::has_describe_members<Type>::value)
+    {
+        // Described compound types reference $defs.
+        schema = refSchema<Type>();
+    }
+    else
+    {
+        // Fallback: any JSON value.
+        schema.set("description", "unknown type");
+    }
+
+    return schema;
+}
+
+//------------------------------------------------
+// Helper: is the member always present?
+//
+// Mirrors shouldMapValue() in MapReflectedType.hpp:
+// Optional, empty string, certain "None" enums,
+// and empty ExprInfo are skipped at runtime, so
+// those fields are NOT required in the schema.
+//------------------------------------------------
+
+/** True if `M` is always serialized, i.e. never skipped by
+    `shouldMapValue()` in `MapReflectedType.hpp`.
+
+    Members of such a type must appear in the JSON Schema's
+    `required` array.
+*/
+template <typename M>
+inline constexpr bool is_always_present_v =
+    !mrdocs::detail::is_optional_v<M> &&
+    !std::is_same_v<M, std::string> &&
+    !std::is_same_v<M, ConstexprKind> &&
+    !std::is_same_v<M, ReferenceKind> &&
+    !std::is_same_v<M, StorageClassKind> &&
+    !std::is_base_of_v<ExprInfo, M>;
+
+//------------------------------------------------
+// Description injection (from DomDescriptions.hpp)
+//------------------------------------------------
+
+/** Add the type-level description for `T` to `schema`, if one exists.
+*/
+template <typename T>
+void
+applyTypeDescription(dom::Object& schema)
+{
+    constexpr std::string_view name = readableTypeName<T>();
+    if (auto const desc = findDomDescription(name); !desc.empty())
+    {
+        schema.set("description", std::string(desc));
+    }
+}
+
+/** Build the schema for a member of `Owner` with the given DOM name,
+    layering in any matching member-level description.
+*/
+template <typename Owner, typename M>
+dom::Object
+buildMemberSchema(std::string_view const domName)
+{
+    dom::Object schema = memberSchema<M>();
+    constexpr std::string_view ownerName = readableTypeName<Owner>();
+    if (auto const desc = findDomDescription(ownerName, domName);
+        !desc.empty())
+    {
+        schema.set("description", std::string(desc));
+    }
+    return schema;
+}
+
+//------------------------------------------------
+// Struct -> JSON Schema object
+//------------------------------------------------
+
+/** Add properties from base classes.
+*/
+template <typename T>
+void
+addBaseProperties(dom::Object& properties, dom::Array& required)
+{
+    if constexpr (describe::has_describe_bases<T>::value)
+    {
+        describe::for_each(
+            describe::describe_bases<T>{},
+            [&](auto const& descriptor)
+            {
+                using BaseType = typename std::decay_t<decltype(descriptor)>::type;
+                addBaseProperties<BaseType>(properties, required);
+
+                // Add the base's own members.
+                if constexpr (describe::has_describe_members<BaseType>::value)
+                {
+                    describe::for_each(
+                        describe::describe_members<BaseType>{},
+                        [&](auto const& D) {
+                            using M = std::decay_t<decltype(
+                                std::declval<BaseType>().*D.pointer)>;
+                            std::string domName =
+                                mrdocs::detail::normalizeMemberName(D.name);
+                            properties.set(
+                                domName,
+                                buildMemberSchema<BaseType, M>(domName));
+
+                            if constexpr (is_always_present_v<M>)
+                            {
+                                required.push_back(domName);
+                            }
+                        });
+                }
+            });
+    }
+}
+
+/** Build a JSON Schema "object" for a described type T.
+
+    Includes properties from all base classes (recursively)
+    plus T's own members.
+*/
+template <typename T>
+dom::Object
+objectSchema()
+{
+    dom::Object schema;
+    schema.set("type", "object");
+    applyTypeDescription<T>(schema);
+
+    dom::Object properties;
+    dom::Array required;
+
+    addBaseProperties<T>(properties, required);
+
+    // Add T's own members.
+    if constexpr (describe::has_describe_members<T>::value)
+    {
+        describe::for_each(
+            describe::describe_members<T>{},
+            [&](auto const& D)
+            {
+                using M = std::decay_t<decltype(
+                    std::declval<T>().*D.pointer)>;
+                std::string domName =
+                    mrdocs::detail::normalizeMemberName(D.name);
+                properties.set(
+                    domName, buildMemberSchema<T, M>(domName));
+
+                if constexpr (is_always_present_v<M>)
+                {
+                    required.push_back(domName);
+                }
+            });
+    }
+
+    // Custom tag_invoke extensions for Symbol (see SymbolBase.hpp).
+    // These fields are added by the Symbol tag_invoke overload
+    // beyond what reflection provides. Descriptions live on the
+    // base `Symbol` entry in DomDescriptions.hpp.
+    if constexpr (std::is_base_of_v<Symbol, T>)
+    {
+        auto withDesc =
+            [](dom::Object schema, std::string_view const member)
+            {
+                if (auto const desc =
+                        findDomDescription("Symbol", member);
+                    !desc.empty())
+                {
+                    schema.set("description", std::string(desc));
+                }
+                return schema;
+            };
+
+        dom::Object classSchema;
+        classSchema.set("type", "string");
+        classSchema.set("const", "symbol");
+        properties.set("class", withDesc(std::move(classSchema), "class"));
+
+        dom::Object boolSchema;
+        boolSchema.set("type", "boolean");
+        properties.set("isRegular",
+            withDesc(boolSchema, "isRegular"));
+        properties.set("isSeeBelow",
+            withDesc(boolSchema, "isSeeBelow"));
+        properties.set("isImplementationDefined",
+            withDesc(boolSchema, "isImplementationDefined"));
+        properties.set("isDependency",
+            withDesc(boolSchema, "isDependency"));
+
+        required.push_back("class");
+        required.push_back("isRegular");
+        required.push_back("isSeeBelow");
+        required.push_back("isImplementationDefined");
+        required.push_back("isDependency");
+    }
+
+    // $meta object (added by addMetaObject in MapReflectedType.hpp).
+    {
+        dom::Object metaSchema;
+        metaSchema.set("type", "object");
+        dom::Object metaProps;
+        dom::Object typeStr;
+        typeStr.set("type", "string");
+        metaProps.set("type", std::move(typeStr));
+        dom::Object basesArr;
+        basesArr.set("type", "array");
+        dom::Object strItems;
+        strItems.set("type", "string");
+        basesArr.set("items", std::move(strItems));
+        metaProps.set("bases", std::move(basesArr));
+        metaSchema.set("properties", std::move(metaProps));
+        properties.set("$meta", std::move(metaSchema));
+    }
+
+    if (!properties.empty())
+    {
+        schema.set("properties", std::move(properties));
+    }
+    if (!required.empty())
+    {
+        schema.set("required", std::move(required));
+    }
+
+    return schema;
+}
+
+//------------------------------------------------
+// Polymorphic oneOf schemas
+//------------------------------------------------
+
+/** Wrap a list of `$ref`s into a `oneOf` schema for `Base` and
+    layer in any matching type-level description.
+*/
+template <typename Base>
+dom::Object
+makePolymorphicSchema(dom::Array oneOf)
+{
+    dom::Object schema;
+    schema.set("oneOf", std::move(oneOf));
+    applyTypeDescription<Base>(schema);
+    return schema;
+}
+
+/** Return a JSON Schema `oneOf` union for a polymorphic base type.
+
+    A full specialization is provided for each polymorphic family
+    (`Type`, `Name`, `TParam`, `TArg`, `doc::Block`, `doc::Inline`);
+    it enumerates the concrete subclasses via the family's `.inc`
+    list and emits a `$ref` per subclass.
+
+    @tparam Base The polymorphic base class.
+    @return A schema object whose `oneOf` array references every
+    concrete subclass of `Base`.
+*/
+template <typename Base>
+dom::Object polymorphicSchema();
+
+/** Specialization for the `Type` family (NamedType, PointerType, ...).
+
+    @return `{ "oneOf": [ $ref for each TypeKind ] }`.
+*/
+template <>
+inline dom::Object
+polymorphicSchema<Type>()
+{
+    dom::Array oneOf;
+    #define INFO(X) oneOf.push_back(refSchema<X##Type>());
+    #include <mrdocs/Metadata/Type/TypeNodes.inc>
+    return makePolymorphicSchema<Type>(std::move(oneOf));
+}
+
+/** Specialization for the `Name` family (IdentifierName, SpecializationName).
+
+    @return `{ "oneOf": [ $ref for each NameKind ] }`.
+*/
+template <>
+inline dom::Object
+polymorphicSchema<Name>()
+{
+    dom::Array oneOf;
+    #define INFO(X) oneOf.push_back(refSchema<X##Name>());
+    #include <mrdocs/Metadata/Name/NameNodes.inc>
+    return makePolymorphicSchema<Name>(std::move(oneOf));
+}
+
+/** Specialization for the `TParam` family (TypeTParam, ConstantTParam,
+    TemplateTParam).
+
+    @return `{ "oneOf": [ $ref for each TParamKind ] }`.
+*/
+template <>
+inline dom::Object
+polymorphicSchema<TParam>()
+{
+    dom::Array oneOf;
+    #define INFO(X) oneOf.push_back(refSchema<X##TParam>());
+    #include <mrdocs/Metadata/TParam/TParamInfoNodes.inc>
+    return makePolymorphicSchema<TParam>(std::move(oneOf));
+}
+
+/** Specialization for the `TArg` family (TypeTArg, ConstantTArg,
+    TemplateTArg).
+
+    @return `{ "oneOf": [ $ref for each TArgKind ] }`.
+*/
+template <>
+inline dom::Object
+polymorphicSchema<TArg>()
+{
+    dom::Array oneOf;
+    #define INFO(X) oneOf.push_back(refSchema<X##TArg>());
+    #include <mrdocs/Metadata/TArg/TArgInfoNodes.inc>
+    return makePolymorphicSchema<TArg>(std::move(oneOf));
+}
+
+/** Specialization for the `doc::Block` family (paragraphs, lists,
+    headings, and command blocks like brief/param/returns).
+
+    @return `{ "oneOf": [ $ref for each BlockKind ] }`.
+*/
+template <>
+inline dom::Object
+polymorphicSchema<doc::Block>()
+{
+    dom::Array oneOf;
+    #define INFO(X) oneOf.push_back(refSchema<doc::X##Block>());
+    #include <mrdocs/Metadata/DocComment/Block/BlockNodes.inc>
+    return makePolymorphicSchema<doc::Block>(std::move(oneOf));
+}
+
+/** Specialization for the `doc::Inline` family (text, emphasis, code,
+    references, etc.).
+
+    @return `{ "oneOf": [ $ref for each InlineKind ] }`.
+*/
+template <>
+inline dom::Object
+polymorphicSchema<doc::Inline>()
+{
+    dom::Array oneOf;
+    #define INFO(X) oneOf.push_back(refSchema<doc::X##Inline>());
+    #include <mrdocs/Metadata/DocComment/Inline/InlineNodes.inc>
+    return makePolymorphicSchema<doc::Inline>(std::move(oneOf));
+}
+
+//------------------------------------------------
+// Register all type definitions
+//------------------------------------------------
+
+/** Register a single described type in $defs.
+*/
+template <typename T>
+void
+registerDef(dom::Object& defs)
+{
+    constexpr std::string_view name = readableTypeName<T>();
+    defs.set(std::string(name), objectSchema<T>());
+}
+
+/** Register all described types in $defs.
+*/
+inline void
+registerAllDefs(dom::Object& defs)
+{
+    // Symbol types
+    #define INFO(X) registerDef<X##Symbol>(defs);
+    #include <mrdocs/Metadata/Symbol/SymbolNodes.inc>
+
+    // Type variants
+    #define INFO(X) registerDef<X##Type>(defs);
+    #include <mrdocs/Metadata/Type/TypeNodes.inc>
+
+    // Name variants
+    #define INFO(X) registerDef<X##Name>(defs);
+    #include <mrdocs/Metadata/Name/NameNodes.inc>
+
+    // TParam variants
+    #define INFO(X) registerDef<X##TParam>(defs);
+    #include <mrdocs/Metadata/TParam/TParamInfoNodes.inc>
+
+    // TArg variants
+    #define INFO(X) registerDef<X##TArg>(defs);
+    #include <mrdocs/Metadata/TArg/TArgInfoNodes.inc>
+
+    // Doc block variants
+    #define INFO(X) registerDef<doc::X##Block>(defs);
+    #include <mrdocs/Metadata/DocComment/Block/BlockNodes.inc>
+
+    // Doc inline variants
+    #define INFO(X) registerDef<doc::X##Inline>(defs);
+    #include <mrdocs/Metadata/DocComment/Inline/InlineNodes.inc>
+
+    // Polymorphic union types
+    defs.set("Type", polymorphicSchema<Type>());
+    defs.set("Name", polymorphicSchema<Name>());
+    defs.set("TParam", polymorphicSchema<TParam>());
+    defs.set("TArg", polymorphicSchema<TArg>());
+    defs.set("Block", polymorphicSchema<doc::Block>());
+    defs.set("Inline", polymorphicSchema<doc::Inline>());
+
+    // Supporting types
+    registerDef<Location>(defs);
+    registerDef<Param>(defs);
+    registerDef<TemplateInfo>(defs);
+    registerDef<SourceInfo>(defs);
+    registerDef<BaseInfo>(defs);
+    registerDef<FriendInfo>(defs);
+}
+
+//------------------------------------------------
+// Top-level schema
+//------------------------------------------------
+
+/** Build the complete DOM JSON Schema document.
+*/
+inline dom::Value
+buildDomSchema()
+{
+    dom::Object schema;
+    schema.set("$schema", "https://json-schema.org/draft/2020-12/schema");
+    schema.set("title", "MrDocs DOM Schema");
+    schema.set("description",
+        "Schema for the DOM objects available to Handlebars "
+        "templates in the MrDocs documentation generator.");
+
+    // Symbol is the entry point — a oneOf over all symbol kinds.
+    dom::Array symbolOneOf;
+    #define INFO(X) symbolOneOf.push_back(refSchema<X##Symbol>());
+    #include <mrdocs/Metadata/Symbol/SymbolNodes.inc>
+    schema.set("oneOf", std::move(symbolOneOf));
+
+    dom::Object defs;
+    registerAllDefs(defs);
+    schema.set("$defs", std::move(defs));
+
+    return schema;
+}
+
+} // mrdocs::schema
+
+#endif // MRDOCS_API_SCHEMAS_DOMSCHEMAWRITER_HPP
diff --git a/include/mrdocs/Schemas/JsonEmitter.hpp b/include/mrdocs/Schemas/JsonEmitter.hpp
new file mode 100644
index 0000000000..3202c8b1b8
--- /dev/null
+++ b/include/mrdocs/Schemas/JsonEmitter.hpp
@@ -0,0 +1,142 @@
+//
+// Licensed under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+// Copyright (c) 2026 Gennaro Prota (gennaro.prota@gmail.com)
+//
+// Official repository: https://github.com/cppalliance/mrdocs
+//
+
+#ifndef MRDOCS_API_SCHEMAS_JSONEMITTER_HPP
+#define MRDOCS_API_SCHEMAS_JSONEMITTER_HPP
+
+#include <mrdocs/Dom/Value.hpp>
+#include <cstddef>
+#include <string>
+#include <string_view>
+
+namespace mrdocs::schema {
+
+/** Serialize a dom::Value tree to formatted JSON.
+
+    Handles null, boolean, integer, string, array, and object.
+
+    @param v The value to serialize.
+    @param indent Current indentation level in units of two spaces.
+    Callers should pass `0` for the top-level call; recursive calls
+    increment it for nested arrays and objects.
+    @return The JSON text. Arrays and objects are pretty-printed
+    with two-space indentation; scalars are emitted without
+    surrounding whitespace.
+*/
+inline
+std::string
+toJson(dom::Value const& v, int indent = 0)
+{
+    std::string result;
+    auto const pad = [&](int level) -> std::string {
+        return std::string(level * 2, ' ');
+    };
+
+    switch (v.kind())
+    {
+    case dom::Kind::Undefined:
+    case dom::Kind::Null:
+        result = "null";
+        break;
+
+    case dom::Kind::Boolean:
+        result = v.getBool() ? "true" : "false";
+        break;
+
+    case dom::Kind::Integer:
+        result = std::to_string(v.getInteger());
+        break;
+
+    case dom::Kind::String:
+    case dom::Kind::SafeString:
+    {
+        // Escape special characters.
+        result = "\"";
+        for (char c : v.getString().get())
+        {
+            switch (c)
+            {
+            case '"':  result += "\\\""; break;
+            case '\\': result += "\\\\"; break;
+            case '\n': result += "\\n";  break;
+            case '\r': result += "\\r";  break;
+            case '\t': result += "\\t";  break;
+            default:   result += c;      break;
+            }
+        }
+        result += '"';
+        break;
+    }
+
+    case dom::Kind::Array:
+    {
+        auto const& arr = v.getArray();
+        if (arr.empty())
+        {
+            result = "[]";
+            break;
+        }
+        result = "[\n";
+        for (std::size_t i = 0; i < arr.size(); ++i)
+        {
+            result += pad(indent + 1);
+            result += toJson(arr.at(i), indent + 1);
+            if (i + 1 < arr.size())
+            {
+                result += ',';
+            }
+            result += '\n';
+        }
+        result += pad(indent);
+        result += ']';
+        break;
+    }
+
+    case dom::Kind::Object:
+    {
+        auto const& obj = v.getObject();
+        if (obj.empty())
+        {
+            result = "{}";
+            break;
+        }
+        result = "{\n";
+        bool first = true;
+        obj.visit([&](dom::String key, dom::Value const& val) -> bool
+        {
+            if (!first)
+            {
+                result += ",\n";
+            }
+            first = false;
+            result += pad(indent + 1);
+            result += '"';
+            result += std::string_view(key);
+            result += "\": ";
+            result += toJson(val, indent + 1);
+            return true;
+        });
+        result += '\n';
+        result += pad(indent);
+        result += '}';
+        break;
+    }
+
+    default:
+        result = "null";
+        break;
+    }
+
+    return result;
+}
+
+} // mrdocs::schema
+
+#endif // MRDOCS_API_SCHEMAS_JSONEMITTER_HPP
diff --git a/include/mrdocs/Schemas/RncSchemaWriter.hpp b/include/mrdocs/Schemas/RncSchemaWriter.hpp
new file mode 100644
index 0000000000..6884870ec7
--- /dev/null
+++ b/include/mrdocs/Schemas/RncSchemaWriter.hpp
@@ -0,0 +1,837 @@
+//
+// Licensed under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+// Copyright (c) 2026 Gennaro Prota (gennaro.prota@gmail.com)
+//
+// Official repository: https://github.com/cppalliance/mrdocs
+//
+
+#ifndef MRDOCS_API_SCHEMAS_RNCSCHEMAWRITER_HPP
+#define MRDOCS_API_SCHEMAS_RNCSCHEMAWRITER_HPP
+
+#include <mrdocs/Metadata.hpp>
+#include <mrdocs/Support/Describe.hpp>
+#include <mrdocs/Support/EnumToString.hpp>
+#include <mrdocs/Support/MapReflectedType.hpp>
+#include <mrdocs/Support/String.hpp>
+#include <mrdocs/Support/TypeTraits.hpp>
+#include <string>
+#include <string_view>
+#include <type_traits>
+#include <vector>
+
+namespace mrdocs::schema {
+
+// ---------------------------------------------------------------
+// Helpers
+// ---------------------------------------------------------------
+
+/** Implementation details for the RNC schema writer.
+*/
+namespace rnc_detail {
+
+/** Remove `suffix` from the end of `s`, if present.
+
+    @param s The input string.
+    @param suffix The suffix to strip.
+    @return `s` with the trailing `suffix` removed, or an
+    unchanged copy of `s` if the suffix is not present.
+*/
+inline std::string
+removeSuffix(std::string_view s, std::string_view suffix)
+{
+    // Strict greater-than guards against emptying the result when
+    // a base struct (e.g. the bare `Type`) shares its name with a
+    // listed suffix.
+    return s.size() > suffix.size() &&
+           s.substr(s.size() - suffix.size()) == suffix
+        ? std::string(s.substr(0, s.size() - suffix.size()))
+        : std::string(s);
+}
+
+/** XML element tag name for a described type (mirrors XMLWriter).
+
+    @tparam T A described type.
+    @return The kebab-case tag name produced by stripping well-known
+    suffixes (Symbol, Info, TypeInfo, Type, TParam, TArg, Block,
+    Inline) from the type's unqualified name. TParam-derived types
+    are suffixed with "-tparam" and TArg-derived types with "-targ"
+    to mirror XMLWriter's polymorphic dispatch (e.g. TypeTParam
+    becomes "type-tparam"). The "Name" suffix is intentionally not
+    stripped: the base struct `Name` itself stays "name" and concrete
+    name types like `IdentifierName` stay "identifier-name", matching
+    XMLWriter's writePolymorphic which uses the base/concrete type
+    name directly.
+*/
+template <typename T>
+std::string tagName()
+{
+    std::string raw(readableTypeName<T>());
+    // Detect TParam/TArg derivation by suffix on the raw type name
+    // (avoids needing TParam/TArg base types in template-instantiation
+    // contexts where they may be incomplete).
+    bool const isTParamSub =
+        raw.size() > 6 && raw.substr(raw.size() - 6) == "TParam";
+    bool const isTArgSub =
+        raw.size() > 4 && raw.substr(raw.size() - 4) == "TArg";
+
+    std::string name = raw;
+    for (std::string_view const suffix :
+         {"Symbol", "Info", "TypeInfo", "Type",
+          "TParam", "TArg", "Block", "Inline"})
+    {
+        name = removeSuffix(name, suffix);
+    }
+    std::string out = toKebabCase(name);
+    if (isTParamSub)
+    {
+        out += "-tparam";
+    }
+    else if (isTArgSub)
+    {
+        out += "-targ";
+    }
+    return out;
+}
+
+/** RNC pattern name (PascalCase, used for definitions).
+
+    @tparam T A described type.
+    @return The unqualified type name of `T`, used as the RNC
+    pattern identifier on the left-hand side of a grammar rule.
+*/
+template <typename T>
+std::string patternName()
+{
+    return std::string(readableTypeName<T>());
+}
+
+// ---------------------------------------------------------------
+// RNC content type for a C++ member type
+// ---------------------------------------------------------------
+
+/** RNC pattern reference for the content of a member.
+
+    @tparam T The C++ member type.
+    @return The RNC expression describing the allowed content:
+    a primitive (`text`, `Bool`, `SymbolID`) for scalar/string-like
+    types, the pattern name of a described struct, or the
+    appropriate union pattern (`AnyType`, `AnyTParam`, `AnyTArg`,
+    `BlockNode`, `InlineNode`, or `Name`) for polymorphic members.
+    `Optional<T>` and `vector<T>` unwrap to their element type.
+*/
+template <typename T>
+std::string rncMember()
+{
+    using Type = std::decay_t<T>;
+
+    if constexpr (std::is_same_v<Type, bool>)
+    {
+        return "Bool";
+    }
+    else if constexpr (std::is_same_v<Type, std::string> ||
+                       std::is_same_v<Type, dom::String>)
+    {
+        return "text";
+    }
+    else if constexpr (std::is_integral_v<Type>)
+    {
+        return "text";
+    }
+    else if constexpr (std::is_same_v<Type, SymbolID>)
+    {
+        return "SymbolID";
+    }
+    else if constexpr (std::is_base_of_v<ExprInfo, Type>)
+    {
+        return "text";
+    }
+    else if constexpr (describe::has_describe_enumerators<Type>::value)
+    {
+        return patternName<Type>();
+    }
+    else if constexpr (mrdocs::detail::is_optional_v<Type>)
+    {
+        return rncMember<typename Type::value_type>();
+    }
+    else if constexpr (mrdocs::detail::is_vector_v<Type>)
+    {
+        return rncMember<typename Type::value_type>();
+    }
+    else if constexpr (mrdocs::detail::is_polymorphic_v<Type>)
+    {
+        using V = typename Type::value_type;
+        if constexpr (std::is_same_v<V, mrdocs::Type>)
+        {
+            return "AnyType";
+        }
+        else if constexpr (std::is_same_v<V, mrdocs::Name>)
+        {
+            // XMLWriter's writePolymorphic for Polymorphic<Name>
+            // falls into the generic case where T is deduced to the
+            // base `Name` (Polymorphic::operator* returns a base
+            // reference), so the element opened is always <name>
+            // with the base's described members.
+            return "Name";
+        }
+        else if constexpr (std::is_same_v<V, mrdocs::TParam>)
+        {
+            return "AnyTParam";
+        }
+        else if constexpr (std::is_same_v<V, mrdocs::TArg>)
+        {
+            return "AnyTArg";
+        }
+        else if constexpr (std::is_same_v<V, doc::Block>)
+        {
+            return "BlockNode";
+        }
+        else if constexpr (std::is_same_v<V, doc::Inline>)
+        {
+            return "InlineNode";
+        }
+        else
+        {
+            return "text";
+        }
+    }
+    else if constexpr (describe::has_describe_members<Type>::value)
+    {
+        return patternName<Type>();
+    }
+    else
+    {
+        return "text";
+    }
+}
+
+/** RNC quantifier for a member type.
+
+    @tparam T The C++ member type.
+    @return `"*"` for `std::vector<T>` (zero or more occurrences),
+    `"?"` for everything else (optional, since XMLWriter skips
+    empty values).
+*/
+template <typename T>
+std::string rncQuantifier()
+{
+    using Type = std::decay_t<T>;
+
+    if constexpr (mrdocs::detail::is_vector_v<Type>)
+    {
+        return "*";
+    }
+    else
+    {
+        // Almost everything in the XML output is optional
+        // (XMLWriter's writeElement skips empty values).
+        return "?";
+    }
+}
+
+/** True if this member type is skipped by XMLWriter.
+
+    Non-described enums and non-described structs without
+    explicit handling in XMLWriter::write() (NoexceptInfo,
+    ExplicitInfo) fall through without producing output.
+*/
+template <typename M>
+inline constexpr bool rnc_is_omitted_v =
+    (std::is_enum_v<M> && !describe::has_describe_enumerators<M>::value) ||
+    std::is_same_v<M, NoexceptInfo> ||
+    std::is_same_v<M, ExplicitInfo>;
+
+/** True if a described struct T (XMLWriter uses tagName<T> as the
+    element name, dropping the member name). */
+template <typename M>
+inline constexpr bool rnc_is_compound_v =
+    describe::has_describe_members<std::decay_t<M>>::value &&
+    !describe::has_describe_enumerators<std::decay_t<M>>::value &&
+    !mrdocs::detail::is_optional_v<std::decay_t<M>> &&
+    !mrdocs::detail::is_vector_v<std::decay_t<M>> &&
+    !mrdocs::detail::is_polymorphic_v<std::decay_t<M>>;
+
+/** Unwrap Optional<T> and vector<T> to T; otherwise leaves T unchanged.
+    Used to check whether the "inner" type is a compound described struct.
+*/
+template <typename M>
+struct unwrap_type {
+    /// The unwrapped inner type (equal to `std::decay_t<M>` by default).
+    using type = std::decay_t<M>;
+};
+
+/** Partial specialization that unwraps `Optional<T>` to `T`. */
+template <typename T>
+struct unwrap_type<Optional<T>> {
+    /// The unwrapped inner type.
+    using type = std::decay_t<T>;
+};
+
+/** Partial specialization that unwraps `std::vector<T, A>` to `T`. */
+template <typename T, typename A>
+struct unwrap_type<std::vector<T, A>> {
+    /// The unwrapped element type.
+    using type = std::decay_t<T>;
+};
+
+/** Alias for `unwrap_type<M>::type`.
+
+    @tparam M The C++ member type to unwrap.
+*/
+template <typename M>
+using unwrap_type_t = typename unwrap_type<std::decay_t<M>>::type;
+
+/** True if the member wraps (via Optional/vector) a described struct. */
+template <typename M>
+inline constexpr bool rnc_is_wrapped_compound_v =
+    (mrdocs::detail::is_optional_v<std::decay_t<M>> ||
+     mrdocs::detail::is_vector_v<std::decay_t<M>>) &&
+    rnc_is_compound_v<unwrap_type_t<M>>;
+
+/** True if the member is a Polymorphic<T> (uses AnyXxx pattern). */
+template <typename M>
+inline constexpr bool rnc_is_polymorphic_v =
+    mrdocs::detail::is_polymorphic_v<std::decay_t<M>>;
+
+/** True if the member is a vector of Polymorphic<T>. */
+template <typename M>
+struct is_vector_of_polymorphic : std::false_type {};
+
+/** Specialization recognizing `std::vector<Polymorphic<T>, A>`. */
+template <typename T, typename A>
+struct is_vector_of_polymorphic<std::vector<Polymorphic<T>, A>>
+    : std::true_type {};
+
+/** Variable template alias for @ref is_vector_of_polymorphic. */
+template <typename M>
+inline constexpr bool rnc_is_vector_of_polymorphic_v =
+    is_vector_of_polymorphic<std::decay_t<M>>::value;
+
+/** True if the member is an Optional<Polymorphic<T>>.
+
+    XMLWriter's writeElement strips the outer Optional and dispatches
+    on the polymorphic value, so the member-name wrapper is not used.
+*/
+template <typename M>
+struct is_optional_of_polymorphic : std::false_type {};
+
+/** Specialization recognizing `Optional<Polymorphic<T>>`. */
+template <typename T>
+struct is_optional_of_polymorphic<Optional<Polymorphic<T>>>
+    : std::true_type {};
+
+/** Variable template alias for @ref is_optional_of_polymorphic. */
+template <typename M>
+inline constexpr bool rnc_is_optional_of_polymorphic_v =
+    is_optional_of_polymorphic<std::decay_t<M>>::value;
+
+} // namespace rnc_detail
+
+// ---------------------------------------------------------------
+// RNC emitter
+// ---------------------------------------------------------------
+
+/** Streaming builder for the MrDocs RELAX NG Compact (RNC) schema.
+
+    Accumulates pattern definitions and finally returns the full
+    grammar via @ref build. Pattern definitions are produced by
+    reflecting over described types (enums, structs, and the
+    polymorphic node families).
+*/
+class RncEmitter
+{
+    std::string out_;
+    int indent_ = 0;
+
+    void line(std::string_view s = {})
+    {
+        if (!s.empty())
+        {
+            out_ += std::string(indent_ * 4, ' ');
+            out_ += s;
+        }
+        out_ += '\n';
+    }
+
+public:
+    /** Emit RNC for a described enum. */
+    template <typename E>
+    void emitEnum()
+    {
+        std::string def = rnc_detail::patternName<E>();
+        def += " = ";
+        bool first = true;
+        describe::for_each(
+            describe::describe_enumerators<E>{},
+            [&](auto const& D) {
+                if (!first)
+                {
+                    def += " | ";
+                }
+                first = false;
+                def += '"';
+                def += toKebabCase(D.name);
+                def += '"';
+            });
+        line(def);
+    }
+
+    /** Emit RNC for the members of a described type (bases + own). */
+    template <typename T>
+    void emitMembers()
+    {
+        // Base class members first.
+        if constexpr (describe::has_describe_bases<T>::value)
+        {
+            describe::for_each(
+                describe::describe_bases<T>{},
+                [&](auto const& descriptor)
+                {
+                    using BaseType = typename std::decay_t<
+                        decltype(descriptor)>::type;
+                    emitMembers<BaseType>();
+                });
+        }
+
+        // Own members.
+        if constexpr (describe::has_describe_members<T>::value)
+        {
+            describe::for_each(
+                describe::describe_members<T>{},
+                [&](auto const& D)
+                {
+                    using M = std::decay_t<decltype(
+                        std::declval<T>().*D.pointer)>;
+
+                    // Skip types that XMLWriter silently omits.
+                    if constexpr (rnc_detail::rnc_is_omitted_v<M>)
+                    {
+                        return;
+                    }
+                    // Polymorphic members: use AnyXxx pattern directly.
+                    else if constexpr (rnc_detail::rnc_is_polymorphic_v<M>)
+                    {
+                        std::string l = rnc_detail::rncMember<M>();
+                        l += rnc_detail::rncQuantifier<M>();
+                        line(l + ",");
+                    }
+                    // Vectors of polymorphic: AnyXxx*.
+                    else if constexpr (rnc_detail::rnc_is_vector_of_polymorphic_v<M>)
+                    {
+                        using Inner = typename std::decay_t<M>::value_type;
+                        std::string l = rnc_detail::rncMember<Inner>();
+                        l += "*,";
+                        line(l);
+                    }
+                    // Optional<Polymorphic<X>>: AnyXxx? — XMLWriter
+                    // unwraps both layers and dispatches to the
+                    // polymorphic kind, so no member-name wrapper.
+                    else if constexpr (rnc_detail::rnc_is_optional_of_polymorphic_v<M>)
+                    {
+                        using Inner = typename std::decay_t<M>::value_type;
+                        std::string l = rnc_detail::rncMember<Inner>();
+                        l += "?,";
+                        line(l);
+                    }
+                    // Described structs (bare or wrapped in Optional/vector):
+                    // XMLWriter uses the type's tag name, so we reference
+                    // the pattern directly without an element wrapper.
+                    else if constexpr (rnc_detail::rnc_is_compound_v<M> ||
+                                       rnc_detail::rnc_is_wrapped_compound_v<M>)
+                    {
+                        using Inner = rnc_detail::unwrap_type_t<M>;
+                        std::string l = rnc_detail::patternName<Inner>();
+                        l += rnc_detail::rncQuantifier<M>();
+                        l += ',';
+                        line(l);
+                    }
+                    // Primitive/enum members: element <name> { type }?.
+                    else
+                    {
+                        std::string l = "element ";
+                        l += toKebabCase(D.name);
+                        l += " { ";
+                        l += rnc_detail::rncMember<M>();
+                        l += " }";
+                        l += rnc_detail::rncQuantifier<M>();
+                        l += ',';
+                        line(l);
+                    }
+                });
+        }
+    }
+
+    /** Emit a group pattern for a described type (no element wrapper).
+
+        Used for abstract base types like `Name` whose members are
+        embedded directly in a containing element.
+    */
+    template <typename T>
+    void emitGroupDef()
+    {
+        std::string pattern = rnc_detail::patternName<T>();
+        line(pattern + " =");
+        ++indent_;
+        line("(");
+        ++indent_;
+        emitMembers<T>();
+        auto pos = out_.rfind(',');
+        if (pos != std::string::npos && pos > out_.size() - 20)
+        {
+            out_.erase(pos, 1);
+        }
+        --indent_;
+        line(")");
+        --indent_;
+        line();
+    }
+
+    /** Emit a full element definition for a described type. */
+    template <typename T>
+    void emitElementDef()
+    {
+        std::string tag = rnc_detail::tagName<T>();
+        std::string pattern = rnc_detail::patternName<T>();
+        line(pattern + " =");
+        ++indent_;
+        line("element " + tag);
+        line("{");
+        ++indent_;
+        emitMembers<T>();
+        // Remove trailing comma from last member.
+        auto pos = out_.rfind(',');
+        if (pos != std::string::npos && pos > out_.size() - 20)
+        {
+            out_.erase(pos, 1);
+        }
+        --indent_;
+        line("}");
+        --indent_;
+        line();
+    }
+
+    /** Build the complete RNC schema.
+
+        @return The full grammar text, ready to be written to
+        `mrdocs.rnc`.
+    */
+    std::string build()
+    {
+        // -------------------------------------------------------
+        // Header
+        // -------------------------------------------------------
+        line("#");
+        line("# Auto-generated by mrdocs --schemas.");
+        line("# Do not edit manually.");
+        line("#");
+        line("# https://relaxng.org/compact-tutorial-20030326.html");
+        line("#");
+        line();
+        line("namespace xsi= \"http://www.w3.org/2001/XMLSchema-instance\"");
+        line();
+        line("grammar");
+        line("{");
+
+        indent_ = 1;
+
+        // -------------------------------------------------------
+        // Root
+        // -------------------------------------------------------
+        line("start = Mrdocs | Tagfile");
+        line();
+        line("Mrdocs =");
+        line("    element mrdocs");
+        line("    {");
+        line("        attribute xsi:noNamespaceSchemaLocation { text }?,");
+        line("        AnySymbol*");
+        line("    }");
+        line();
+        line("Tagfile =");
+        line("    element tagfile");
+        line("    {");
+        line("        TagCompound+");
+        line("    }");
+        line();
+        line("TagCompound =");
+        line("    element compound");
+        line("    {");
+        line("        attribute kind { \"namespace\" | \"class\" },");
+        line("        element name { text },");
+        line("        element filename { text },");
+        line("        (TagClass | TagMember)*");
+        line("    }");
+        line();
+        line("TagClass =");
+        line("    element class");
+        line("    {");
+        line("        attribute kind { \"class\" },");
+        line("        text");
+        line("    }");
+        line();
+        line("TagMember =");
+        line("    element member");
+        line("    {");
+        line("        attribute kind { \"function\" },");
+        line("        element type { text },");
+        line("        element name { text },");
+        line("        element anchorfile { text },");
+        line("        element anchor { text },");
+        line("        element arglist { text }");
+        line("    }");
+        line();
+
+        // -------------------------------------------------------
+        // Common types
+        // -------------------------------------------------------
+        line("#---------------------------------------------");
+        line("# Common types");
+        line("#---------------------------------------------");
+        line();
+        line("SymbolID = text   # Base64-encoded");
+        line();
+        line("Bool = \"1\"");
+        line();
+
+        // -------------------------------------------------------
+        // Described enums
+        // -------------------------------------------------------
+        line("#---------------------------------------------");
+        line("# Enums");
+        line("#---------------------------------------------");
+        line();
+        emitEnum<ExtractionMode>();
+        emitEnum<FunctionClass>();
+        emitEnum<RecordKeyKind>();
+        emitEnum<UsingClass>();
+        emitEnum<AccessKind>();
+        emitEnum<ConstexprKind>();
+        emitEnum<StorageClassKind>();
+        emitEnum<SymbolKind>();
+        emitEnum<NameKind>();
+        emitEnum<TArgKind>();
+        emitEnum<TParamKind>();
+        emitEnum<TParamKeyKind>();
+        emitEnum<doc::AdmonitionKind>();
+        emitEnum<doc::ParamDirection>();
+        emitEnum<ListKind>();
+        emitEnum<TableAlignmentKind>();
+        emitEnum<doc::BlockKind>();
+        emitEnum<doc::InlineKind>();
+        line();
+
+        // -------------------------------------------------------
+        // Types (polymorphic)
+        // -------------------------------------------------------
+        line("#---------------------------------------------");
+        line("# Types (polymorphic)");
+        line("#---------------------------------------------");
+        line();
+        #define INFO(X) emitElementDef<X##Type>();
+        #include <mrdocs/Metadata/Type/TypeNodes.inc>
+
+        line("AnyType =");
+        {
+            std::string choice = "    ";
+            bool first = true;
+            #define INFO(X) \
+                if (!first) { choice += " |\n    "; } \
+                first = false; \
+                choice += rnc_detail::patternName<X##Type>();
+            #include <mrdocs/Metadata/Type/TypeNodes.inc>
+            line(choice);
+        }
+        line();
+
+        // -------------------------------------------------------
+        // Names
+        // -------------------------------------------------------
+        line("#---------------------------------------------");
+        line("# Names");
+        line("#---------------------------------------------");
+        line();
+        #define INFO(X) emitElementDef<X##Name>();
+        #include <mrdocs/Metadata/Name/NameNodes.inc>
+
+        line("AnyName =");
+        {
+            std::string choice = "    ";
+            bool first = true;
+            #define INFO(X) \
+                if (!first) { choice += " |\n    "; } \
+                first = false; \
+                choice += rnc_detail::patternName<X##Name>();
+            #include <mrdocs/Metadata/Name/NameNodes.inc>
+            line(choice);
+        }
+        line();
+
+        // -------------------------------------------------------
+        // Template parameters
+        // -------------------------------------------------------
+        line("#---------------------------------------------");
+        line("# Template parameters (polymorphic)");
+        line("#---------------------------------------------");
+        line();
+        #define INFO(X) emitElementDef<X##TParam>();
+        #include <mrdocs/Metadata/TParam/TParamInfoNodes.inc>
+
+        line("AnyTParam = ");
+        {
+            std::string choice = "    ";
+            bool first = true;
+            #define INFO(X) \
+                if (!first) { choice += " | "; } \
+                first = false; \
+                choice += rnc_detail::patternName<X##TParam>();
+            #include <mrdocs/Metadata/TParam/TParamInfoNodes.inc>
+            line(choice);
+        }
+        line();
+
+        // -------------------------------------------------------
+        // Template arguments
+        // -------------------------------------------------------
+        line("#---------------------------------------------");
+        line("# Template arguments (polymorphic)");
+        line("#---------------------------------------------");
+        line();
+        #define INFO(X) emitElementDef<X##TArg>();
+        #include <mrdocs/Metadata/TArg/TArgInfoNodes.inc>
+
+        line("AnyTArg = ");
+        {
+            std::string choice = "    ";
+            bool first = true;
+            #define INFO(X) \
+                if (!first) { choice += " | "; } \
+                first = false; \
+                choice += rnc_detail::patternName<X##TArg>();
+            #include <mrdocs/Metadata/TArg/TArgInfoNodes.inc>
+            line(choice);
+        }
+        line();
+
+        // -------------------------------------------------------
+        // Supporting types
+        // -------------------------------------------------------
+        line("#---------------------------------------------");
+        line("# Supporting types");
+        line("#---------------------------------------------");
+        line();
+        emitElementDef<TemplateInfo>();
+        emitElementDef<Param>();
+        emitElementDef<Location>();
+        emitElementDef<SourceInfo>();
+        emitElementDef<BaseInfo>();
+        emitElementDef<FriendInfo>();
+        emitElementDef<NamespaceTranche>();
+        emitElementDef<RecordInterface>();
+        emitElementDef<RecordTranche>();
+        emitElementDef<mrdocs::Name>();
+        emitElementDef<doc::InlineContainer>();
+        emitElementDef<doc::ListItem>();
+        emitElementDef<doc::DefinitionListItem>();
+        emitElementDef<doc::TableRow>();
+        emitElementDef<doc::TableCell>();
+
+        // -------------------------------------------------------
+        // Symbols
+        // -------------------------------------------------------
+        line("#---------------------------------------------");
+        line("# Symbols");
+        line("#---------------------------------------------");
+        line();
+        #define INFO(X) emitElementDef<X##Symbol>();
+        #include <mrdocs/Metadata/Symbol/SymbolNodes.inc>
+
+        line("AnySymbol =");
+        {
+            std::string choice = "    ";
+            bool first = true;
+            #define INFO(X) \
+                if (!first) { choice += " |\n    "; } \
+                first = false; \
+                choice += rnc_detail::patternName<X##Symbol>();
+            #include <mrdocs/Metadata/Symbol/SymbolNodes.inc>
+            line(choice);
+        }
+        line();
+
+        // -------------------------------------------------------
+        // DocComment
+        // -------------------------------------------------------
+        line("#---------------------------------------------");
+        line("# DocComment");
+        line("#---------------------------------------------");
+        line();
+        emitElementDef<DocComment>();
+
+        // Block nodes
+        line("#---------------------------------------------");
+        line("# Block nodes");
+        line("#---------------------------------------------");
+        line();
+        #define INFO(X) emitElementDef<doc::X##Block>();
+        #include <mrdocs/Metadata/DocComment/Block/BlockNodes.inc>
+
+        line("BlockNode =");
+        {
+            std::string choice = "    ";
+            bool first = true;
+            #define INFO(X) \
+                if (!first) { choice += " |\n    "; } \
+                first = false; \
+                choice += rnc_detail::patternName<doc::X##Block>();
+            #include <mrdocs/Metadata/DocComment/Block/BlockNodes.inc>
+            line(choice);
+        }
+        line();
+
+        // Inline nodes
+        line("#---------------------------------------------");
+        line("# Inline nodes");
+        line("#---------------------------------------------");
+        line();
+        #define INFO(X) emitElementDef<doc::X##Inline>();
+        #include <mrdocs/Metadata/DocComment/Inline/InlineNodes.inc>
+
+        line("InlineNode =");
+        {
+            std::string choice = "    ";
+            bool first = true;
+            #define INFO(X) \
+                if (!first) { choice += " |\n    "; } \
+                first = false; \
+                choice += rnc_detail::patternName<doc::X##Inline>();
+            #include <mrdocs/Metadata/DocComment/Inline/InlineNodes.inc>
+            line(choice);
+        }
+        line();
+
+        // -------------------------------------------------------
+        // Close grammar
+        // -------------------------------------------------------
+        indent_ = 0;
+        line("}");
+
+        return out_;
+    }
+};
+
+/** Build the complete RNC schema string.
+
+    @return The full RELAX NG Compact grammar for the MrDocs XML
+    output, suitable for writing directly to `mrdocs.rnc`.
+*/
+inline std::string
+buildRncSchema()
+{
+    RncEmitter emitter;
+    return emitter.build();
+}
+
+} // mrdocs::schema
+
+#endif // MRDOCS_API_SCHEMAS_RNCSCHEMAWRITER_HPP
diff --git a/include/mrdocs/Support/MapReflectedType.hpp b/include/mrdocs/Support/MapReflectedType.hpp
index 31c29e1ee8..08e83ea5d7 100644
--- a/include/mrdocs/Support/MapReflectedType.hpp
+++ b/include/mrdocs/Support/MapReflectedType.hpp
@@ -15,6 +15,8 @@
 #include <mrdocs/Dom/LazyArray.hpp>
 #include <mrdocs/Dom/LazyObject.hpp>
 #include <mrdocs/Metadata/Expression.hpp>
+#include <mrdocs/Metadata/DocComment/Block/ParamDirection.hpp>
+#include <mrdocs/Metadata/Specifiers/AccessKind.hpp>
 #include <mrdocs/Metadata/Specifiers/ConstexprKind.hpp>
 #include <mrdocs/Metadata/Specifiers/ReferenceKind.hpp>
 #include <mrdocs/Metadata/Specifiers/StorageClassKind.hpp>
@@ -114,6 +116,10 @@ shouldMapValue(T const& value)
     {
         return !value.empty();
     }
+    else if constexpr (std::is_same_v<T, AccessKind>)
+    {
+        return value != AccessKind::None;
+    }
     else if constexpr (std::is_same_v<T, ConstexprKind>)
     {
         return value != ConstexprKind::None;
@@ -126,6 +132,10 @@ shouldMapValue(T const& value)
     {
         return value != StorageClassKind::None;
     }
+    else if constexpr (std::is_same_v<T, doc::ParamDirection>)
+    {
+        return value != doc::ParamDirection::none;
+    }
     else if constexpr (std::is_same_v<T, ExprInfo>)
     {
         return !value.Written.empty();
diff --git a/include/mrdocs/Support/MergeReflectedType.hpp b/include/mrdocs/Support/MergeReflectedType.hpp
index e8f8712df7..f3cd4dd908 100644
--- a/include/mrdocs/Support/MergeReflectedType.hpp
+++ b/include/mrdocs/Support/MergeReflectedType.hpp
@@ -45,10 +45,13 @@ isDefaultEnum(E value)
 
 // Type trait: is this Polymorphic<U> for a given U?
 template <typename T, typename U>
-inline constexpr bool is_polymorphic_v = false;
+struct is_polymorphic_for : std::false_type {};
 
 template <typename U>
-inline constexpr bool is_polymorphic_v<Polymorphic<U>, U> = true;
+struct is_polymorphic_for<Polymorphic<U>, U> : std::true_type {};
+
+template <typename T, typename U>
+inline constexpr bool is_polymorphic_for_v = is_polymorphic_for<T, U>::value;
 
 // Type trait: can we call merge(T&, T&&) via ADL?
 template <typename T, typename = void>
@@ -135,7 +138,7 @@ mergeByType(T& dst, T&& src)
     // Polymorphic<Type>: take src if dst is in a placeholder
     // state — either AutoType{} or a blank NamedType with an
     // empty Identifier.
-    else if constexpr (is_polymorphic_v<T, Type>)
+    else if constexpr (is_polymorphic_for_v<T, Type>)
     {
         if (isPlaceholderType(dst))
         {
@@ -144,7 +147,7 @@ mergeByType(T& dst, T&& src)
         return true;
     }
     // Polymorphic<Name>: take src if dst has an empty Identifier.
-    else if constexpr (is_polymorphic_v<T, Name>)
+    else if constexpr (is_polymorphic_for_v<T, Name>)
     {
         if (dst->Identifier.empty())
         {
diff --git a/include/mrdocs/Support/TypeTraits.hpp b/include/mrdocs/Support/TypeTraits.hpp
index 573824e5ce..2658c26d4f 100644
--- a/include/mrdocs/Support/TypeTraits.hpp
+++ b/include/mrdocs/Support/TypeTraits.hpp
@@ -13,6 +13,7 @@
 #define MRDOCS_API_SUPPORT_TYPETRAITS_HPP
 
 #include <mrdocs/ADT/Optional.hpp>
+#include <mrdocs/ADT/Polymorphic.hpp>
 #include <type_traits>
 #include <vector>
 
@@ -39,6 +40,15 @@ struct is_vector<std::vector<T, A>> : std::true_type {};
 template <typename T>
 inline constexpr bool is_vector_v = is_vector<T>::value;
 
+template <typename T>
+struct is_polymorphic : std::false_type {};
+
+template <typename T>
+struct is_polymorphic<Polymorphic<T>> : std::true_type {};
+
+template <typename T>
+inline constexpr bool is_polymorphic_v = is_polymorphic<T>::value;
+
 } // namespace detail
 
 /** Return the value as its underlying type.
diff --git a/mrdocs.rnc b/mrdocs.rnc
deleted file mode 100644
index 75c69b3477..0000000000
--- a/mrdocs.rnc
+++ /dev/null
@@ -1,949 +0,0 @@
-#
-# Licensed under the Apache License v2.0 with LLVM Exceptions.
-# See https://llvm.org/LICENSE.txt for license information.
-# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-#
-# Copyright (c) 2023 Klemens Morgenstern (klemens.morgenstern@gmx.net)
-# Copyright (c) 2023 Krystian Stasiowski (sdkrystian@gmail.com)
-# Copyright (c) 2024 Fernando Pelliccioni (fpelliccioni@gmail.com)
-# Copyright (c) 2024 Alan de Freitas (alandefreitas@gmail.com)
-# Copyright (c) 2026 Gennaro Prota (gennaro.prota@gmail.com)
-#
-# Official repository: https://github.com/cppalliance/mrdocs
-#
-# https://relaxng.org/compact-tutorial-20030326.html
-#
-# convert to mrdocs.rng with tools/trang.jar (https://relaxng.org/jclark/trang.html)
-# when commiting because xmllint doesn't understand the compact format
-#
-
-namespace xsi= "http://www.w3.org/2001/XMLSchema-instance"
-
-grammar
-{
-    start = Mrdocs | Tagfile
-
-    Mrdocs =
-        element mrdocs
-        {
-            attribute xsi:noNamespaceSchemaLocation { text }?,
-            AnySymbol*
-        }
-
-    Tagfile =
-        element tagfile
-        {
-            TagCompound+
-        }
-
-    TagCompound =
-        element compound
-        {
-            attribute kind { "namespace" | "class" },
-            element name { text },
-            element filename { text },
-            (TagClass | TagMember)*
-        }
-
-    TagClass =
-        element class
-        {
-            attribute kind { "class" },
-            text
-        }
-
-    TagMember =
-        element member
-        {
-            attribute kind { "function" },
-            element type { text },
-            element name { text },
-            element anchorfile { text },
-            element anchor { text },
-            element arglist { text }
-        }
-
-    #---------------------------------------------
-    # Common types
-    #---------------------------------------------
-
-    SymbolID = text   # Base64-encoded
-
-    Bool = "1"
-
-    #---------------------------------------------
-    # Enums
-    #---------------------------------------------
-
-    ExtractionMode = "regular" | "see-below" | "implementation-defined" | "dependency"
-
-    FileKind = "source" | "system" | "other"
-
-    FunctionClass = "normal" | "constructor" | "conversion" | "destructor"
-
-    RecordKeyKind = "struct" | "class" | "union"
-
-    UsingClass = "normal" | "typename" | "enum"
-
-    AccessSpecifier = "public" | "private" | "protected"
-
-    AdmonitionKind = "note" | "tip" | "important" | "warning" | "caution"
-
-    ListKind = "ordered" | "unordered" | "task"
-
-    ParamDirection = "in" | "out" | "in-out"
-
-    TableAlignmentKind = "left" | "center" | "right"
-
-    #---------------------------------------------
-    # Name (used inside types, not for symbol names)
-    #---------------------------------------------
-
-    Name =
-        element name
-        {
-            element kind { text }?,
-            element id { SymbolID }?,
-            element identifier { text }?,
-            Name?
-        }
-
-    #---------------------------------------------
-    # Location & Source
-    #---------------------------------------------
-
-    Location =
-        element location
-        {
-            element short-path { text }?,
-            element source-path { text }?,
-            element line-number { text }?,
-            element column-number { text }?,
-            element documented { Bool }?
-        }
-
-    SourceInfo =
-        element source
-        {
-            Location*
-        }
-
-    #---------------------------------------------
-    # Symbol base
-    #---------------------------------------------
-
-    SymbolBase =
-    (
-        element name { text }?,
-        SourceInfo,
-        element kind { text }?,
-        element id { SymbolID }?,
-        element access { AccessSpecifier }?,
-        element extraction { ExtractionMode }?,
-        element is-copy-from-inherited { Bool }?,
-        element parent { SymbolID }?,
-        DocComment?
-    )
-
-    #---------------------------------------------
-    # Types (polymorphic)
-    #---------------------------------------------
-
-    TypeBase =
-    (
-        element is-pack-expansion { Bool }?,
-        element is-const { Bool }?,
-        element is-volatile { Bool }?,
-        element constraints { text }?
-    )
-
-    ArrayType =
-        element array
-        {
-            TypeBase,
-            AnyType?,
-            element bounds { text }?
-        }
-
-    AutoType =
-        element auto
-        {
-            TypeBase,
-            Name?,
-            element keyword { text }?,
-            element constraint { text }?
-        }
-
-    DecltypeType =
-        element decltype
-        {
-            TypeBase,
-            element operand { text }?
-        }
-
-    FunctionType =
-        element function
-        {
-            TypeBase,
-            AnyType*,
-            element ref-qualifier { text }?,
-            element exception-spec { text }?,
-            element is-variadic { Bool }?
-        }
-
-    LValueReferenceType =
-        element l-value-reference
-        {
-            TypeBase,
-            AnyType?
-        }
-
-    RValueReferenceType =
-        element r-value-reference
-        {
-            TypeBase,
-            AnyType?
-        }
-
-    PointerType =
-        element pointer
-        {
-            TypeBase,
-            AnyType?
-        }
-
-    MemberPointerType =
-        element member-pointer
-        {
-            TypeBase,
-            AnyType*
-        }
-
-    NamedType =
-        element named
-        {
-            TypeBase,
-            Name?,
-            element fundamental-type { text }?
-        }
-
-    AnyType =
-        ArrayType | AutoType | DecltypeType | FunctionType |
-        LValueReferenceType | RValueReferenceType | PointerType |
-        MemberPointerType | NamedType
-
-    #---------------------------------------------
-    # Template parameters (polymorphic)
-    #---------------------------------------------
-
-    TParamBase =
-    (
-        element kind { text }?,
-        element name { text }?,
-        element is-parameter-pack { Bool }?,
-        AnyTArg?
-    )
-
-    TypeTParam =
-        element type-tparam
-        {
-            TParamBase,
-            element key-kind { text }?,
-            Name?
-        }
-
-    ConstantTParam =
-        element constant-tparam
-        {
-            TParamBase,
-            AnyType?
-        }
-
-    TemplateTParam =
-        element template-tparam
-        {
-            TParamBase,
-            AnyTParam*
-        }
-
-    AnyTParam = TypeTParam | ConstantTParam | TemplateTParam
-
-    #---------------------------------------------
-    # Template arguments (polymorphic)
-    #---------------------------------------------
-
-    TArgBase =
-    (
-        element kind { text }?,
-        element is-pack-expansion { Bool }?
-    )
-
-    TypeTArg =
-        element type-targ
-        {
-            TArgBase,
-            AnyType?
-        }
-
-    ConstantTArg =
-        element constant-targ
-        {
-            TArgBase,
-            element value { text }?
-        }
-
-    TemplateTArg =
-        element template-targ
-        {
-            TArgBase,
-            element name { text }?,
-            element template { text }?
-        }
-
-    AnyTArg = TypeTArg | ConstantTArg | TemplateTArg
-
-    #---------------------------------------------
-    # Template
-    #---------------------------------------------
-
-    TemplateInfo =
-        element template
-        {
-            AnyTParam*,
-            AnyTArg*,
-            element requires { text }?,
-            element primary { SymbolID }?
-        }
-
-    #---------------------------------------------
-    # Param
-    #---------------------------------------------
-
-    Param =
-        element param
-        {
-            AnyType?,
-            element name { text }?,
-            element default { text }?
-        }
-
-    #---------------------------------------------
-    # Symbols
-    #---------------------------------------------
-
-    Namespace =
-        element namespace
-        {
-            SymbolBase,
-            element is-inline { Bool }?,
-            element is-anonymous { Bool }?,
-            Name*,
-            NamespaceTranche?
-        }
-
-    NamespaceTranche =
-        element namespace-tranche
-        {
-            element namespaces { SymbolID }*,
-            element namespace-aliases { SymbolID }*,
-            element typedefs { SymbolID }*,
-            element records { SymbolID }*,
-            element enums { SymbolID }*,
-            element functions { SymbolID }*,
-            element variables { SymbolID }*,
-            element concepts { SymbolID }*,
-            element guides { SymbolID }*,
-            element usings { SymbolID }*
-        }
-
-    #---------------------------------------------
-
-    Record =
-        element record
-        {
-            SymbolBase,
-            element key-kind { RecordKeyKind }?,
-            TemplateInfo?,
-            element is-type-def { Bool }?,
-            element is-final { Bool }?,
-            element is-final-destructor { Bool }?,
-            BaseInfo*,
-            element derived { SymbolID }*,
-            RecordInterface?,
-            FriendInfo*
-        }
-
-    BaseInfo =
-        element base
-        {
-            AnyType?,
-            element access { AccessSpecifier }?,
-            element is-virtual { Bool }?
-        }
-
-    RecordInterface =
-        element record-interface
-        {
-            RecordTranche*
-        }
-
-    RecordTranche =
-        element record-tranche
-        {
-            element namespace-aliases { SymbolID }*,
-            element typedefs { SymbolID }*,
-            element records { SymbolID }*,
-            element enums { SymbolID }*,
-            element functions { SymbolID }*,
-            element static-functions { SymbolID }*,
-            element variables { SymbolID }*,
-            element static-variables { SymbolID }*,
-            element concepts { SymbolID }*,
-            element guides { SymbolID }*,
-            element usings { SymbolID }*
-        }
-
-    FriendInfo =
-        element friend
-        {
-            AnyType?,
-            element id { SymbolID }?
-        }
-
-    #---------------------------------------------
-
-    Function =
-        element function
-        {
-            SymbolBase,
-            AnyType?,
-            Param*,
-            TemplateInfo?,
-            element func-class { FunctionClass }?,
-            element noexcept { text }?,
-            element requires { text }?,
-            element is-variadic { Bool }?,
-            element is-defaulted { Bool }?,
-            element is-explicitly-defaulted { Bool }?,
-            element is-deleted { Bool }?,
-            element is-deleted-as-written { Bool }?,
-            element is-no-return { Bool }?,
-            element has-override-attr { Bool }?,
-            element has-trailing-return { Bool }?,
-            element is-nodiscard { Bool }?,
-            element is-explicit-object-member-function { Bool }?,
-            element constexpr { text }?,
-            element overloaded-operator { text }?,
-            element storage-class { text }?,
-            element is-record-method { Bool }?,
-            element is-virtual { Bool }?,
-            element is-virtual-as-written { Bool }?,
-            element is-pure { Bool }?,
-            element is-const { Bool }?,
-            element is-volatile { Bool }?,
-            element is-final { Bool }?,
-            element ref-qualifier { text }?,
-            element explicit { text }?,
-            element attributes { text }*,
-            element function-object-impl { SymbolID }?
-        }
-
-    #---------------------------------------------
-
-    Guide =
-        element guide
-        {
-            SymbolBase,
-            AnyType?,
-            TemplateInfo?,
-            Param*,
-            element explicit { text }?
-        }
-
-    #---------------------------------------------
-
-    Enum =
-        element enum
-        {
-            SymbolBase,
-            element scoped { Bool }?,
-            AnyType?,
-            element constants { SymbolID }*
-        }
-
-    EnumConstant =
-        element enum-constant
-        {
-            SymbolBase,
-            element initializer { text }?
-        }
-
-    #---------------------------------------------
-
-    Typedef =
-        element typedef
-        {
-            SymbolBase,
-            AnyType?,
-            element is-using { Bool }?,
-            TemplateInfo?
-        }
-
-    #---------------------------------------------
-
-    Variable =
-        element variable
-        {
-            SymbolBase,
-            AnyType?,
-            TemplateInfo?,
-            element initializer { text }?,
-            element storage-class { text }?,
-            element is-inline { Bool }?,
-            element is-constexpr { Bool }?,
-            element is-constinit { Bool }?,
-            element is-thread-local { Bool }?,
-            element attributes { text }*,
-            element is-maybe-unused { Bool }?,
-            element is-deprecated { Bool }?,
-            element has-no-unique-address { Bool }?,
-            element is-record-field { Bool }?,
-            element is-mutable { Bool }?,
-            element is-variant { Bool }?,
-            element is-bitfield { Bool }?,
-            element bitfield-width { text }?
-        }
-
-    #---------------------------------------------
-
-    NamespaceAlias =
-        element namespace-alias
-        {
-            SymbolBase,
-            IdentifierName?
-        }
-
-    IdentifierName =
-        element identifier-name
-        {
-            element kind { text }?,
-            element id { SymbolID }?,
-            element identifier { text }?,
-            Name?
-        }
-
-    #---------------------------------------------
-
-    Using =
-        element using
-        {
-            SymbolBase,
-            element class { UsingClass }?,
-            Name?,
-            element shadow-declarations { SymbolID }*
-        }
-
-    #---------------------------------------------
-
-    Concept =
-        element concept
-        {
-            SymbolBase,
-            TemplateInfo?,
-            element constraint { text }?
-        }
-
-    #---------------------------------------------
-
-    Overloads =
-        element overloads
-        {
-            SymbolBase,
-            element func-class { FunctionClass }?,
-            element overloaded-operator { text }?,
-            element members { SymbolID }*,
-            AnyType?
-        }
-
-    #---------------------------------------------
-    # All symbol types (flat at top level)
-    #---------------------------------------------
-
-    AnySymbol =
-    (
-        Namespace      |
-        Record         |
-        Function       |
-        Typedef        |
-        Enum           |
-        EnumConstant   |
-        Variable       |
-        Guide          |
-        NamespaceAlias |
-        Using          |
-        Concept        |
-        Overloads
-    )
-
-    #---------------------------------------------
-    #
-    # DocComment
-    #
-    #---------------------------------------------
-
-    DocComment =
-        element doc-comment
-        {
-            BlockNode*
-        }
-
-    #---------------------------------------------
-    # Block nodes
-    #---------------------------------------------
-
-    BlockNode =
-    (
-        AdmonitionBlock   |
-        BriefBlock        |
-        CodeBlock         |
-        HeadingBlock      |
-        ParagraphBlock    |
-        ListBlock         |
-        DefinitionListBlock |
-        QuoteBlock        |
-        ThematicBreakBlock |
-        FootnoteDefinitionBlock |
-        TableBlock        |
-        MathBlock         |
-        ParamBlock        |
-        PostconditionBlock |
-        PreconditionBlock |
-        ReferenceBlock    |
-        ReturnsBlock      |
-        SeeBlock          |
-        ThrowsBlock       |
-        TParamBlock
-    )
-
-    BlockBase =
-        element kind { text }?
-
-    AdmonitionBlock =
-        element admonition
-        {
-            BlockBase,
-            BlockNode*,
-            element admonish { AdmonitionKind }?
-        }
-
-    BriefBlock =
-        element brief
-        {
-            BlockBase,
-            InlineNode*,
-            element copied-from { SymbolID }*
-        }
-
-    CodeBlock =
-        element code
-        {
-            BlockBase,
-            element literal { text }?,
-            element info { text }?
-        }
-
-    HeadingBlock =
-        element heading
-        {
-            BlockBase,
-            InlineNode*,
-            element level { text }?
-        }
-
-    ParagraphBlock =
-        element paragraph
-        {
-            BlockBase,
-            InlineNode*
-        }
-
-    ListItem =
-        element list-item
-        {
-            BlockNode*
-        }
-
-    ListBlock =
-        element list
-        {
-            BlockBase,
-            ListItem*,
-            element list-kind { ListKind }?
-        }
-
-    DefinitionListItem =
-        element definition-list-item
-        {
-            BlockNode*,
-            element term { InlineNode }*
-        }
-
-    DefinitionListBlock =
-        element definition-list
-        {
-            BlockBase,
-            DefinitionListItem*
-        }
-
-    QuoteBlock =
-        element quote
-        {
-            BlockBase,
-            BlockNode*
-        }
-
-    ThematicBreakBlock =
-        element thematic-break
-        {
-            BlockBase
-        }
-
-    FootnoteDefinitionBlock =
-        element footnote-definition
-        {
-            BlockBase,
-            BlockNode*,
-            element label { text }?
-        }
-
-    TableCell =
-        element table-cell
-        {
-            InlineNode*
-        }
-
-    TableRow =
-        element table-row
-        {
-            element is-header { Bool }?,
-            element cells { TableCell }*
-        }
-
-    TableBlock =
-        element table
-        {
-            BlockBase,
-            element alignments { TableAlignmentKind }*,
-            TableRow*
-        }
-
-    MathBlock =
-        element math
-        {
-            BlockBase,
-            element literal { text }?
-        }
-
-    ParamBlock =
-        element param
-        {
-            BlockBase,
-            InlineNode*,
-            element name { text }?,
-            element direction { ParamDirection }?
-        }
-
-    PostconditionBlock =
-        element postcondition
-        {
-            BlockBase,
-            InlineNode*
-        }
-
-    PreconditionBlock =
-        element precondition
-        {
-            BlockBase,
-            InlineNode*
-        }
-
-    ReferenceBlock =
-        element reference
-        {
-            BlockBase,
-            element literal { text }?,
-            element id { SymbolID }?
-        }
-
-    ReturnsBlock =
-        element returns
-        {
-            BlockBase,
-            InlineNode*
-        }
-
-    SeeBlock =
-        element see
-        {
-            BlockBase,
-            InlineNode*
-        }
-
-    ThrowsBlock =
-        element throws
-        {
-            BlockBase,
-            InlineNode*,
-            element exception { text }?
-        }
-
-    TParamBlock =
-        element t-param
-        {
-            BlockBase,
-            InlineNode*,
-            element name { text }?
-        }
-
-    #---------------------------------------------
-    # Inline nodes
-    #---------------------------------------------
-
-    InlineNode =
-    (
-        TextInline            |
-        CodeInline            |
-        MathInline            |
-        EmphInline            |
-        StrongInline          |
-        HighlightInline       |
-        StrikethroughInline   |
-        SubscriptInline       |
-        SuperscriptInline     |
-        LinkInline            |
-        ReferenceInline       |
-        ImageInline           |
-        FootnoteReferenceInline |
-        CopyDetailsInline     |
-        LineBreakInline       |
-        SoftBreakInline
-    )
-
-    InlineBase =
-        element kind { text }?
-
-    TextInline =
-        element text
-        {
-            InlineBase,
-            element literal { text }?
-        }
-
-    CodeInline =
-        element code
-        {
-            InlineBase,
-            InlineNode*
-        }
-
-    MathInline =
-        element math
-        {
-            InlineBase,
-            element literal { text }?
-        }
-
-    EmphInline =
-        element emph
-        {
-            InlineBase,
-            InlineNode*
-        }
-
-    StrongInline =
-        element strong
-        {
-            InlineBase,
-            InlineNode*
-        }
-
-    HighlightInline =
-        element highlight
-        {
-            InlineBase,
-            InlineNode*
-        }
-
-    StrikethroughInline =
-        element strikethrough
-        {
-            InlineBase,
-            InlineNode*
-        }
-
-    SubscriptInline =
-        element subscript
-        {
-            InlineBase,
-            InlineNode*
-        }
-
-    SuperscriptInline =
-        element superscript
-        {
-            InlineBase,
-            InlineNode*
-        }
-
-    LinkInline =
-        element link
-        {
-            InlineBase,
-            InlineNode*,
-            element href { text }?
-        }
-
-    ReferenceInline =
-        element reference
-        {
-            InlineBase,
-            element literal { text }?,
-            element id { SymbolID }?
-        }
-
-    ImageInline =
-        element image
-        {
-            InlineBase,
-            InlineNode*,
-            element src { text }?,
-            element alt { text }?
-        }
-
-    FootnoteReferenceInline =
-        element footnote-reference
-        {
-            InlineBase,
-            element label { text }?
-        }
-
-    CopyDetailsInline =
-        element copy-details
-        {
-            InlineBase,
-            element string { text }?,
-            element id { SymbolID }?
-        }
-
-    LineBreakInline =
-        element line-break
-        {
-            InlineBase
-        }
-
-    SoftBreakInline =
-        element soft-break
-        {
-            InlineBase
-        }
-}
diff --git a/src/lib/Gen/xml/XMLWriter.cpp b/src/lib/Gen/xml/XMLWriter.cpp
index de1e2c7e4a..0f311d287e 100644
--- a/src/lib/Gen/xml/XMLWriter.cpp
+++ b/src/lib/Gen/xml/XMLWriter.cpp
@@ -31,14 +31,9 @@ namespace mrdocs::xml {
 
 namespace {
 
-template <typename T> struct is_optional : std::false_type {};
-template <typename T> struct is_optional<Optional<T>> : std::true_type {};
-
-template <typename T> struct is_vector : std::false_type {};
-template <typename T, typename A> struct is_vector<std::vector<T, A>> : std::true_type {};
-
-template <typename T> struct is_polymorphic : std::false_type {};
-template <typename T> struct is_polymorphic<Polymorphic<T>> : std::true_type {};
+using mrdocs::detail::is_optional;
+using mrdocs::detail::is_vector;
+using mrdocs::detail::is_polymorphic;
 
 std::string
 removeSuffix(std::string_view s, std::string_view suffix)
@@ -60,6 +55,24 @@ std::string tagName()
     return toKebabCase(name);
 }
 
+/** True if the described enum has an enumerator named "None" or "none". */
+template <typename E>
+constexpr bool has_none_enumerator()
+{
+    bool result = false;
+    describe::for_each(
+        describe::describe_enumerators<E>{},
+        [&](auto const& D)
+        {
+            std::string_view name(D.name);
+            if (name == "None" || name == "none")
+            {
+                result = true;
+            }
+        });
+    return result;
+}
+
 } // unnamed namespace
 
 //------------------------------------------------
@@ -180,6 +193,16 @@ XMLWriter::writeElement(std::string_view tag, T const& value)
         { if (value.empty()) return; }
     else if constexpr (std::is_base_of_v<ExprInfo, Type>)
         { if (value.Written.empty()) return; }
+    else if constexpr (describe::has_describe_enumerators<Type>::value)
+    {
+        if constexpr (has_none_enumerator<Type>())
+        {
+            if (toString(value) == "none")
+            {
+                return;
+            }
+        }
+    }
 
     // Primitives inline, compounds wrapped.
     if constexpr (std::is_base_of_v<ExprInfo, Type>)
diff --git a/src/lib/Metadata/DocComment.cpp b/src/lib/Metadata/DocComment.cpp
index 71d077fec2..9d6d22bd6f 100644
--- a/src/lib/Metadata/DocComment.cpp
+++ b/src/lib/Metadata/DocComment.cpp
@@ -46,24 +46,6 @@ toString(AdmonitionKind kind) noexcept
     }
 }
 
-dom::String
-toString(ParamDirection kind) noexcept
-{
-    switch(kind)
-    {
-    case ParamDirection::none:
-        return "";
-    case ParamDirection::in:
-        return "in";
-    case ParamDirection::out:
-        return "out";
-    case ParamDirection::inout:
-        return "inout";
-    default:
-        MRDOCS_UNREACHABLE();
-    }
-}
-
 dom::String
 toString(Parts kind) noexcept
 {
diff --git a/src/lib/Metadata/Specifiers.cpp b/src/lib/Metadata/Specifiers.cpp
index 9f8b458487..5aecb480f0 100644
--- a/src/lib/Metadata/Specifiers.cpp
+++ b/src/lib/Metadata/Specifiers.cpp
@@ -15,45 +15,6 @@
 
 namespace mrdocs {
 
-dom::String toString(AccessKind kind) noexcept
-{
-    switch(kind)
-    {
-    case AccessKind::Public:    return "public";
-    case AccessKind::Private:   return "private";
-    case AccessKind::Protected: return "protected";
-    case AccessKind::None:      return "";
-    default:
-        MRDOCS_UNREACHABLE();
-    }
-}
-
-dom::String toString(StorageClassKind kind) noexcept
-{
-    switch(kind)
-    {
-    case StorageClassKind::None:     return "";
-    case StorageClassKind::Extern:   return "extern";
-    case StorageClassKind::Static:   return "static";
-    case StorageClassKind::Auto:     return "auto";
-    case StorageClassKind::Register: return "register";
-    default:
-        MRDOCS_UNREACHABLE();
-    }
-}
-
-dom::String toString(ConstexprKind kind) noexcept
-{
-    switch(kind)
-    {
-    case ConstexprKind::None:      return "";
-    case ConstexprKind::Constexpr: return "constexpr";
-    case ConstexprKind::Consteval: return "consteval";
-    default:
-        MRDOCS_UNREACHABLE();
-    }
-}
-
 dom::String toString(ExplicitKind kind) noexcept
 {
     switch(kind)
diff --git a/src/lib/Support/Debug.hpp b/src/lib/Support/Debug.hpp
index ada0ce21d9..02d47390be 100644
--- a/src/lib/Support/Debug.hpp
+++ b/src/lib/Support/Debug.hpp
@@ -47,7 +47,7 @@ struct std::formatter<mrdocs::AccessKind> : std::formatter<std::string> {
   template <class FmtContext>
   std::format_context::iterator format(mrdocs::AccessKind a,
                                        FmtContext &ctx) const {
-    return std::formatter<std::string>::format(toString(a).str(), ctx);
+    return std::formatter<std::string>::format(toString(a), ctx);
   }
 };
 
diff --git a/src/test/Schemas/DomSchemaWriter.cpp b/src/test/Schemas/DomSchemaWriter.cpp
new file mode 100644
index 0000000000..e7b8660cbc
--- /dev/null
+++ b/src/test/Schemas/DomSchemaWriter.cpp
@@ -0,0 +1,326 @@
+//
+// Licensed under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+// Copyright (c) 2026 Gennaro Prota (gennaro.prota@gmail.com)
+//
+// Official repository: https://github.com/cppalliance/mrdocs
+//
+
+#include <mrdocs/Schemas/DomSchemaWriter.hpp>
+#include <test_suite/test_suite.hpp>
+#include <cstddef>
+
+namespace mrdocs {
+namespace {
+
+// Helpers to navigate the schema dom::Value tree.
+
+dom::Object
+defs(dom::Value const& schema)
+{
+    return schema.getObject().get("$defs").getObject();
+}
+
+dom::Object
+props(dom::Object const& obj, std::string_view defName)
+{
+    return obj.get(defName).getObject()
+              .get("properties").getObject();
+}
+
+dom::Array
+oneOfArray(dom::Object const& obj, std::string_view defName)
+{
+    return obj.get(defName).getObject()
+              .get("oneOf").getArray();
+}
+
+dom::Array
+requiredArray(dom::Object const& obj, std::string_view defName)
+{
+    return obj.get(defName).getObject()
+              .get("required").getArray();
+}
+
+bool
+arrayContains(dom::Array const& arr, std::string_view value)
+{
+    for (std::size_t i = 0; i < arr.size(); ++i)
+    {
+        if (arr.at(i).getString() == value)
+            return true;
+    }
+    return false;
+}
+
+// ------------------------------------------------------------------
+
+struct DomSchemaWriterTest
+{
+    // -- Top-level structure --------------------------------------
+
+    void test_top_level()
+    {
+        dom::Value schema = schema::buildDomSchema();
+        dom::Object root = schema.getObject();
+
+        BOOST_TEST(root.exists("$schema"));
+        BOOST_TEST(root.exists("title"));
+        BOOST_TEST(root.exists("$defs"));
+        BOOST_TEST(root.exists("oneOf"));
+
+        // The top-level oneOf lists all 12 symbol kinds.
+        BOOST_TEST(root.get("oneOf").getArray().size() == 12);
+    }
+
+    // -- Symbol coverage ------------------------------------------
+
+    void test_all_symbols_in_defs()
+    {
+        dom::Value schema = schema::buildDomSchema();
+        dom::Object d = defs(schema);
+
+        BOOST_TEST(d.exists("NamespaceSymbol"));
+        BOOST_TEST(d.exists("RecordSymbol"));
+        BOOST_TEST(d.exists("FunctionSymbol"));
+        BOOST_TEST(d.exists("OverloadsSymbol"));
+        BOOST_TEST(d.exists("EnumSymbol"));
+        BOOST_TEST(d.exists("EnumConstantSymbol"));
+        BOOST_TEST(d.exists("TypedefSymbol"));
+        BOOST_TEST(d.exists("VariableSymbol"));
+        BOOST_TEST(d.exists("GuideSymbol"));
+        BOOST_TEST(d.exists("NamespaceAliasSymbol"));
+        BOOST_TEST(d.exists("UsingSymbol"));
+        BOOST_TEST(d.exists("ConceptSymbol"));
+    }
+
+    // -- Polymorphic oneOf ----------------------------------------
+
+    void test_polymorphic_variants()
+    {
+        dom::Value schema = schema::buildDomSchema();
+        dom::Object d = defs(schema);
+
+        BOOST_TEST(oneOfArray(d, "Type").size() == 9);
+        BOOST_TEST(oneOfArray(d, "Name").size() == 2);
+        BOOST_TEST(oneOfArray(d, "TParam").size() == 3);
+        BOOST_TEST(oneOfArray(d, "TArg").size() == 3);
+        BOOST_TEST(oneOfArray(d, "Block").size() == 19);
+        BOOST_TEST(oneOfArray(d, "Inline").size() == 16);
+    }
+
+    // -- FunctionSymbol properties --------------------------------
+
+    void test_function_symbol_properties()
+    {
+        dom::Value schema = schema::buildDomSchema();
+        dom::Object d = defs(schema);
+        dom::Object fp = props(d, "FunctionSymbol");
+
+        // Inherited from Symbol
+        BOOST_TEST(fp.exists("name"));
+        BOOST_TEST(fp.exists("kind"));
+        BOOST_TEST(fp.exists("id"));
+        BOOST_TEST(fp.exists("access"));
+
+        // Own members
+        BOOST_TEST(fp.exists("returnType"));
+        BOOST_TEST(fp.exists("params"));
+        BOOST_TEST(fp.exists("isVariadic"));
+        BOOST_TEST(fp.exists("isVirtual"));
+        BOOST_TEST(fp.exists("isConst"));
+        BOOST_TEST(fp.exists("funcClass"));
+        BOOST_TEST(fp.exists("noexcept"));
+        BOOST_TEST(fp.exists("explicit"));
+        BOOST_TEST(fp.exists("template"));
+
+        // params is an array
+        BOOST_TEST(fp.get("params").getObject()
+                     .get("type").getString() == "array");
+
+        // isVariadic is boolean
+        BOOST_TEST(fp.get("isVariadic").getObject()
+                     .get("type").getString() == "boolean");
+
+        // returnType is a $ref
+        BOOST_TEST(fp.get("returnType").getObject()
+                     .exists("$ref"));
+    }
+
+    // -- Described enum values ------------------------------------
+
+    void test_described_enum_values()
+    {
+        dom::Value schema = schema::buildDomSchema();
+        dom::Object d = defs(schema);
+        dom::Object fp = props(d, "FunctionSymbol");
+
+        // ExtractionMode is a described enum (inherited from Symbol).
+        dom::Object extraction = fp.get("extraction").getObject();
+        BOOST_TEST(extraction.get("type").getString() == "string");
+        dom::Array values = extraction.get("enum").getArray();
+        BOOST_TEST(arrayContains(values, "regular"));
+        BOOST_TEST(arrayContains(values, "see-below"));
+        BOOST_TEST(arrayContains(values, "implementation-defined"));
+        BOOST_TEST(arrayContains(values, "dependency"));
+
+        // FunctionClass is a described enum (own member).
+        dom::Object funcClass = fp.get("funcClass").getObject();
+        BOOST_TEST(funcClass.get("type").getString() == "string");
+        dom::Array fcValues = funcClass.get("enum").getArray();
+        BOOST_TEST(arrayContains(fcValues, "normal"));
+        BOOST_TEST(arrayContains(fcValues, "constructor"));
+        BOOST_TEST(arrayContains(fcValues, "destructor"));
+    }
+
+    // -- Non-described enums -> string ----------------------------
+
+    void test_non_described_enums()
+    {
+        dom::Value schema = schema::buildDomSchema();
+        dom::Object d = defs(schema);
+        dom::Object fp = props(d, "FunctionSymbol");
+
+        // AccessKind serializes as string via manual toString().
+        BOOST_TEST(fp.get("access").getObject()
+                     .get("type").getString() == "string");
+
+        // ConstexprKind
+        BOOST_TEST(fp.get("constexpr").getObject()
+                     .get("type").getString() == "string");
+
+        // NoexceptInfo
+        BOOST_TEST(fp.get("noexcept").getObject()
+                     .get("type").getString() == "string");
+
+        // ExplicitInfo
+        BOOST_TEST(fp.get("explicit").getObject()
+                     .get("type").getString() == "string");
+
+        // OperatorKind
+        BOOST_TEST(fp.get("overloadedOperator").getObject()
+                     .get("type").getString() == "string");
+    }
+
+    // -- Symbol extension fields ----------------------------------
+
+    void test_symbol_extensions()
+    {
+        dom::Value schema = schema::buildDomSchema();
+        dom::Object d = defs(schema);
+        dom::Object fp = props(d, "FunctionSymbol");
+
+        // Custom fields from Symbol's tag_invoke overload.
+        BOOST_TEST(fp.exists("class"));
+        BOOST_TEST(fp.get("class").getObject()
+                     .get("const").getString() == "symbol");
+
+        BOOST_TEST(fp.exists("isRegular"));
+        BOOST_TEST(fp.get("isRegular").getObject()
+                     .get("type").getString() == "boolean");
+
+        BOOST_TEST(fp.exists("isSeeBelow"));
+        BOOST_TEST(fp.exists("isImplementationDefined"));
+        BOOST_TEST(fp.exists("isDependency"));
+
+        // They should all be required.
+        dom::Array req = requiredArray(d, "FunctionSymbol");
+        BOOST_TEST(arrayContains(req, "class"));
+        BOOST_TEST(arrayContains(req, "isRegular"));
+        BOOST_TEST(arrayContains(req, "isDependency"));
+    }
+
+    // -- $meta object ---------------------------------------------
+
+    void test_meta_object()
+    {
+        dom::Value schema = schema::buildDomSchema();
+        dom::Object d = defs(schema);
+        dom::Object fp = props(d, "FunctionSymbol");
+
+        BOOST_TEST(fp.exists("$meta"));
+        dom::Object meta = fp.get("$meta").getObject();
+        BOOST_TEST(meta.get("type").getString() == "object");
+
+        dom::Object metaProps = meta.get("properties").getObject();
+        BOOST_TEST(metaProps.exists("type"));
+        BOOST_TEST(metaProps.exists("bases"));
+
+        // bases is an array of strings.
+        dom::Object bases = metaProps.get("bases").getObject();
+        BOOST_TEST(bases.get("type").getString() == "array");
+        BOOST_TEST(bases.get("items").getObject()
+                       .get("type").getString() == "string");
+    }
+
+    // -- Required vs optional -------------------------------------
+
+    void test_required_fields()
+    {
+        dom::Value schema = schema::buildDomSchema();
+        dom::Object d = defs(schema);
+        dom::Array req = requiredArray(d, "FunctionSymbol");
+
+        // Booleans are always present (shouldMapValue returns true).
+        BOOST_TEST(arrayContains(req, "isVariadic"));
+        BOOST_TEST(arrayContains(req, "isVirtual"));
+        BOOST_TEST(arrayContains(req, "isConst"));
+
+        // Strings can be empty → not required.
+        BOOST_TEST(!arrayContains(req, "name"));
+
+        // ConstexprKind/StorageClassKind can be None → not required.
+        BOOST_TEST(!arrayContains(req, "constexpr"));
+        BOOST_TEST(!arrayContains(req, "storageClass"));
+
+        // ExprInfo can be empty → not required.
+        BOOST_TEST(!arrayContains(req, "requires"));
+    }
+
+    // -- Supporting types -----------------------------------------
+
+    void test_supporting_types()
+    {
+        dom::Value schema = schema::buildDomSchema();
+        dom::Object d = defs(schema);
+
+        BOOST_TEST(d.exists("Location"));
+        BOOST_TEST(d.exists("Param"));
+        BOOST_TEST(d.exists("TemplateInfo"));
+        BOOST_TEST(d.exists("SourceInfo"));
+        BOOST_TEST(d.exists("BaseInfo"));
+        BOOST_TEST(d.exists("FriendInfo"));
+
+        // Location has expected fields.
+        dom::Object lp = props(d, "Location");
+        BOOST_TEST(lp.exists("shortPath"));
+        BOOST_TEST(lp.exists("lineNumber"));
+        BOOST_TEST(lp.exists("documented"));
+    }
+
+    // -- run ------------------------------------------------------
+
+    void run()
+    {
+        test_top_level();
+        test_all_symbols_in_defs();
+        test_polymorphic_variants();
+        test_function_symbol_properties();
+        test_described_enum_values();
+        test_non_described_enums();
+        test_symbol_extensions();
+        test_meta_object();
+        test_required_fields();
+        test_supporting_types();
+    }
+};
+
+} // (anon)
+
+TEST_SUITE(
+    DomSchemaWriterTest,
+    "clang.mrdocs.Schemas.DomSchemaWriter");
+
+} // mrdocs
diff --git a/src/tool/ToolArgs.cpp b/src/tool/ToolArgs.cpp
index 229ea87f01..36afa760b8 100644
--- a/src/tool/ToolArgs.cpp
+++ b/src/tool/ToolArgs.cpp
@@ -45,6 +45,8 @@ hideForeignOptions()
     {
         oursOptions.push_back(std::addressof(opt));
     });
+    // Options defined in ToolArgs (not generated PublicToolArgs).
+    oursOptions.push_back(&schemas);
     auto optionMap = llvm::cl::getRegisteredOptions();
     for(auto& opt : optionMap)
     {
diff --git a/src/tool/ToolArgs.hpp b/src/tool/ToolArgs.hpp
index 89656140bc..16c13269fa 100644
--- a/src/tool/ToolArgs.hpp
+++ b/src/tool/ToolArgs.hpp
@@ -31,6 +31,19 @@ class ToolArgs : public PublicToolArgs
     char const*                 usageText;
     llvm::cl::extrahelp         extraHelp;
 
+    /** Output directory for JSON Schema files.
+
+        When set, the tool writes schema files describing
+        the DOM and XML output formats, then exits without
+        extracting any source files.
+    */
+    llvm::cl::opt<std::string>  schemas{
+        "schemas",
+        llvm::cl::desc("Write JSON Schema files to <dir> (default: .) and exit"),
+        llvm::cl::value_desc("dir"),
+        llvm::cl::ValueOptional,
+        llvm::cl::cat(commandLineOptionsCat)};
+
     // Hide all options that don't belong to us
     void
     hideForeignOptions();
diff --git a/src/tool/ToolMain.cpp b/src/tool/ToolMain.cpp
index fa8c606011..90b9677396 100644
--- a/src/tool/ToolMain.cpp
+++ b/src/tool/ToolMain.cpp
@@ -5,6 +5,7 @@
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 // Copyright (c) 2023 Vinnie Falco (vinnie.falco@gmail.com)
+// Copyright (c) 2026 Gennaro Prota (gennaro.prota@gmail.com)
 //
 // Official repository: https://github.com/cppalliance/mrdocs
 //
@@ -12,6 +13,9 @@
 #include "ToolArgs.hpp"
 #include <lib/Support/Debug.hpp>
 #include <lib/Support/Report.hpp>
+#include <mrdocs/Schemas/DomSchemaWriter.hpp>
+#include <mrdocs/Schemas/JsonEmitter.hpp>
+#include <mrdocs/Schemas/RncSchemaWriter.hpp>
 #include <mrdocs/Support/Path.hpp>
 #include <mrdocs/Version.hpp>
 #include <llvm/Support/FileSystem.h>
@@ -20,6 +24,7 @@
 #include <llvm/Support/raw_ostream.h>
 #include <llvm/TargetParser/Host.h>
 #include <cstdlib>
+#include <fstream>
 #include <ranges>
 
 extern int main(int argc, char const** argv);
@@ -120,6 +125,46 @@ mrdocs_main(int argc, char const** argv)
     }
 
 
+    // --schemas writes JSON Schema files and exits immediately,
+    // without needing a config file or source files.
+    if (toolArgs.schemas.getNumOccurrences() > 0)
+    {
+        std::string dir = toolArgs.schemas.getValue();
+        if (dir.empty())
+        {
+            dir = ".";
+        }
+        files::createDirectory(dir);
+        std::string path = files::appendPath(dir, "mrdocs-dom-schema.json");
+        std::ofstream os(path,
+            std::ios_base::binary |
+            std::ios_base::out |
+            std::ios_base::trunc);
+        if (!os.is_open())
+        {
+            llvm::errs() << "error: cannot open \""
+                         << path << "\" for writing\n";
+            return EXIT_FAILURE;
+        }
+        os << schema::toJson(schema::buildDomSchema());
+
+        // Write RNC schema (replaces hand-maintained mrdocs.rnc).
+        std::string rncPath = files::appendPath(dir, "mrdocs.rnc");
+        std::ofstream rncOs(rncPath,
+            std::ios_base::binary |
+            std::ios_base::out |
+            std::ios_base::trunc);
+        if (!rncOs.is_open())
+        {
+            llvm::errs() << "error: cannot open \""
+                         << rncPath << "\" for writing\n";
+            return EXIT_FAILURE;
+        }
+        rncOs << schema::buildRncSchema();
+
+        return EXIT_SUCCESS;
+    }
+
     // Before `DoGenerateAction`, we use an error reporting level.
     // DoGenerateAction will set the level to whatever is specified in
     // the command line or the configuration file
diff --git a/test-files/golden-tests/config/auto-function-metadata/brief-from-function-class.xml b/test-files/golden-tests/config/auto-function-metadata/brief-from-function-class.xml
index a1bcf0d9ac..cb7c58f1f4 100644
--- a/test-files/golden-tests/config/auto-function-metadata/brief-from-function-class.xml
+++ b/test-files/golden-tests/config/auto-function-metadata/brief-from-function-class.xml
@@ -114,6 +114,7 @@
   </source>
   <kind>overloads</kind>
   <id>iRe6Tyv0qU6vIHNyvLHuISP/Fw4=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>ynx5NXMLXqzSXwgOnIP6CHzNx14=</parent>
   <doc-comment>
@@ -151,6 +152,7 @@
   </source>
   <kind>function</kind>
   <id>6Jx2eK9l4C46QIRucTvox+6PH2k=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>ynx5NXMLXqzSXwgOnIP6CHzNx14=</parent>
   <doc-comment>
@@ -171,6 +173,7 @@
   <func-class>constructor</func-class>
   <is-defaulted>1</is-defaulted>
   <is-explicitly-defaulted>1</is-explicitly-defaulted>
+  <constexpr>constexpr</constexpr>
   <is-record-method>1</is-record-method>
 </function>
 <function>
@@ -185,6 +188,7 @@
   </source>
   <kind>function</kind>
   <id>4C2UEs8la3Eghf4mLyeViCJNOwY=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>ynx5NXMLXqzSXwgOnIP6CHzNx14=</parent>
   <doc-comment>
@@ -226,6 +230,7 @@
   <func-class>constructor</func-class>
   <is-defaulted>1</is-defaulted>
   <is-explicitly-defaulted>1</is-explicitly-defaulted>
+  <constexpr>constexpr</constexpr>
   <is-record-method>1</is-record-method>
 </function>
 <function>
@@ -240,6 +245,7 @@
   </source>
   <kind>function</kind>
   <id>ad/AzbLEE6b8dNnnX2OLy1+HxDQ=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>ynx5NXMLXqzSXwgOnIP6CHzNx14=</parent>
   <doc-comment>
@@ -280,6 +286,7 @@
   <func-class>constructor</func-class>
   <is-defaulted>1</is-defaulted>
   <is-explicitly-defaulted>1</is-explicitly-defaulted>
+  <constexpr>constexpr</constexpr>
   <is-record-method>1</is-record-method>
 </function>
 <function>
@@ -294,6 +301,7 @@
   </source>
   <kind>function</kind>
   <id>d9h3reyOyp3JT3kwQOTPOI9tmzg=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>ynx5NXMLXqzSXwgOnIP6CHzNx14=</parent>
   <doc-comment>
@@ -350,6 +358,7 @@
   </source>
   <kind>function</kind>
   <id>vwV8S8Oz6MQV3vNlcR0jdKhSlfc=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>ynx5NXMLXqzSXwgOnIP6CHzNx14=</parent>
   <doc-comment>
@@ -410,6 +419,7 @@
   </source>
   <kind>function</kind>
   <id>ALa0jXrxokW17OgDFIUlk/PCxSQ=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>ynx5NXMLXqzSXwgOnIP6CHzNx14=</parent>
   <doc-comment>
@@ -469,6 +479,7 @@
   </source>
   <kind>function</kind>
   <id>HK6hbp0kJrHWxbYoHddN1v/GCWc=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>ynx5NXMLXqzSXwgOnIP6CHzNx14=</parent>
   <doc-comment>
@@ -501,6 +512,7 @@
   </source>
   <kind>function</kind>
   <id>CWQgyDAMsfX65S2osLlxVceQp04=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>ynx5NXMLXqzSXwgOnIP6CHzNx14=</parent>
   <doc-comment>
@@ -549,6 +561,7 @@
   </source>
   <kind>function</kind>
   <id>ugTeBmZlVDCwimu6VQtRkOKlfL8=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>ynx5NXMLXqzSXwgOnIP6CHzNx14=</parent>
   <doc-comment>
diff --git a/test-files/golden-tests/config/auto-function-metadata/brief-from-operator.xml b/test-files/golden-tests/config/auto-function-metadata/brief-from-operator.xml
index 18a690c454..9f533b0ca6 100644
--- a/test-files/golden-tests/config/auto-function-metadata/brief-from-operator.xml
+++ b/test-files/golden-tests/config/auto-function-metadata/brief-from-operator.xml
@@ -108,6 +108,7 @@
   </source>
   <kind>overloads</kind>
   <id>q7aqa6GHOpmWjES40eZPTxdQ3zE=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>ynx5NXMLXqzSXwgOnIP6CHzNx14=</parent>
   <doc-comment>
@@ -145,6 +146,7 @@
   </source>
   <kind>function</kind>
   <id>YI7e/5S7mfio0SdtBRI7qUu9Q98=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>ynx5NXMLXqzSXwgOnIP6CHzNx14=</parent>
   <doc-comment>
@@ -208,6 +210,7 @@
   </source>
   <kind>function</kind>
   <id>48zVzrvQYghIK1XcLQx4pbTPMI4=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>ynx5NXMLXqzSXwgOnIP6CHzNx14=</parent>
   <doc-comment>
@@ -270,6 +273,7 @@
   </source>
   <kind>function</kind>
   <id>3QxkEc/c2ugz6330u92HdqOoDNk=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>ynx5NXMLXqzSXwgOnIP6CHzNx14=</parent>
   <doc-comment>
@@ -333,6 +337,7 @@
   </source>
   <kind>function</kind>
   <id>fQntJewamOFvdUijvGwzsqA4V+E=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>ynx5NXMLXqzSXwgOnIP6CHzNx14=</parent>
   <doc-comment>
diff --git a/test-files/golden-tests/config/auto-function-metadata/param-from-function-class.xml b/test-files/golden-tests/config/auto-function-metadata/param-from-function-class.xml
index 0794d4bc93..870a9e5be7 100644
--- a/test-files/golden-tests/config/auto-function-metadata/param-from-function-class.xml
+++ b/test-files/golden-tests/config/auto-function-metadata/param-from-function-class.xml
@@ -118,6 +118,7 @@
   </source>
   <kind>overloads</kind>
   <id>iRe6Tyv0qU6vIHNyvLHuISP/Fw4=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>ynx5NXMLXqzSXwgOnIP6CHzNx14=</parent>
   <doc-comment>
@@ -154,6 +155,7 @@
   </source>
   <kind>function</kind>
   <id>4C2UEs8la3Eghf4mLyeViCJNOwY=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>ynx5NXMLXqzSXwgOnIP6CHzNx14=</parent>
   <doc-comment>
@@ -207,6 +209,7 @@
   </source>
   <kind>function</kind>
   <id>ad/AzbLEE6b8dNnnX2OLy1+HxDQ=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>ynx5NXMLXqzSXwgOnIP6CHzNx14=</parent>
   <doc-comment>
@@ -259,6 +262,7 @@
   </source>
   <kind>function</kind>
   <id>d9h3reyOyp3JT3kwQOTPOI9tmzg=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>ynx5NXMLXqzSXwgOnIP6CHzNx14=</parent>
   <doc-comment>
@@ -315,6 +319,7 @@
   </source>
   <kind>function</kind>
   <id>vwV8S8Oz6MQV3vNlcR0jdKhSlfc=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>ynx5NXMLXqzSXwgOnIP6CHzNx14=</parent>
   <doc-comment>
@@ -375,6 +380,7 @@
   </source>
   <kind>function</kind>
   <id>ALa0jXrxokW17OgDFIUlk/PCxSQ=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>ynx5NXMLXqzSXwgOnIP6CHzNx14=</parent>
   <doc-comment>
@@ -458,6 +464,7 @@
   </source>
   <kind>overloads</kind>
   <id>q7aqa6GHOpmWjES40eZPTxdQ3zE=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>ynx5NXMLXqzSXwgOnIP6CHzNx14=</parent>
   <doc-comment>
@@ -497,6 +504,7 @@
   </source>
   <kind>function</kind>
   <id>YI7e/5S7mfio0SdtBRI7qUu9Q98=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>ynx5NXMLXqzSXwgOnIP6CHzNx14=</parent>
   <doc-comment>
@@ -560,6 +568,7 @@
   </source>
   <kind>function</kind>
   <id>48zVzrvQYghIK1XcLQx4pbTPMI4=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>ynx5NXMLXqzSXwgOnIP6CHzNx14=</parent>
   <doc-comment>
@@ -622,6 +631,7 @@
   </source>
   <kind>function</kind>
   <id>fxM82tl72Q717PPJyP3nb48HbSQ=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>ynx5NXMLXqzSXwgOnIP6CHzNx14=</parent>
   <doc-comment>
@@ -681,6 +691,7 @@
   </source>
   <kind>function</kind>
   <id>3QxkEc/c2ugz6330u92HdqOoDNk=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>ynx5NXMLXqzSXwgOnIP6CHzNx14=</parent>
   <doc-comment>
@@ -744,6 +755,7 @@
   </source>
   <kind>function</kind>
   <id>fj22HhjPEq+Xg/+Qrr3suU+8qMs=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>ynx5NXMLXqzSXwgOnIP6CHzNx14=</parent>
   <doc-comment>
diff --git a/test-files/golden-tests/config/auto-function-metadata/param-from-operator.xml b/test-files/golden-tests/config/auto-function-metadata/param-from-operator.xml
index dc52f863ff..b8afa66bd7 100644
--- a/test-files/golden-tests/config/auto-function-metadata/param-from-operator.xml
+++ b/test-files/golden-tests/config/auto-function-metadata/param-from-operator.xml
@@ -107,6 +107,7 @@
   </source>
   <kind>function</kind>
   <id>KAGpjhkArISJuf2yO8ueGRkoMRY=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>ynx5NXMLXqzSXwgOnIP6CHzNx14=</parent>
   <doc-comment>
diff --git a/test-files/golden-tests/config/auto-function-metadata/returns-from-brief.xml b/test-files/golden-tests/config/auto-function-metadata/returns-from-brief.xml
index 0280a457a9..b28c998083 100644
--- a/test-files/golden-tests/config/auto-function-metadata/returns-from-brief.xml
+++ b/test-files/golden-tests/config/auto-function-metadata/returns-from-brief.xml
@@ -61,6 +61,7 @@
   </source>
   <kind>function</kind>
   <id>NvIeyslj/JtN1AFmvZ8Tij9uTrg=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>ynx5NXMLXqzSXwgOnIP6CHzNx14=</parent>
   <doc-comment>
@@ -101,6 +102,7 @@
   </source>
   <kind>function</kind>
   <id>3xIfjajRSSCEaVNizhf9qh46l4U=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>ynx5NXMLXqzSXwgOnIP6CHzNx14=</parent>
   <doc-comment>
@@ -142,6 +144,7 @@
   </source>
   <kind>function</kind>
   <id>4jz+tDHFk1vY3ErafzS9b537gac=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>ynx5NXMLXqzSXwgOnIP6CHzNx14=</parent>
   <doc-comment>
diff --git a/test-files/golden-tests/config/auto-function-metadata/returns-from-special.xml b/test-files/golden-tests/config/auto-function-metadata/returns-from-special.xml
index e467524cd4..cc123a497b 100644
--- a/test-files/golden-tests/config/auto-function-metadata/returns-from-special.xml
+++ b/test-files/golden-tests/config/auto-function-metadata/returns-from-special.xml
@@ -186,6 +186,7 @@
   </source>
   <kind>overloads</kind>
   <id>q7aqa6GHOpmWjES40eZPTxdQ3zE=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>ynx5NXMLXqzSXwgOnIP6CHzNx14=</parent>
   <doc-comment>
@@ -215,6 +216,7 @@
   </source>
   <kind>function</kind>
   <id>3QxkEc/c2ugz6330u92HdqOoDNk=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>ynx5NXMLXqzSXwgOnIP6CHzNx14=</parent>
   <doc-comment>
@@ -278,6 +280,7 @@
   </source>
   <kind>function</kind>
   <id>fj22HhjPEq+Xg/+Qrr3suU+8qMs=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>ynx5NXMLXqzSXwgOnIP6CHzNx14=</parent>
   <doc-comment>
@@ -340,6 +343,7 @@
   </source>
   <kind>function</kind>
   <id>KAGpjhkArISJuf2yO8ueGRkoMRY=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>ynx5NXMLXqzSXwgOnIP6CHzNx14=</parent>
   <doc-comment>
@@ -402,6 +406,7 @@
   </source>
   <kind>function</kind>
   <id>nGRGOmpMUWr4ryyahs3rKCCI6w8=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>ynx5NXMLXqzSXwgOnIP6CHzNx14=</parent>
   <doc-comment>
@@ -444,6 +449,7 @@
   </source>
   <kind>function</kind>
   <id>CWQgyDAMsfX65S2osLlxVceQp04=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>ynx5NXMLXqzSXwgOnIP6CHzNx14=</parent>
   <doc-comment>
@@ -492,6 +498,7 @@
   </source>
   <kind>function</kind>
   <id>OKqUHUCCTf6jNFJNn97bqGsSeaw=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>ynx5NXMLXqzSXwgOnIP6CHzNx14=</parent>
   <doc-comment>
@@ -547,6 +554,7 @@
   </source>
   <kind>function</kind>
   <id>KWAu92L4cHasWWof4vEI3DKRMCM=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>ynx5NXMLXqzSXwgOnIP6CHzNx14=</parent>
   <doc-comment>
@@ -605,6 +613,7 @@
   </source>
   <kind>function</kind>
   <id>UKmM2VstAN3S3zdmZKKvDGlIrLM=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>ynx5NXMLXqzSXwgOnIP6CHzNx14=</parent>
   <doc-comment>
@@ -684,6 +693,7 @@
   </source>
   <kind>function</kind>
   <id>B4HRW82Qp1vDOpzQsxPdEsZgycs=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>ynx5NXMLXqzSXwgOnIP6CHzNx14=</parent>
   <doc-comment>
@@ -763,6 +773,7 @@
   </source>
   <kind>function</kind>
   <id>851IpIwjxsx0O/etQzbn4pl99xE=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>ynx5NXMLXqzSXwgOnIP6CHzNx14=</parent>
   <doc-comment>
@@ -842,6 +853,7 @@
   </source>
   <kind>function</kind>
   <id>h8nEEe+LBIHRvU6iRGyqW04tWgU=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>ynx5NXMLXqzSXwgOnIP6CHzNx14=</parent>
   <doc-comment>
@@ -921,6 +933,7 @@
   </source>
   <kind>function</kind>
   <id>cR6bIyYYnXQ30XTeEQusQL16eHI=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>ynx5NXMLXqzSXwgOnIP6CHzNx14=</parent>
   <doc-comment>
@@ -1000,6 +1013,7 @@
   </source>
   <kind>function</kind>
   <id>4tbW1aodVDD/vHYusU0xj6w4Fao=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>ynx5NXMLXqzSXwgOnIP6CHzNx14=</parent>
   <doc-comment>
@@ -1079,6 +1093,7 @@
   </source>
   <kind>function</kind>
   <id>ttkN5+GpWIElN9dfCpsZKm/wHH0=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>ynx5NXMLXqzSXwgOnIP6CHzNx14=</parent>
   <doc-comment>
diff --git a/test-files/golden-tests/config/auto-function-objects/no-auto-function-objects.xml b/test-files/golden-tests/config/auto-function-objects/no-auto-function-objects.xml
index 6b5928eec4..fde6709801 100644
--- a/test-files/golden-tests/config/auto-function-objects/no-auto-function-objects.xml
+++ b/test-files/golden-tests/config/auto-function-objects/no-auto-function-objects.xml
@@ -80,6 +80,7 @@
   </source>
   <kind>function</kind>
   <id>11lTy9LCvZbcyORLiyJVo85H/ZE=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>atJ19SGK6qD7vR0+k/Q9OWKCjbM=</parent>
   <doc-comment>
@@ -163,6 +164,7 @@
   </source>
   <kind>function</kind>
   <id>7NEMEfqJ2qq9ya8mcW1t7V5K0DA=</id>
+  <access>public</access>
   <extraction>implementation-defined</extraction>
   <parent>8GvlDu9dAD8UG/F0pZ8sAX1YesQ=</parent>
   <doc-comment>
diff --git a/test-files/golden-tests/config/auto-relates/derived.xml b/test-files/golden-tests/config/auto-relates/derived.xml
index a106f5f91a..0ab64ee2d9 100644
--- a/test-files/golden-tests/config/auto-relates/derived.xml
+++ b/test-files/golden-tests/config/auto-relates/derived.xml
@@ -78,6 +78,7 @@
         <identifier>ABase</identifier>
       </name>
     </named>
+    <access>public</access>
   </base>
   <record-interface>
     <record-tranche>
@@ -212,6 +213,7 @@
         <identifier>ABase</identifier>
       </name>
     </named>
+    <access>public</access>
   </base>
   <derived>uzZSeC7XnVBhNXRKG+8nlEGg+Is=</derived>
   <record-interface>
@@ -288,6 +290,7 @@
         <identifier>AView</identifier>
       </name>
     </named>
+    <access>public</access>
   </base>
   <record-interface>
     <record-tranche>
diff --git a/test-files/golden-tests/config/auto-relates/remove-friend.xml b/test-files/golden-tests/config/auto-relates/remove-friend.xml
index 078b9abe16..2b02729737 100644
--- a/test-files/golden-tests/config/auto-relates/remove-friend.xml
+++ b/test-files/golden-tests/config/auto-relates/remove-friend.xml
@@ -136,6 +136,7 @@
   </source>
   <kind>function</kind>
   <id>kibUx6k1SXB+HsXkRXroJl9f59w=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>//////////////////////////8=</parent>
   <doc-comment>
diff --git a/test-files/golden-tests/config/extract-friends/extract-friends.xml b/test-files/golden-tests/config/extract-friends/extract-friends.xml
index d10d24ae21..fa6f705b19 100644
--- a/test-files/golden-tests/config/extract-friends/extract-friends.xml
+++ b/test-files/golden-tests/config/extract-friends/extract-friends.xml
@@ -118,6 +118,7 @@
   </source>
   <kind>function</kind>
   <id>oizNQDy8La+BwcGOBpMPC63TA5U=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>jTCZUvygQOxo6L+VfFZcAI6KU0Y=</parent>
   <named>
diff --git a/test-files/golden-tests/config/extract-friends/no-extract-friends.xml b/test-files/golden-tests/config/extract-friends/no-extract-friends.xml
index d6632f40c4..e9d954e944 100644
--- a/test-files/golden-tests/config/extract-friends/no-extract-friends.xml
+++ b/test-files/golden-tests/config/extract-friends/no-extract-friends.xml
@@ -118,6 +118,7 @@
   </source>
   <kind>function</kind>
   <id>oizNQDy8La+BwcGOBpMPC63TA5U=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>jTCZUvygQOxo6L+VfFZcAI6KU0Y=</parent>
   <named>
diff --git a/test-files/golden-tests/config/extract-implicit-specializations/base.xml b/test-files/golden-tests/config/extract-implicit-specializations/base.xml
index 1f3c4d72d0..aabb782211 100644
--- a/test-files/golden-tests/config/extract-implicit-specializations/base.xml
+++ b/test-files/golden-tests/config/extract-implicit-specializations/base.xml
@@ -35,6 +35,7 @@
         <identifier>B</identifier>
       </name>
     </named>
+    <access>public</access>
   </base>
   <record-interface>
     <record-tranche>
@@ -58,6 +59,7 @@
   </source>
   <kind>function</kind>
   <id>TokaYJ9UI6a6x0IfsXTGliIuJ9k=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>3JsK1DO0O+wZhv+0meptQrbs3fY=</parent>
   <named>
@@ -107,6 +109,7 @@
   </source>
   <kind>function</kind>
   <id>TokaYJ9UI6a6x0IfsXTGliIuJ9k=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>3JsK1DO0O+wZhv+0meptQrbs3fY=</parent>
   <named>
diff --git a/test-files/golden-tests/config/extract-implicit-specializations/extract-implicit-specializations.xml b/test-files/golden-tests/config/extract-implicit-specializations/extract-implicit-specializations.xml
index 85b0d5062a..5163028cab 100644
--- a/test-files/golden-tests/config/extract-implicit-specializations/extract-implicit-specializations.xml
+++ b/test-files/golden-tests/config/extract-implicit-specializations/extract-implicit-specializations.xml
@@ -36,6 +36,7 @@
         <identifier>B</identifier>
       </name>
     </named>
+    <access>public</access>
   </base>
   <record-interface>
     <record-tranche>
@@ -59,6 +60,7 @@
   </source>
   <kind>function</kind>
   <id>i2Kh9WfDseks8Lnr/kapVaR9r4g=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <is-copy-from-inherited>1</is-copy-from-inherited>
   <parent>YrPSaKAbmXgzCAX5WByx4eVoqBM=</parent>
@@ -118,6 +120,7 @@
   </source>
   <kind>function</kind>
   <id>yNvFAvs6ngp6sqCFBzu5nPSIyfk=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>Bu/3QcmNOdsc7RSM3OKHnuCxGPU=</parent>
   <l-value-reference>
diff --git a/test-files/golden-tests/config/extract-implicit-specializations/no-extract-implicit-specializations.xml b/test-files/golden-tests/config/extract-implicit-specializations/no-extract-implicit-specializations.xml
index af53aa5d12..adbba56e2c 100644
--- a/test-files/golden-tests/config/extract-implicit-specializations/no-extract-implicit-specializations.xml
+++ b/test-files/golden-tests/config/extract-implicit-specializations/no-extract-implicit-specializations.xml
@@ -36,6 +36,7 @@
         <identifier>B</identifier>
       </name>
     </named>
+    <access>public</access>
   </base>
   <record-interface>
     <record-tranche>
@@ -59,6 +60,7 @@
   </source>
   <kind>function</kind>
   <id>yNvFAvs6ngp6sqCFBzu5nPSIyfk=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>Bu/3QcmNOdsc7RSM3OKHnuCxGPU=</parent>
   <l-value-reference>
@@ -117,6 +119,7 @@
   </source>
   <kind>function</kind>
   <id>yNvFAvs6ngp6sqCFBzu5nPSIyfk=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>Bu/3QcmNOdsc7RSM3OKHnuCxGPU=</parent>
   <l-value-reference>
diff --git a/test-files/golden-tests/config/extract-private-virtual/extract-private-virtual.xml b/test-files/golden-tests/config/extract-private-virtual/extract-private-virtual.xml
index e107e60520..e02a648baf 100644
--- a/test-files/golden-tests/config/extract-private-virtual/extract-private-virtual.xml
+++ b/test-files/golden-tests/config/extract-private-virtual/extract-private-virtual.xml
@@ -49,6 +49,7 @@
   </source>
   <kind>function</kind>
   <id>hLXvGC+nOrLQRH9lODKkgi/oUas=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>YrPSaKAbmXgzCAX5WByx4eVoqBM=</parent>
   <named>
@@ -74,6 +75,7 @@
   </source>
   <kind>function</kind>
   <id>IWP5ktgJAZgjufMQ6EE1eb6mm9g=</id>
+  <access>private</access>
   <extraction>regular</extraction>
   <parent>YrPSaKAbmXgzCAX5WByx4eVoqBM=</parent>
   <named>
diff --git a/test-files/golden-tests/config/extract-private-virtual/no-extract-private-virtual.xml b/test-files/golden-tests/config/extract-private-virtual/no-extract-private-virtual.xml
index 0a275370d5..184d0caaa3 100644
--- a/test-files/golden-tests/config/extract-private-virtual/no-extract-private-virtual.xml
+++ b/test-files/golden-tests/config/extract-private-virtual/no-extract-private-virtual.xml
@@ -48,6 +48,7 @@
   </source>
   <kind>function</kind>
   <id>hLXvGC+nOrLQRH9lODKkgi/oUas=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>YrPSaKAbmXgzCAX5WByx4eVoqBM=</parent>
   <named>
diff --git a/test-files/golden-tests/config/inherit-base-members/base-overload-set.xml b/test-files/golden-tests/config/inherit-base-members/base-overload-set.xml
index 44531633fc..b9e16c4c72 100644
--- a/test-files/golden-tests/config/inherit-base-members/base-overload-set.xml
+++ b/test-files/golden-tests/config/inherit-base-members/base-overload-set.xml
@@ -36,6 +36,7 @@
         <identifier>ConstBase</identifier>
       </name>
     </named>
+    <access>public</access>
   </base>
   <derived>BrX2oZup9qgy4SfJloKCuUYZshA=</derived>
   <record-interface>
@@ -66,6 +67,7 @@
   </source>
   <kind>overloads</kind>
   <id>QHJvDmodINf8DNWem4Zc6XU8nvk=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>ZIHuevKEF1ZlGviVwUZq1CEFBRc=</parent>
   <func-class>normal</func-class>
@@ -92,6 +94,7 @@
   </source>
   <kind>function</kind>
   <id>pSUoXAwvwzBmhWkB1ABLnXwZdkY=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>ZIHuevKEF1ZlGviVwUZq1CEFBRc=</parent>
   <l-value-reference>
@@ -117,6 +120,7 @@
   </source>
   <kind>function</kind>
   <id>hbsgojOPl9JVh9Nb8C7b2dZ389k=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>ZIHuevKEF1ZlGviVwUZq1CEFBRc=</parent>
   <l-value-reference>
@@ -154,6 +158,7 @@
         <identifier>Base</identifier>
       </name>
     </named>
+    <access>public</access>
   </base>
   <record-interface>
     <record-tranche>
@@ -183,6 +188,7 @@
   </source>
   <kind>overloads</kind>
   <id>QHJvDmodINf8DNWem4Zc6XU8nvk=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>ZIHuevKEF1ZlGviVwUZq1CEFBRc=</parent>
   <func-class>normal</func-class>
@@ -209,6 +215,7 @@
   </source>
   <kind>function</kind>
   <id>pSUoXAwvwzBmhWkB1ABLnXwZdkY=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>ZIHuevKEF1ZlGviVwUZq1CEFBRc=</parent>
   <l-value-reference>
@@ -234,6 +241,7 @@
   </source>
   <kind>function</kind>
   <id>hbsgojOPl9JVh9Nb8C7b2dZ389k=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>ZIHuevKEF1ZlGviVwUZq1CEFBRc=</parent>
   <l-value-reference>
@@ -286,6 +294,7 @@
   </source>
   <kind>function</kind>
   <id>Q5DcZVrEwKvh1JSM5lUHNrOvQlU=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>2iD5AHuu7qrCVJnAauz4We2QkKU=</parent>
   <l-value-reference>
diff --git a/test-files/golden-tests/config/inherit-base-members/copy-dependencies.xml b/test-files/golden-tests/config/inherit-base-members/copy-dependencies.xml
index 0f436fdeba..2d42a4e49e 100644
--- a/test-files/golden-tests/config/inherit-base-members/copy-dependencies.xml
+++ b/test-files/golden-tests/config/inherit-base-members/copy-dependencies.xml
@@ -49,6 +49,7 @@
         <identifier>base_base</identifier>
       </name>
     </named>
+    <access>public</access>
   </base>
   <derived>ABxWcxit2TyVLv16ZxoJKAc6LKw=</derived>
   <record-interface>
@@ -81,6 +82,7 @@
   </source>
   <kind>function</kind>
   <id>2D7yc6q3buDhuPwzpn4pWzbu8ls=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>/PcbLGG9Q7grLgSOV/R/ZnEg9Cs=</parent>
   <doc-comment>
@@ -124,6 +126,7 @@
   </source>
   <kind>function</kind>
   <id>v0BroyWjs67MHzc1SyTlXrSxn8M=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>sk8HTAQHhzXfZej4IJliADonAJQ=</parent>
   <doc-comment>
@@ -167,6 +170,7 @@
   </source>
   <kind>function</kind>
   <id>ECBBLxlaKar55qA0k1BCFn6MdH8=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>sk8HTAQHhzXfZej4IJliADonAJQ=</parent>
   <doc-comment>
@@ -210,6 +214,7 @@
   </source>
   <kind>function</kind>
   <id>aYhSUMJkgCRo3AZmBb/rre04Ghg=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>sk8HTAQHhzXfZej4IJliADonAJQ=</parent>
   <doc-comment>
@@ -253,6 +258,7 @@
   </source>
   <kind>function</kind>
   <id>MEPVWyGd8KdZFR1kBYlQMgPyQlo=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>/PcbLGG9Q7grLgSOV/R/ZnEg9Cs=</parent>
   <doc-comment>
@@ -296,6 +302,7 @@
   </source>
   <kind>function</kind>
   <id>TaKAQiDmx8UXkT9p/momqiOZyHU=</id>
+  <access>protected</access>
   <extraction>regular</extraction>
   <parent>sk8HTAQHhzXfZej4IJliADonAJQ=</parent>
   <doc-comment>
@@ -339,6 +346,7 @@
   </source>
   <kind>function</kind>
   <id>eHxe3z0iWUXdcNyXK0PD2+6DRbs=</id>
+  <access>protected</access>
   <extraction>regular</extraction>
   <parent>sk8HTAQHhzXfZej4IJliADonAJQ=</parent>
   <doc-comment>
@@ -382,6 +390,7 @@
   </source>
   <kind>function</kind>
   <id>KGOrnDVJV2nPDK1hlkvBm6diYXY=</id>
+  <access>protected</access>
   <extraction>regular</extraction>
   <parent>sk8HTAQHhzXfZej4IJliADonAJQ=</parent>
   <doc-comment>
@@ -462,6 +471,7 @@
   </source>
   <kind>function</kind>
   <id>2D7yc6q3buDhuPwzpn4pWzbu8ls=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>/PcbLGG9Q7grLgSOV/R/ZnEg9Cs=</parent>
   <doc-comment>
@@ -505,6 +515,7 @@
   </source>
   <kind>function</kind>
   <id>MEPVWyGd8KdZFR1kBYlQMgPyQlo=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>/PcbLGG9Q7grLgSOV/R/ZnEg9Cs=</parent>
   <doc-comment>
@@ -568,6 +579,7 @@
         <identifier>base</identifier>
       </name>
     </named>
+    <access>public</access>
   </base>
   <base>
     <named>
@@ -577,6 +589,7 @@
         <identifier>excluded_base</identifier>
       </name>
     </named>
+    <access>public</access>
   </base>
   <record-interface>
     <record-tranche>
@@ -612,6 +625,7 @@
   </source>
   <kind>function</kind>
   <id>2D7yc6q3buDhuPwzpn4pWzbu8ls=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>/PcbLGG9Q7grLgSOV/R/ZnEg9Cs=</parent>
   <doc-comment>
@@ -655,6 +669,7 @@
   </source>
   <kind>function</kind>
   <id>v0BroyWjs67MHzc1SyTlXrSxn8M=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>sk8HTAQHhzXfZej4IJliADonAJQ=</parent>
   <doc-comment>
@@ -698,6 +713,7 @@
   </source>
   <kind>function</kind>
   <id>ECBBLxlaKar55qA0k1BCFn6MdH8=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>sk8HTAQHhzXfZej4IJliADonAJQ=</parent>
   <doc-comment>
@@ -741,6 +757,7 @@
   </source>
   <kind>function</kind>
   <id>MGQhB2O6ghdJWit6wao+PsH30Ew=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>ABxWcxit2TyVLv16ZxoJKAc6LKw=</parent>
   <doc-comment>
@@ -784,6 +801,7 @@
   </source>
   <kind>function</kind>
   <id>MEPVWyGd8KdZFR1kBYlQMgPyQlo=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>/PcbLGG9Q7grLgSOV/R/ZnEg9Cs=</parent>
   <doc-comment>
@@ -827,6 +845,7 @@
   </source>
   <kind>function</kind>
   <id>rTSnS8Pv8GoWusQQE42y0pgN4cw=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>ABxWcxit2TyVLv16ZxoJKAc6LKw=</parent>
   <doc-comment>
@@ -870,6 +889,7 @@
   </source>
   <kind>function</kind>
   <id>P1Eq799RJkNMSTci+0jy+ZejsyU=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <is-copy-from-inherited>1</is-copy-from-inherited>
   <parent>ABxWcxit2TyVLv16ZxoJKAc6LKw=</parent>
@@ -907,6 +927,7 @@
   </source>
   <kind>function</kind>
   <id>TaKAQiDmx8UXkT9p/momqiOZyHU=</id>
+  <access>protected</access>
   <extraction>regular</extraction>
   <parent>sk8HTAQHhzXfZej4IJliADonAJQ=</parent>
   <doc-comment>
@@ -950,6 +971,7 @@
   </source>
   <kind>function</kind>
   <id>eHxe3z0iWUXdcNyXK0PD2+6DRbs=</id>
+  <access>protected</access>
   <extraction>regular</extraction>
   <parent>sk8HTAQHhzXfZej4IJliADonAJQ=</parent>
   <doc-comment>
@@ -993,6 +1015,7 @@
   </source>
   <kind>function</kind>
   <id>KGOrnDVJV2nPDK1hlkvBm6diYXY=</id>
+  <access>protected</access>
   <extraction>regular</extraction>
   <parent>sk8HTAQHhzXfZej4IJliADonAJQ=</parent>
   <doc-comment>
@@ -1036,6 +1059,7 @@
   </source>
   <kind>function</kind>
   <id>oW3pQYXjjv2wrXIwIceF6Xd8nTA=</id>
+  <access>protected</access>
   <extraction>regular</extraction>
   <is-copy-from-inherited>1</is-copy-from-inherited>
   <parent>ABxWcxit2TyVLv16ZxoJKAc6LKw=</parent>
@@ -1073,6 +1097,7 @@
   </source>
   <kind>function</kind>
   <id>IYnrJp6ur6C+AiuhFl5x1YPnxkM=</id>
+  <access>protected</access>
   <extraction>regular</extraction>
   <is-copy-from-inherited>1</is-copy-from-inherited>
   <parent>ABxWcxit2TyVLv16ZxoJKAc6LKw=</parent>
@@ -1130,6 +1155,7 @@
         <identifier>base</identifier>
       </name>
     </named>
+    <access>private</access>
   </base>
   <base>
     <named>
@@ -1139,6 +1165,7 @@
         <identifier>excluded_base</identifier>
       </name>
     </named>
+    <access>private</access>
   </base>
   <record-interface>
     <record-tranche>
@@ -1164,6 +1191,7 @@
   </source>
   <kind>function</kind>
   <id>9wqRoOH7cwNhkz5vwpTHLeb01BY=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>aiF6nWGZXbG8UfC75J5tNuoPMRc=</parent>
   <doc-comment>
@@ -1207,6 +1235,7 @@
   </source>
   <kind>function</kind>
   <id>NJYWKnKWmizdaSr1ldC7FGh7fD0=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>aiF6nWGZXbG8UfC75J5tNuoPMRc=</parent>
   <doc-comment>
@@ -1270,6 +1299,7 @@
         <identifier>base</identifier>
       </name>
     </named>
+    <access>protected</access>
   </base>
   <base>
     <named>
@@ -1279,6 +1309,7 @@
         <identifier>excluded_base</identifier>
       </name>
     </named>
+    <access>protected</access>
   </base>
   <record-interface>
     <record-tranche>
@@ -1315,6 +1346,7 @@
   </source>
   <kind>function</kind>
   <id>oVVGDloOS5F7d4VIcKLc0YpnsiE=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>KpfFXd3FeSffU3rGswegSIkkCrM=</parent>
   <doc-comment>
@@ -1358,6 +1390,7 @@
   </source>
   <kind>function</kind>
   <id>4ZJznHda5QNdk/tsMca4Psswlj0=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>KpfFXd3FeSffU3rGswegSIkkCrM=</parent>
   <doc-comment>
@@ -1401,6 +1434,7 @@
   </source>
   <kind>function</kind>
   <id>2D7yc6q3buDhuPwzpn4pWzbu8ls=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>/PcbLGG9Q7grLgSOV/R/ZnEg9Cs=</parent>
   <doc-comment>
@@ -1444,6 +1478,7 @@
   </source>
   <kind>function</kind>
   <id>v0BroyWjs67MHzc1SyTlXrSxn8M=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>sk8HTAQHhzXfZej4IJliADonAJQ=</parent>
   <doc-comment>
@@ -1487,6 +1522,7 @@
   </source>
   <kind>function</kind>
   <id>ECBBLxlaKar55qA0k1BCFn6MdH8=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>sk8HTAQHhzXfZej4IJliADonAJQ=</parent>
   <doc-comment>
@@ -1530,6 +1566,7 @@
   </source>
   <kind>function</kind>
   <id>aYhSUMJkgCRo3AZmBb/rre04Ghg=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>sk8HTAQHhzXfZej4IJliADonAJQ=</parent>
   <doc-comment>
@@ -1573,6 +1610,7 @@
   </source>
   <kind>function</kind>
   <id>MEPVWyGd8KdZFR1kBYlQMgPyQlo=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>/PcbLGG9Q7grLgSOV/R/ZnEg9Cs=</parent>
   <doc-comment>
@@ -1616,6 +1654,7 @@
   </source>
   <kind>function</kind>
   <id>TaKAQiDmx8UXkT9p/momqiOZyHU=</id>
+  <access>protected</access>
   <extraction>regular</extraction>
   <parent>sk8HTAQHhzXfZej4IJliADonAJQ=</parent>
   <doc-comment>
@@ -1659,6 +1698,7 @@
   </source>
   <kind>function</kind>
   <id>eHxe3z0iWUXdcNyXK0PD2+6DRbs=</id>
+  <access>protected</access>
   <extraction>regular</extraction>
   <parent>sk8HTAQHhzXfZej4IJliADonAJQ=</parent>
   <doc-comment>
@@ -1702,6 +1742,7 @@
   </source>
   <kind>function</kind>
   <id>KGOrnDVJV2nPDK1hlkvBm6diYXY=</id>
+  <access>protected</access>
   <extraction>regular</extraction>
   <parent>sk8HTAQHhzXfZej4IJliADonAJQ=</parent>
   <doc-comment>
@@ -1745,6 +1786,7 @@
   </source>
   <kind>function</kind>
   <id>KdkXQxu2xOfAXegJgCMmLcFq8MM=</id>
+  <access>protected</access>
   <extraction>regular</extraction>
   <is-copy-from-inherited>1</is-copy-from-inherited>
   <parent>KpfFXd3FeSffU3rGswegSIkkCrM=</parent>
@@ -1782,6 +1824,7 @@
   </source>
   <kind>function</kind>
   <id>UysvazUbtV39Omg33c9Me+Gri/M=</id>
+  <access>protected</access>
   <extraction>regular</extraction>
   <is-copy-from-inherited>1</is-copy-from-inherited>
   <parent>KpfFXd3FeSffU3rGswegSIkkCrM=</parent>
@@ -1819,6 +1862,7 @@
   </source>
   <kind>function</kind>
   <id>H8wEIL8+8s3iNqadfPsH1HWRQU4=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <is-copy-from-inherited>1</is-copy-from-inherited>
   <parent>KpfFXd3FeSffU3rGswegSIkkCrM=</parent>
diff --git a/test-files/golden-tests/config/inherit-base-members/copy.xml b/test-files/golden-tests/config/inherit-base-members/copy.xml
index c14839ab4e..e56cf4b9cc 100644
--- a/test-files/golden-tests/config/inherit-base-members/copy.xml
+++ b/test-files/golden-tests/config/inherit-base-members/copy.xml
@@ -49,6 +49,7 @@
         <identifier>base_base</identifier>
       </name>
     </named>
+    <access>public</access>
   </base>
   <derived>ABxWcxit2TyVLv16ZxoJKAc6LKw=</derived>
   <record-interface>
@@ -81,6 +82,7 @@
   </source>
   <kind>function</kind>
   <id>kuwWLj5gwO5grGVaKw+6QPB7t2k=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <is-copy-from-inherited>1</is-copy-from-inherited>
   <parent>sk8HTAQHhzXfZej4IJliADonAJQ=</parent>
@@ -125,6 +127,7 @@
   </source>
   <kind>function</kind>
   <id>v0BroyWjs67MHzc1SyTlXrSxn8M=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>sk8HTAQHhzXfZej4IJliADonAJQ=</parent>
   <doc-comment>
@@ -168,6 +171,7 @@
   </source>
   <kind>function</kind>
   <id>ECBBLxlaKar55qA0k1BCFn6MdH8=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>sk8HTAQHhzXfZej4IJliADonAJQ=</parent>
   <doc-comment>
@@ -211,6 +215,7 @@
   </source>
   <kind>function</kind>
   <id>aYhSUMJkgCRo3AZmBb/rre04Ghg=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>sk8HTAQHhzXfZej4IJliADonAJQ=</parent>
   <doc-comment>
@@ -254,6 +259,7 @@
   </source>
   <kind>function</kind>
   <id>QFvlG37sjpI5QZrNwpdQ06VrrSM=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <is-copy-from-inherited>1</is-copy-from-inherited>
   <parent>sk8HTAQHhzXfZej4IJliADonAJQ=</parent>
@@ -298,6 +304,7 @@
   </source>
   <kind>function</kind>
   <id>TaKAQiDmx8UXkT9p/momqiOZyHU=</id>
+  <access>protected</access>
   <extraction>regular</extraction>
   <parent>sk8HTAQHhzXfZej4IJliADonAJQ=</parent>
   <doc-comment>
@@ -341,6 +348,7 @@
   </source>
   <kind>function</kind>
   <id>eHxe3z0iWUXdcNyXK0PD2+6DRbs=</id>
+  <access>protected</access>
   <extraction>regular</extraction>
   <parent>sk8HTAQHhzXfZej4IJliADonAJQ=</parent>
   <doc-comment>
@@ -384,6 +392,7 @@
   </source>
   <kind>function</kind>
   <id>KGOrnDVJV2nPDK1hlkvBm6diYXY=</id>
+  <access>protected</access>
   <extraction>regular</extraction>
   <parent>sk8HTAQHhzXfZej4IJliADonAJQ=</parent>
   <doc-comment>
@@ -464,6 +473,7 @@
   </source>
   <kind>function</kind>
   <id>2D7yc6q3buDhuPwzpn4pWzbu8ls=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>/PcbLGG9Q7grLgSOV/R/ZnEg9Cs=</parent>
   <doc-comment>
@@ -507,6 +517,7 @@
   </source>
   <kind>function</kind>
   <id>MEPVWyGd8KdZFR1kBYlQMgPyQlo=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>/PcbLGG9Q7grLgSOV/R/ZnEg9Cs=</parent>
   <doc-comment>
@@ -570,6 +581,7 @@
         <identifier>base</identifier>
       </name>
     </named>
+    <access>public</access>
   </base>
   <base>
     <named>
@@ -579,6 +591,7 @@
         <identifier>excluded_base</identifier>
       </name>
     </named>
+    <access>public</access>
   </base>
   <record-interface>
     <record-tranche>
@@ -614,6 +627,7 @@
   </source>
   <kind>function</kind>
   <id>Tt5J064ctbXRBv/qZbRJxCebPs0=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <is-copy-from-inherited>1</is-copy-from-inherited>
   <parent>ABxWcxit2TyVLv16ZxoJKAc6LKw=</parent>
@@ -658,6 +672,7 @@
   </source>
   <kind>function</kind>
   <id>Ew/9fVRXcBGEFLrWpdrt3lktMto=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <is-copy-from-inherited>1</is-copy-from-inherited>
   <parent>ABxWcxit2TyVLv16ZxoJKAc6LKw=</parent>
@@ -702,6 +717,7 @@
   </source>
   <kind>function</kind>
   <id>VrpbGEQk6hRwzmAJBudLSCOZh7Y=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <is-copy-from-inherited>1</is-copy-from-inherited>
   <parent>ABxWcxit2TyVLv16ZxoJKAc6LKw=</parent>
@@ -746,6 +762,7 @@
   </source>
   <kind>function</kind>
   <id>MGQhB2O6ghdJWit6wao+PsH30Ew=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>ABxWcxit2TyVLv16ZxoJKAc6LKw=</parent>
   <doc-comment>
@@ -789,6 +806,7 @@
   </source>
   <kind>function</kind>
   <id>3vFJsBKleDdECAQKJp6m7566RQQ=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <is-copy-from-inherited>1</is-copy-from-inherited>
   <parent>ABxWcxit2TyVLv16ZxoJKAc6LKw=</parent>
@@ -833,6 +851,7 @@
   </source>
   <kind>function</kind>
   <id>rTSnS8Pv8GoWusQQE42y0pgN4cw=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>ABxWcxit2TyVLv16ZxoJKAc6LKw=</parent>
   <doc-comment>
@@ -876,6 +895,7 @@
   </source>
   <kind>function</kind>
   <id>P1Eq799RJkNMSTci+0jy+ZejsyU=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <is-copy-from-inherited>1</is-copy-from-inherited>
   <parent>ABxWcxit2TyVLv16ZxoJKAc6LKw=</parent>
@@ -913,6 +933,7 @@
   </source>
   <kind>function</kind>
   <id>J8r4aXb9++EldZDgHmv2rU2GhW0=</id>
+  <access>protected</access>
   <extraction>regular</extraction>
   <is-copy-from-inherited>1</is-copy-from-inherited>
   <parent>ABxWcxit2TyVLv16ZxoJKAc6LKw=</parent>
@@ -957,6 +978,7 @@
   </source>
   <kind>function</kind>
   <id>TeAnpSrYd1HafyFwmcm4jG6bj2w=</id>
+  <access>protected</access>
   <extraction>regular</extraction>
   <is-copy-from-inherited>1</is-copy-from-inherited>
   <parent>ABxWcxit2TyVLv16ZxoJKAc6LKw=</parent>
@@ -1001,6 +1023,7 @@
   </source>
   <kind>function</kind>
   <id>1BMmFoheKBz9kYkFKzXHyfWZMQg=</id>
+  <access>protected</access>
   <extraction>regular</extraction>
   <is-copy-from-inherited>1</is-copy-from-inherited>
   <parent>ABxWcxit2TyVLv16ZxoJKAc6LKw=</parent>
@@ -1045,6 +1068,7 @@
   </source>
   <kind>function</kind>
   <id>oW3pQYXjjv2wrXIwIceF6Xd8nTA=</id>
+  <access>protected</access>
   <extraction>regular</extraction>
   <is-copy-from-inherited>1</is-copy-from-inherited>
   <parent>ABxWcxit2TyVLv16ZxoJKAc6LKw=</parent>
@@ -1082,6 +1106,7 @@
   </source>
   <kind>function</kind>
   <id>IYnrJp6ur6C+AiuhFl5x1YPnxkM=</id>
+  <access>protected</access>
   <extraction>regular</extraction>
   <is-copy-from-inherited>1</is-copy-from-inherited>
   <parent>ABxWcxit2TyVLv16ZxoJKAc6LKw=</parent>
@@ -1139,6 +1164,7 @@
         <identifier>base</identifier>
       </name>
     </named>
+    <access>private</access>
   </base>
   <base>
     <named>
@@ -1148,6 +1174,7 @@
         <identifier>excluded_base</identifier>
       </name>
     </named>
+    <access>private</access>
   </base>
   <record-interface>
     <record-tranche>
@@ -1173,6 +1200,7 @@
   </source>
   <kind>function</kind>
   <id>9wqRoOH7cwNhkz5vwpTHLeb01BY=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>aiF6nWGZXbG8UfC75J5tNuoPMRc=</parent>
   <doc-comment>
@@ -1216,6 +1244,7 @@
   </source>
   <kind>function</kind>
   <id>NJYWKnKWmizdaSr1ldC7FGh7fD0=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>aiF6nWGZXbG8UfC75J5tNuoPMRc=</parent>
   <doc-comment>
@@ -1279,6 +1308,7 @@
         <identifier>base</identifier>
       </name>
     </named>
+    <access>protected</access>
   </base>
   <base>
     <named>
@@ -1288,6 +1318,7 @@
         <identifier>excluded_base</identifier>
       </name>
     </named>
+    <access>protected</access>
   </base>
   <record-interface>
     <record-tranche>
@@ -1324,6 +1355,7 @@
   </source>
   <kind>function</kind>
   <id>oVVGDloOS5F7d4VIcKLc0YpnsiE=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>KpfFXd3FeSffU3rGswegSIkkCrM=</parent>
   <doc-comment>
@@ -1367,6 +1399,7 @@
   </source>
   <kind>function</kind>
   <id>4ZJznHda5QNdk/tsMca4Psswlj0=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>KpfFXd3FeSffU3rGswegSIkkCrM=</parent>
   <doc-comment>
@@ -1410,6 +1443,7 @@
   </source>
   <kind>function</kind>
   <id>fmeE0HcB3oP1daboxYZOH/pxDwU=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <is-copy-from-inherited>1</is-copy-from-inherited>
   <parent>KpfFXd3FeSffU3rGswegSIkkCrM=</parent>
@@ -1454,6 +1488,7 @@
   </source>
   <kind>function</kind>
   <id>vIj2+WtgSIJo5ner9NMU/5gSQaE=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <is-copy-from-inherited>1</is-copy-from-inherited>
   <parent>KpfFXd3FeSffU3rGswegSIkkCrM=</parent>
@@ -1498,6 +1533,7 @@
   </source>
   <kind>function</kind>
   <id>8yYxCHdO5GHsa9EDJUegzWA1gsM=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <is-copy-from-inherited>1</is-copy-from-inherited>
   <parent>KpfFXd3FeSffU3rGswegSIkkCrM=</parent>
@@ -1542,6 +1578,7 @@
   </source>
   <kind>function</kind>
   <id>9BTAtv04iyibbbELEv2rF8AH+Uc=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <is-copy-from-inherited>1</is-copy-from-inherited>
   <parent>KpfFXd3FeSffU3rGswegSIkkCrM=</parent>
@@ -1586,6 +1623,7 @@
   </source>
   <kind>function</kind>
   <id>Jif8i0TqV0aN5cctSlCwsvdid/s=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <is-copy-from-inherited>1</is-copy-from-inherited>
   <parent>KpfFXd3FeSffU3rGswegSIkkCrM=</parent>
@@ -1630,6 +1668,7 @@
   </source>
   <kind>function</kind>
   <id>99dMSYjVFm3pIP2+aQ+9NrCmzuI=</id>
+  <access>protected</access>
   <extraction>regular</extraction>
   <is-copy-from-inherited>1</is-copy-from-inherited>
   <parent>KpfFXd3FeSffU3rGswegSIkkCrM=</parent>
@@ -1674,6 +1713,7 @@
   </source>
   <kind>function</kind>
   <id>P4XIUNZt183bxiDCnXrNw4kbmkg=</id>
+  <access>protected</access>
   <extraction>regular</extraction>
   <is-copy-from-inherited>1</is-copy-from-inherited>
   <parent>KpfFXd3FeSffU3rGswegSIkkCrM=</parent>
@@ -1718,6 +1758,7 @@
   </source>
   <kind>function</kind>
   <id>ZJGKp3yoIaFScOAN2naqfrJMlQQ=</id>
+  <access>protected</access>
   <extraction>regular</extraction>
   <is-copy-from-inherited>1</is-copy-from-inherited>
   <parent>KpfFXd3FeSffU3rGswegSIkkCrM=</parent>
@@ -1762,6 +1803,7 @@
   </source>
   <kind>function</kind>
   <id>KdkXQxu2xOfAXegJgCMmLcFq8MM=</id>
+  <access>protected</access>
   <extraction>regular</extraction>
   <is-copy-from-inherited>1</is-copy-from-inherited>
   <parent>KpfFXd3FeSffU3rGswegSIkkCrM=</parent>
@@ -1799,6 +1841,7 @@
   </source>
   <kind>function</kind>
   <id>UysvazUbtV39Omg33c9Me+Gri/M=</id>
+  <access>protected</access>
   <extraction>regular</extraction>
   <is-copy-from-inherited>1</is-copy-from-inherited>
   <parent>KpfFXd3FeSffU3rGswegSIkkCrM=</parent>
@@ -1836,6 +1879,7 @@
   </source>
   <kind>function</kind>
   <id>H8wEIL8+8s3iNqadfPsH1HWRQU4=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <is-copy-from-inherited>1</is-copy-from-inherited>
   <parent>KpfFXd3FeSffU3rGswegSIkkCrM=</parent>
diff --git a/test-files/golden-tests/config/inherit-base-members/impl-defined-base.xml b/test-files/golden-tests/config/inherit-base-members/impl-defined-base.xml
index 113d0568fd..6dda338ba6 100644
--- a/test-files/golden-tests/config/inherit-base-members/impl-defined-base.xml
+++ b/test-files/golden-tests/config/inherit-base-members/impl-defined-base.xml
@@ -68,6 +68,7 @@
   </source>
   <kind>function</kind>
   <id>0k4Wdt7n3RgOCeAZcrhJ7PruWP0=</id>
+  <access>public</access>
   <extraction>implementation-defined</extraction>
   <parent>zJyAW21qgGwkRrS6Ea2uUqKSLhE=</parent>
   <doc-comment>
@@ -116,6 +117,7 @@
         </name>
       </name>
     </named>
+    <access>public</access>
   </base>
   <record-interface>
     <record-tranche>
@@ -141,6 +143,7 @@
   </source>
   <kind>function</kind>
   <id>o0JbdzeoEgGm/tWclYdgORU0Qyw=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <is-copy-from-inherited>1</is-copy-from-inherited>
   <parent>ABxWcxit2TyVLv16ZxoJKAc6LKw=</parent>
@@ -174,6 +177,7 @@
   </source>
   <kind>function</kind>
   <id>LsIEKTwhFIkvPhRlDXC1p7T+GPU=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>ABxWcxit2TyVLv16ZxoJKAc6LKw=</parent>
   <named>
diff --git a/test-files/golden-tests/config/inherit-base-members/never.xml b/test-files/golden-tests/config/inherit-base-members/never.xml
index 0f10005a1c..4b16777941 100644
--- a/test-files/golden-tests/config/inherit-base-members/never.xml
+++ b/test-files/golden-tests/config/inherit-base-members/never.xml
@@ -49,6 +49,7 @@
         <identifier>base_base</identifier>
       </name>
     </named>
+    <access>public</access>
   </base>
   <derived>ABxWcxit2TyVLv16ZxoJKAc6LKw=</derived>
   <record-interface>
@@ -79,6 +80,7 @@
   </source>
   <kind>function</kind>
   <id>v0BroyWjs67MHzc1SyTlXrSxn8M=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>sk8HTAQHhzXfZej4IJliADonAJQ=</parent>
   <doc-comment>
@@ -122,6 +124,7 @@
   </source>
   <kind>function</kind>
   <id>ECBBLxlaKar55qA0k1BCFn6MdH8=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>sk8HTAQHhzXfZej4IJliADonAJQ=</parent>
   <doc-comment>
@@ -165,6 +168,7 @@
   </source>
   <kind>function</kind>
   <id>aYhSUMJkgCRo3AZmBb/rre04Ghg=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>sk8HTAQHhzXfZej4IJliADonAJQ=</parent>
   <doc-comment>
@@ -208,6 +212,7 @@
   </source>
   <kind>function</kind>
   <id>TaKAQiDmx8UXkT9p/momqiOZyHU=</id>
+  <access>protected</access>
   <extraction>regular</extraction>
   <parent>sk8HTAQHhzXfZej4IJliADonAJQ=</parent>
   <doc-comment>
@@ -251,6 +256,7 @@
   </source>
   <kind>function</kind>
   <id>eHxe3z0iWUXdcNyXK0PD2+6DRbs=</id>
+  <access>protected</access>
   <extraction>regular</extraction>
   <parent>sk8HTAQHhzXfZej4IJliADonAJQ=</parent>
   <doc-comment>
@@ -294,6 +300,7 @@
   </source>
   <kind>function</kind>
   <id>KGOrnDVJV2nPDK1hlkvBm6diYXY=</id>
+  <access>protected</access>
   <extraction>regular</extraction>
   <parent>sk8HTAQHhzXfZej4IJliADonAJQ=</parent>
   <doc-comment>
@@ -374,6 +381,7 @@
   </source>
   <kind>function</kind>
   <id>2D7yc6q3buDhuPwzpn4pWzbu8ls=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>/PcbLGG9Q7grLgSOV/R/ZnEg9Cs=</parent>
   <doc-comment>
@@ -417,6 +425,7 @@
   </source>
   <kind>function</kind>
   <id>MEPVWyGd8KdZFR1kBYlQMgPyQlo=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>/PcbLGG9Q7grLgSOV/R/ZnEg9Cs=</parent>
   <doc-comment>
@@ -480,6 +489,7 @@
         <identifier>base</identifier>
       </name>
     </named>
+    <access>public</access>
   </base>
   <base>
     <named>
@@ -489,6 +499,7 @@
         <identifier>excluded_base</identifier>
       </name>
     </named>
+    <access>public</access>
   </base>
   <record-interface>
     <record-tranche>
@@ -514,6 +525,7 @@
   </source>
   <kind>function</kind>
   <id>MGQhB2O6ghdJWit6wao+PsH30Ew=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>ABxWcxit2TyVLv16ZxoJKAc6LKw=</parent>
   <doc-comment>
@@ -557,6 +569,7 @@
   </source>
   <kind>function</kind>
   <id>rTSnS8Pv8GoWusQQE42y0pgN4cw=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>ABxWcxit2TyVLv16ZxoJKAc6LKw=</parent>
   <doc-comment>
@@ -620,6 +633,7 @@
         <identifier>base</identifier>
       </name>
     </named>
+    <access>private</access>
   </base>
   <base>
     <named>
@@ -629,6 +643,7 @@
         <identifier>excluded_base</identifier>
       </name>
     </named>
+    <access>private</access>
   </base>
   <record-interface>
     <record-tranche>
@@ -654,6 +669,7 @@
   </source>
   <kind>function</kind>
   <id>9wqRoOH7cwNhkz5vwpTHLeb01BY=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>aiF6nWGZXbG8UfC75J5tNuoPMRc=</parent>
   <doc-comment>
@@ -697,6 +713,7 @@
   </source>
   <kind>function</kind>
   <id>NJYWKnKWmizdaSr1ldC7FGh7fD0=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>aiF6nWGZXbG8UfC75J5tNuoPMRc=</parent>
   <doc-comment>
@@ -760,6 +777,7 @@
         <identifier>base</identifier>
       </name>
     </named>
+    <access>protected</access>
   </base>
   <base>
     <named>
@@ -769,6 +787,7 @@
         <identifier>excluded_base</identifier>
       </name>
     </named>
+    <access>protected</access>
   </base>
   <record-interface>
     <record-tranche>
@@ -794,6 +813,7 @@
   </source>
   <kind>function</kind>
   <id>oVVGDloOS5F7d4VIcKLc0YpnsiE=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>KpfFXd3FeSffU3rGswegSIkkCrM=</parent>
   <doc-comment>
@@ -837,6 +857,7 @@
   </source>
   <kind>function</kind>
   <id>4ZJznHda5QNdk/tsMca4Psswlj0=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>KpfFXd3FeSffU3rGswegSIkkCrM=</parent>
   <doc-comment>
diff --git a/test-files/golden-tests/config/inherit-base-members/reference.xml b/test-files/golden-tests/config/inherit-base-members/reference.xml
index 3b2028e52b..77954c7822 100644
--- a/test-files/golden-tests/config/inherit-base-members/reference.xml
+++ b/test-files/golden-tests/config/inherit-base-members/reference.xml
@@ -49,6 +49,7 @@
         <identifier>base_base</identifier>
       </name>
     </named>
+    <access>public</access>
   </base>
   <derived>ABxWcxit2TyVLv16ZxoJKAc6LKw=</derived>
   <record-interface>
@@ -81,6 +82,7 @@
   </source>
   <kind>function</kind>
   <id>2D7yc6q3buDhuPwzpn4pWzbu8ls=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>/PcbLGG9Q7grLgSOV/R/ZnEg9Cs=</parent>
   <doc-comment>
@@ -124,6 +126,7 @@
   </source>
   <kind>function</kind>
   <id>v0BroyWjs67MHzc1SyTlXrSxn8M=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>sk8HTAQHhzXfZej4IJliADonAJQ=</parent>
   <doc-comment>
@@ -167,6 +170,7 @@
   </source>
   <kind>function</kind>
   <id>ECBBLxlaKar55qA0k1BCFn6MdH8=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>sk8HTAQHhzXfZej4IJliADonAJQ=</parent>
   <doc-comment>
@@ -210,6 +214,7 @@
   </source>
   <kind>function</kind>
   <id>aYhSUMJkgCRo3AZmBb/rre04Ghg=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>sk8HTAQHhzXfZej4IJliADonAJQ=</parent>
   <doc-comment>
@@ -253,6 +258,7 @@
   </source>
   <kind>function</kind>
   <id>MEPVWyGd8KdZFR1kBYlQMgPyQlo=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>/PcbLGG9Q7grLgSOV/R/ZnEg9Cs=</parent>
   <doc-comment>
@@ -296,6 +302,7 @@
   </source>
   <kind>function</kind>
   <id>TaKAQiDmx8UXkT9p/momqiOZyHU=</id>
+  <access>protected</access>
   <extraction>regular</extraction>
   <parent>sk8HTAQHhzXfZej4IJliADonAJQ=</parent>
   <doc-comment>
@@ -339,6 +346,7 @@
   </source>
   <kind>function</kind>
   <id>eHxe3z0iWUXdcNyXK0PD2+6DRbs=</id>
+  <access>protected</access>
   <extraction>regular</extraction>
   <parent>sk8HTAQHhzXfZej4IJliADonAJQ=</parent>
   <doc-comment>
@@ -382,6 +390,7 @@
   </source>
   <kind>function</kind>
   <id>KGOrnDVJV2nPDK1hlkvBm6diYXY=</id>
+  <access>protected</access>
   <extraction>regular</extraction>
   <parent>sk8HTAQHhzXfZej4IJliADonAJQ=</parent>
   <doc-comment>
@@ -462,6 +471,7 @@
   </source>
   <kind>function</kind>
   <id>2D7yc6q3buDhuPwzpn4pWzbu8ls=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>/PcbLGG9Q7grLgSOV/R/ZnEg9Cs=</parent>
   <doc-comment>
@@ -505,6 +515,7 @@
   </source>
   <kind>function</kind>
   <id>MEPVWyGd8KdZFR1kBYlQMgPyQlo=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>/PcbLGG9Q7grLgSOV/R/ZnEg9Cs=</parent>
   <doc-comment>
@@ -568,6 +579,7 @@
         <identifier>base</identifier>
       </name>
     </named>
+    <access>public</access>
   </base>
   <base>
     <named>
@@ -577,6 +589,7 @@
         <identifier>excluded_base</identifier>
       </name>
     </named>
+    <access>public</access>
   </base>
   <record-interface>
     <record-tranche>
@@ -609,6 +622,7 @@
   </source>
   <kind>function</kind>
   <id>2D7yc6q3buDhuPwzpn4pWzbu8ls=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>/PcbLGG9Q7grLgSOV/R/ZnEg9Cs=</parent>
   <doc-comment>
@@ -652,6 +666,7 @@
   </source>
   <kind>function</kind>
   <id>v0BroyWjs67MHzc1SyTlXrSxn8M=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>sk8HTAQHhzXfZej4IJliADonAJQ=</parent>
   <doc-comment>
@@ -695,6 +710,7 @@
   </source>
   <kind>function</kind>
   <id>ECBBLxlaKar55qA0k1BCFn6MdH8=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>sk8HTAQHhzXfZej4IJliADonAJQ=</parent>
   <doc-comment>
@@ -738,6 +754,7 @@
   </source>
   <kind>function</kind>
   <id>MGQhB2O6ghdJWit6wao+PsH30Ew=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>ABxWcxit2TyVLv16ZxoJKAc6LKw=</parent>
   <doc-comment>
@@ -781,6 +798,7 @@
   </source>
   <kind>function</kind>
   <id>MEPVWyGd8KdZFR1kBYlQMgPyQlo=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>/PcbLGG9Q7grLgSOV/R/ZnEg9Cs=</parent>
   <doc-comment>
@@ -824,6 +842,7 @@
   </source>
   <kind>function</kind>
   <id>rTSnS8Pv8GoWusQQE42y0pgN4cw=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>ABxWcxit2TyVLv16ZxoJKAc6LKw=</parent>
   <doc-comment>
@@ -867,6 +886,7 @@
   </source>
   <kind>function</kind>
   <id>TaKAQiDmx8UXkT9p/momqiOZyHU=</id>
+  <access>protected</access>
   <extraction>regular</extraction>
   <parent>sk8HTAQHhzXfZej4IJliADonAJQ=</parent>
   <doc-comment>
@@ -910,6 +930,7 @@
   </source>
   <kind>function</kind>
   <id>eHxe3z0iWUXdcNyXK0PD2+6DRbs=</id>
+  <access>protected</access>
   <extraction>regular</extraction>
   <parent>sk8HTAQHhzXfZej4IJliADonAJQ=</parent>
   <doc-comment>
@@ -953,6 +974,7 @@
   </source>
   <kind>function</kind>
   <id>KGOrnDVJV2nPDK1hlkvBm6diYXY=</id>
+  <access>protected</access>
   <extraction>regular</extraction>
   <parent>sk8HTAQHhzXfZej4IJliADonAJQ=</parent>
   <doc-comment>
@@ -1016,6 +1038,7 @@
         <identifier>base</identifier>
       </name>
     </named>
+    <access>private</access>
   </base>
   <base>
     <named>
@@ -1025,6 +1048,7 @@
         <identifier>excluded_base</identifier>
       </name>
     </named>
+    <access>private</access>
   </base>
   <record-interface>
     <record-tranche>
@@ -1050,6 +1074,7 @@
   </source>
   <kind>function</kind>
   <id>9wqRoOH7cwNhkz5vwpTHLeb01BY=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>aiF6nWGZXbG8UfC75J5tNuoPMRc=</parent>
   <doc-comment>
@@ -1093,6 +1118,7 @@
   </source>
   <kind>function</kind>
   <id>NJYWKnKWmizdaSr1ldC7FGh7fD0=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>aiF6nWGZXbG8UfC75J5tNuoPMRc=</parent>
   <doc-comment>
@@ -1156,6 +1182,7 @@
         <identifier>base</identifier>
       </name>
     </named>
+    <access>protected</access>
   </base>
   <base>
     <named>
@@ -1165,6 +1192,7 @@
         <identifier>excluded_base</identifier>
       </name>
     </named>
+    <access>protected</access>
   </base>
   <record-interface>
     <record-tranche>
@@ -1198,6 +1226,7 @@
   </source>
   <kind>function</kind>
   <id>oVVGDloOS5F7d4VIcKLc0YpnsiE=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>KpfFXd3FeSffU3rGswegSIkkCrM=</parent>
   <doc-comment>
@@ -1241,6 +1270,7 @@
   </source>
   <kind>function</kind>
   <id>4ZJznHda5QNdk/tsMca4Psswlj0=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>KpfFXd3FeSffU3rGswegSIkkCrM=</parent>
   <doc-comment>
@@ -1284,6 +1314,7 @@
   </source>
   <kind>function</kind>
   <id>2D7yc6q3buDhuPwzpn4pWzbu8ls=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>/PcbLGG9Q7grLgSOV/R/ZnEg9Cs=</parent>
   <doc-comment>
@@ -1327,6 +1358,7 @@
   </source>
   <kind>function</kind>
   <id>v0BroyWjs67MHzc1SyTlXrSxn8M=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>sk8HTAQHhzXfZej4IJliADonAJQ=</parent>
   <doc-comment>
@@ -1370,6 +1402,7 @@
   </source>
   <kind>function</kind>
   <id>ECBBLxlaKar55qA0k1BCFn6MdH8=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>sk8HTAQHhzXfZej4IJliADonAJQ=</parent>
   <doc-comment>
@@ -1413,6 +1446,7 @@
   </source>
   <kind>function</kind>
   <id>aYhSUMJkgCRo3AZmBb/rre04Ghg=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>sk8HTAQHhzXfZej4IJliADonAJQ=</parent>
   <doc-comment>
@@ -1456,6 +1490,7 @@
   </source>
   <kind>function</kind>
   <id>MEPVWyGd8KdZFR1kBYlQMgPyQlo=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>/PcbLGG9Q7grLgSOV/R/ZnEg9Cs=</parent>
   <doc-comment>
@@ -1499,6 +1534,7 @@
   </source>
   <kind>function</kind>
   <id>TaKAQiDmx8UXkT9p/momqiOZyHU=</id>
+  <access>protected</access>
   <extraction>regular</extraction>
   <parent>sk8HTAQHhzXfZej4IJliADonAJQ=</parent>
   <doc-comment>
@@ -1542,6 +1578,7 @@
   </source>
   <kind>function</kind>
   <id>eHxe3z0iWUXdcNyXK0PD2+6DRbs=</id>
+  <access>protected</access>
   <extraction>regular</extraction>
   <parent>sk8HTAQHhzXfZej4IJliADonAJQ=</parent>
   <doc-comment>
@@ -1585,6 +1622,7 @@
   </source>
   <kind>function</kind>
   <id>KGOrnDVJV2nPDK1hlkvBm6diYXY=</id>
+  <access>protected</access>
   <extraction>regular</extraction>
   <parent>sk8HTAQHhzXfZej4IJliADonAJQ=</parent>
   <doc-comment>
diff --git a/test-files/golden-tests/config/inherit-base-members/see-below-base.xml b/test-files/golden-tests/config/inherit-base-members/see-below-base.xml
index 6d18156b69..49b5c6d8ec 100644
--- a/test-files/golden-tests/config/inherit-base-members/see-below-base.xml
+++ b/test-files/golden-tests/config/inherit-base-members/see-below-base.xml
@@ -83,6 +83,7 @@
         </name>
       </name>
     </named>
+    <access>public</access>
   </base>
   <record-interface>
     <record-tranche>
@@ -108,6 +109,7 @@
   </source>
   <kind>function</kind>
   <id>nOVGo4vrMcebHm4Ap0P9O3FPudg=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <is-copy-from-inherited>1</is-copy-from-inherited>
   <parent>J1syoWzn2cGgGxt+fceKEo2Jpzc=</parent>
@@ -141,6 +143,7 @@
   </source>
   <kind>function</kind>
   <id>fm0dS2I7h8XX4MVUXEdDThuOKWg=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>J1syoWzn2cGgGxt+fceKEo2Jpzc=</parent>
   <named>
diff --git a/test-files/golden-tests/config/inherit-base-members/skip-special.xml b/test-files/golden-tests/config/inherit-base-members/skip-special.xml
index 6f1e36c4b8..b20ba15423 100644
--- a/test-files/golden-tests/config/inherit-base-members/skip-special.xml
+++ b/test-files/golden-tests/config/inherit-base-members/skip-special.xml
@@ -39,6 +39,7 @@
         <identifier>base_base</identifier>
       </name>
     </named>
+    <access>public</access>
   </base>
   <derived>ABxWcxit2TyVLv16ZxoJKAc6LKw=</derived>
   <record-interface>
@@ -73,6 +74,7 @@
   </source>
   <kind>function</kind>
   <id>i32Wxo5FwAB92S9eyq4OmJr+PwE=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>sk8HTAQHhzXfZej4IJliADonAJQ=</parent>
   <doc-comment>
@@ -106,6 +108,7 @@
   </source>
   <kind>function</kind>
   <id>zem/akJ/sAPS+vXkWB/zJ3kqYho=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>sk8HTAQHhzXfZej4IJliADonAJQ=</parent>
   <doc-comment>
@@ -139,6 +142,7 @@
   </source>
   <kind>function</kind>
   <id>2D7yc6q3buDhuPwzpn4pWzbu8ls=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>/PcbLGG9Q7grLgSOV/R/ZnEg9Cs=</parent>
   <doc-comment>
@@ -175,6 +179,7 @@
   </source>
   <kind>function</kind>
   <id>v0BroyWjs67MHzc1SyTlXrSxn8M=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>sk8HTAQHhzXfZej4IJliADonAJQ=</parent>
   <doc-comment>
@@ -211,6 +216,7 @@
   </source>
   <kind>function</kind>
   <id>ECBBLxlaKar55qA0k1BCFn6MdH8=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>sk8HTAQHhzXfZej4IJliADonAJQ=</parent>
   <doc-comment>
@@ -247,6 +253,7 @@
   </source>
   <kind>function</kind>
   <id>aYhSUMJkgCRo3AZmBb/rre04Ghg=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>sk8HTAQHhzXfZej4IJliADonAJQ=</parent>
   <doc-comment>
@@ -283,6 +290,7 @@
   </source>
   <kind>function</kind>
   <id>MEPVWyGd8KdZFR1kBYlQMgPyQlo=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>/PcbLGG9Q7grLgSOV/R/ZnEg9Cs=</parent>
   <doc-comment>
@@ -319,6 +327,7 @@
   </source>
   <kind>function</kind>
   <id>TaKAQiDmx8UXkT9p/momqiOZyHU=</id>
+  <access>protected</access>
   <extraction>regular</extraction>
   <parent>sk8HTAQHhzXfZej4IJliADonAJQ=</parent>
   <doc-comment>
@@ -355,6 +364,7 @@
   </source>
   <kind>function</kind>
   <id>eHxe3z0iWUXdcNyXK0PD2+6DRbs=</id>
+  <access>protected</access>
   <extraction>regular</extraction>
   <parent>sk8HTAQHhzXfZej4IJliADonAJQ=</parent>
   <doc-comment>
@@ -391,6 +401,7 @@
   </source>
   <kind>function</kind>
   <id>KGOrnDVJV2nPDK1hlkvBm6diYXY=</id>
+  <access>protected</access>
   <extraction>regular</extraction>
   <parent>sk8HTAQHhzXfZej4IJliADonAJQ=</parent>
   <doc-comment>
@@ -456,6 +467,7 @@
   </source>
   <kind>function</kind>
   <id>0hT5zKl+ugygmEuMXhib2MIZLpU=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>/PcbLGG9Q7grLgSOV/R/ZnEg9Cs=</parent>
   <doc-comment>
@@ -489,6 +501,7 @@
   </source>
   <kind>function</kind>
   <id>pXBvtV7fI6xpBYpqDE+uiFh8oQk=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>/PcbLGG9Q7grLgSOV/R/ZnEg9Cs=</parent>
   <doc-comment>
@@ -522,6 +535,7 @@
   </source>
   <kind>function</kind>
   <id>2D7yc6q3buDhuPwzpn4pWzbu8ls=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>/PcbLGG9Q7grLgSOV/R/ZnEg9Cs=</parent>
   <doc-comment>
@@ -558,6 +572,7 @@
   </source>
   <kind>function</kind>
   <id>MEPVWyGd8KdZFR1kBYlQMgPyQlo=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>/PcbLGG9Q7grLgSOV/R/ZnEg9Cs=</parent>
   <doc-comment>
@@ -604,6 +619,7 @@
         <identifier>base</identifier>
       </name>
     </named>
+    <access>public</access>
   </base>
   <base>
     <named>
@@ -613,6 +629,7 @@
         <identifier>excluded_base</identifier>
       </name>
     </named>
+    <access>public</access>
   </base>
   <record-interface>
     <record-tranche>
@@ -650,6 +667,7 @@
   </source>
   <kind>function</kind>
   <id>Mb8fERE5UxaDv4qmeuyT42BBof8=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>ABxWcxit2TyVLv16ZxoJKAc6LKw=</parent>
   <doc-comment>
@@ -683,6 +701,7 @@
   </source>
   <kind>function</kind>
   <id>6DgPvK2zzHe4kSaF/gWVBDdJ74U=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>ABxWcxit2TyVLv16ZxoJKAc6LKw=</parent>
   <doc-comment>
@@ -716,6 +735,7 @@
   </source>
   <kind>function</kind>
   <id>2D7yc6q3buDhuPwzpn4pWzbu8ls=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>/PcbLGG9Q7grLgSOV/R/ZnEg9Cs=</parent>
   <doc-comment>
@@ -752,6 +772,7 @@
   </source>
   <kind>function</kind>
   <id>v0BroyWjs67MHzc1SyTlXrSxn8M=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>sk8HTAQHhzXfZej4IJliADonAJQ=</parent>
   <doc-comment>
@@ -788,6 +809,7 @@
   </source>
   <kind>function</kind>
   <id>ECBBLxlaKar55qA0k1BCFn6MdH8=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>sk8HTAQHhzXfZej4IJliADonAJQ=</parent>
   <doc-comment>
@@ -824,6 +846,7 @@
   </source>
   <kind>function</kind>
   <id>MGQhB2O6ghdJWit6wao+PsH30Ew=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>ABxWcxit2TyVLv16ZxoJKAc6LKw=</parent>
   <doc-comment>
@@ -860,6 +883,7 @@
   </source>
   <kind>function</kind>
   <id>MEPVWyGd8KdZFR1kBYlQMgPyQlo=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>/PcbLGG9Q7grLgSOV/R/ZnEg9Cs=</parent>
   <doc-comment>
@@ -896,6 +920,7 @@
   </source>
   <kind>function</kind>
   <id>rTSnS8Pv8GoWusQQE42y0pgN4cw=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>ABxWcxit2TyVLv16ZxoJKAc6LKw=</parent>
   <doc-comment>
@@ -932,6 +957,7 @@
   </source>
   <kind>function</kind>
   <id>P1Eq799RJkNMSTci+0jy+ZejsyU=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <is-copy-from-inherited>1</is-copy-from-inherited>
   <parent>ABxWcxit2TyVLv16ZxoJKAc6LKw=</parent>
@@ -969,6 +995,7 @@
   </source>
   <kind>function</kind>
   <id>TaKAQiDmx8UXkT9p/momqiOZyHU=</id>
+  <access>protected</access>
   <extraction>regular</extraction>
   <parent>sk8HTAQHhzXfZej4IJliADonAJQ=</parent>
   <doc-comment>
@@ -1005,6 +1032,7 @@
   </source>
   <kind>function</kind>
   <id>eHxe3z0iWUXdcNyXK0PD2+6DRbs=</id>
+  <access>protected</access>
   <extraction>regular</extraction>
   <parent>sk8HTAQHhzXfZej4IJliADonAJQ=</parent>
   <doc-comment>
@@ -1041,6 +1069,7 @@
   </source>
   <kind>function</kind>
   <id>KGOrnDVJV2nPDK1hlkvBm6diYXY=</id>
+  <access>protected</access>
   <extraction>regular</extraction>
   <parent>sk8HTAQHhzXfZej4IJliADonAJQ=</parent>
   <doc-comment>
@@ -1077,6 +1106,7 @@
   </source>
   <kind>function</kind>
   <id>oW3pQYXjjv2wrXIwIceF6Xd8nTA=</id>
+  <access>protected</access>
   <extraction>regular</extraction>
   <is-copy-from-inherited>1</is-copy-from-inherited>
   <parent>ABxWcxit2TyVLv16ZxoJKAc6LKw=</parent>
@@ -1114,6 +1144,7 @@
   </source>
   <kind>function</kind>
   <id>IYnrJp6ur6C+AiuhFl5x1YPnxkM=</id>
+  <access>protected</access>
   <extraction>regular</extraction>
   <is-copy-from-inherited>1</is-copy-from-inherited>
   <parent>ABxWcxit2TyVLv16ZxoJKAc6LKw=</parent>
@@ -1161,6 +1192,7 @@
         <identifier>base</identifier>
       </name>
     </named>
+    <access>private</access>
   </base>
   <base>
     <named>
@@ -1170,6 +1202,7 @@
         <identifier>excluded_base</identifier>
       </name>
     </named>
+    <access>private</access>
   </base>
   <record-interface>
     <record-tranche>
@@ -1197,6 +1230,7 @@
   </source>
   <kind>function</kind>
   <id>jCqo+0V7MK+reBG7J4tBA/8VGiI=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>aiF6nWGZXbG8UfC75J5tNuoPMRc=</parent>
   <doc-comment>
@@ -1230,6 +1264,7 @@
   </source>
   <kind>function</kind>
   <id>v41bk6Gd1CiDPZueTqvYeEM6DqU=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>aiF6nWGZXbG8UfC75J5tNuoPMRc=</parent>
   <doc-comment>
@@ -1263,6 +1298,7 @@
   </source>
   <kind>function</kind>
   <id>9wqRoOH7cwNhkz5vwpTHLeb01BY=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>aiF6nWGZXbG8UfC75J5tNuoPMRc=</parent>
   <doc-comment>
@@ -1299,6 +1335,7 @@
   </source>
   <kind>function</kind>
   <id>NJYWKnKWmizdaSr1ldC7FGh7fD0=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>aiF6nWGZXbG8UfC75J5tNuoPMRc=</parent>
   <doc-comment>
@@ -1355,6 +1392,7 @@
         <identifier>base</identifier>
       </name>
     </named>
+    <access>protected</access>
   </base>
   <base>
     <named>
@@ -1364,6 +1402,7 @@
         <identifier>excluded_base</identifier>
       </name>
     </named>
+    <access>protected</access>
   </base>
   <record-interface>
     <record-tranche>
@@ -1402,6 +1441,7 @@
   </source>
   <kind>function</kind>
   <id>P0+PNfj+C0MyzTnJ6ITq8JvjciM=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>KpfFXd3FeSffU3rGswegSIkkCrM=</parent>
   <doc-comment>
@@ -1435,6 +1475,7 @@
   </source>
   <kind>function</kind>
   <id>dhUWdRyTi/gQAcf2yVfnV5Jf1sg=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>KpfFXd3FeSffU3rGswegSIkkCrM=</parent>
   <doc-comment>
@@ -1468,6 +1509,7 @@
   </source>
   <kind>function</kind>
   <id>oVVGDloOS5F7d4VIcKLc0YpnsiE=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>KpfFXd3FeSffU3rGswegSIkkCrM=</parent>
   <doc-comment>
@@ -1511,6 +1553,7 @@
   </source>
   <kind>function</kind>
   <id>4ZJznHda5QNdk/tsMca4Psswlj0=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>KpfFXd3FeSffU3rGswegSIkkCrM=</parent>
   <doc-comment>
@@ -1554,6 +1597,7 @@
   </source>
   <kind>function</kind>
   <id>2D7yc6q3buDhuPwzpn4pWzbu8ls=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>/PcbLGG9Q7grLgSOV/R/ZnEg9Cs=</parent>
   <doc-comment>
@@ -1590,6 +1634,7 @@
   </source>
   <kind>function</kind>
   <id>v0BroyWjs67MHzc1SyTlXrSxn8M=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>sk8HTAQHhzXfZej4IJliADonAJQ=</parent>
   <doc-comment>
@@ -1626,6 +1671,7 @@
   </source>
   <kind>function</kind>
   <id>ECBBLxlaKar55qA0k1BCFn6MdH8=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>sk8HTAQHhzXfZej4IJliADonAJQ=</parent>
   <doc-comment>
@@ -1662,6 +1708,7 @@
   </source>
   <kind>function</kind>
   <id>aYhSUMJkgCRo3AZmBb/rre04Ghg=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>sk8HTAQHhzXfZej4IJliADonAJQ=</parent>
   <doc-comment>
@@ -1698,6 +1745,7 @@
   </source>
   <kind>function</kind>
   <id>MEPVWyGd8KdZFR1kBYlQMgPyQlo=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>/PcbLGG9Q7grLgSOV/R/ZnEg9Cs=</parent>
   <doc-comment>
@@ -1734,6 +1782,7 @@
   </source>
   <kind>function</kind>
   <id>TaKAQiDmx8UXkT9p/momqiOZyHU=</id>
+  <access>protected</access>
   <extraction>regular</extraction>
   <parent>sk8HTAQHhzXfZej4IJliADonAJQ=</parent>
   <doc-comment>
@@ -1770,6 +1819,7 @@
   </source>
   <kind>function</kind>
   <id>eHxe3z0iWUXdcNyXK0PD2+6DRbs=</id>
+  <access>protected</access>
   <extraction>regular</extraction>
   <parent>sk8HTAQHhzXfZej4IJliADonAJQ=</parent>
   <doc-comment>
@@ -1806,6 +1856,7 @@
   </source>
   <kind>function</kind>
   <id>KGOrnDVJV2nPDK1hlkvBm6diYXY=</id>
+  <access>protected</access>
   <extraction>regular</extraction>
   <parent>sk8HTAQHhzXfZej4IJliADonAJQ=</parent>
   <doc-comment>
@@ -1842,6 +1893,7 @@
   </source>
   <kind>function</kind>
   <id>KdkXQxu2xOfAXegJgCMmLcFq8MM=</id>
+  <access>protected</access>
   <extraction>regular</extraction>
   <is-copy-from-inherited>1</is-copy-from-inherited>
   <parent>KpfFXd3FeSffU3rGswegSIkkCrM=</parent>
@@ -1879,6 +1931,7 @@
   </source>
   <kind>function</kind>
   <id>UysvazUbtV39Omg33c9Me+Gri/M=</id>
+  <access>protected</access>
   <extraction>regular</extraction>
   <is-copy-from-inherited>1</is-copy-from-inherited>
   <parent>KpfFXd3FeSffU3rGswegSIkkCrM=</parent>
@@ -1916,6 +1969,7 @@
   </source>
   <kind>function</kind>
   <id>H8wEIL8+8s3iNqadfPsH1HWRQU4=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <is-copy-from-inherited>1</is-copy-from-inherited>
   <parent>KpfFXd3FeSffU3rGswegSIkkCrM=</parent>
diff --git a/test-files/golden-tests/config/legible-names/constructor.xml b/test-files/golden-tests/config/legible-names/constructor.xml
index d8cbc77f82..b0cd448faa 100644
--- a/test-files/golden-tests/config/legible-names/constructor.xml
+++ b/test-files/golden-tests/config/legible-names/constructor.xml
@@ -72,6 +72,7 @@
   </source>
   <kind>overloads</kind>
   <id>iRe6Tyv0qU6vIHNyvLHuISP/Fw4=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>ynx5NXMLXqzSXwgOnIP6CHzNx14=</parent>
   <doc-comment>
@@ -108,6 +109,7 @@
   </source>
   <kind>function</kind>
   <id>6Jx2eK9l4C46QIRucTvox+6PH2k=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>ynx5NXMLXqzSXwgOnIP6CHzNx14=</parent>
   <doc-comment>
@@ -140,6 +142,7 @@
   </source>
   <kind>function</kind>
   <id>4C2UEs8la3Eghf4mLyeViCJNOwY=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>ynx5NXMLXqzSXwgOnIP6CHzNx14=</parent>
   <doc-comment>
@@ -193,6 +196,7 @@
   </source>
   <kind>function</kind>
   <id>ad/AzbLEE6b8dNnnX2OLy1+HxDQ=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>ynx5NXMLXqzSXwgOnIP6CHzNx14=</parent>
   <doc-comment>
@@ -245,6 +249,7 @@
   </source>
   <kind>function</kind>
   <id>bzCqmNJXWfd3zGOkytPkJL6K6VQ=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>ynx5NXMLXqzSXwgOnIP6CHzNx14=</parent>
   <doc-comment>
@@ -301,6 +306,7 @@
   </source>
   <kind>function</kind>
   <id>d9h3reyOyp3JT3kwQOTPOI9tmzg=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>ynx5NXMLXqzSXwgOnIP6CHzNx14=</parent>
   <doc-comment>
diff --git a/test-files/golden-tests/config/overloads/const-mutable.xml b/test-files/golden-tests/config/overloads/const-mutable.xml
index 8536f9cd89..933224b4ce 100644
--- a/test-files/golden-tests/config/overloads/const-mutable.xml
+++ b/test-files/golden-tests/config/overloads/const-mutable.xml
@@ -54,6 +54,7 @@
   </source>
   <kind>overloads</kind>
   <id>4/AwllBtll8FuW0tFA3cMUpR8Sg=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>BrX2oZup9qgy4SfJloKCuUYZshA=</parent>
   <func-class>normal</func-class>
@@ -80,6 +81,7 @@
   </source>
   <kind>function</kind>
   <id>umtiZdZUSDxw3juVm+S7M40tpXQ=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>BrX2oZup9qgy4SfJloKCuUYZshA=</parent>
   <l-value-reference>
@@ -105,6 +107,7 @@
   </source>
   <kind>function</kind>
   <id>c8FMK37zKpqJXH2ZioM0tYziY1g=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>BrX2oZup9qgy4SfJloKCuUYZshA=</parent>
   <l-value-reference>
diff --git a/test-files/golden-tests/config/overloads/visibility.xml b/test-files/golden-tests/config/overloads/visibility.xml
index 90339a7e98..aa484cb4d8 100644
--- a/test-files/golden-tests/config/overloads/visibility.xml
+++ b/test-files/golden-tests/config/overloads/visibility.xml
@@ -57,6 +57,7 @@
   </source>
   <kind>overloads</kind>
   <id>4/AwllBtll8FuW0tFA3cMUpR8Sg=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>BrX2oZup9qgy4SfJloKCuUYZshA=</parent>
   <func-class>normal</func-class>
@@ -81,6 +82,7 @@
   </source>
   <kind>function</kind>
   <id>umtiZdZUSDxw3juVm+S7M40tpXQ=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>BrX2oZup9qgy4SfJloKCuUYZshA=</parent>
   <named>
@@ -104,6 +106,7 @@
   </source>
   <kind>function</kind>
   <id>ZlzGLjjc8rseQAYYNLgCZvhC28g=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>BrX2oZup9qgy4SfJloKCuUYZshA=</parent>
   <named>
@@ -141,6 +144,7 @@
   </source>
   <kind>overloads</kind>
   <id>NcMo7ffWjuFftsr66BskEGEgREc=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>BrX2oZup9qgy4SfJloKCuUYZshA=</parent>
   <func-class>normal</func-class>
@@ -165,6 +169,7 @@
   </source>
   <kind>function</kind>
   <id>/FdiOdEzqaZeg+AJKJir7X+Te/U=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>BrX2oZup9qgy4SfJloKCuUYZshA=</parent>
   <named>
@@ -182,6 +187,7 @@
     </named>
   </param>
   <func-class>normal</func-class>
+  <storage-class>static</storage-class>
   <is-record-method>1</is-record-method>
 </function>
 <function>
@@ -196,6 +202,7 @@
   </source>
   <kind>function</kind>
   <id>UNX9B8tS+5rPg6IDVPCp65KU9K8=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>BrX2oZup9qgy4SfJloKCuUYZshA=</parent>
   <named>
@@ -221,6 +228,7 @@
     </named>
   </param>
   <func-class>normal</func-class>
+  <storage-class>static</storage-class>
   <is-record-method>1</is-record-method>
 </function>
 <overloads>
@@ -241,6 +249,7 @@
   </source>
   <kind>overloads</kind>
   <id>TMteh8/S1VX9JEEHtJWh5Th1uZg=</id>
+  <access>protected</access>
   <extraction>regular</extraction>
   <parent>BrX2oZup9qgy4SfJloKCuUYZshA=</parent>
   <func-class>normal</func-class>
@@ -265,6 +274,7 @@
   </source>
   <kind>function</kind>
   <id>o2jTMMUUPQBbGJOrh0qwurUTaTc=</id>
+  <access>protected</access>
   <extraction>regular</extraction>
   <parent>BrX2oZup9qgy4SfJloKCuUYZshA=</parent>
   <named>
@@ -304,6 +314,7 @@
   </source>
   <kind>function</kind>
   <id>xtm3DYSrIA4dEog7ntDc3s6rKHs=</id>
+  <access>protected</access>
   <extraction>regular</extraction>
   <parent>BrX2oZup9qgy4SfJloKCuUYZshA=</parent>
   <named>
@@ -357,6 +368,7 @@
   </source>
   <kind>overloads</kind>
   <id>SO7h8EG4J1fko32lzeE1EufNKsY=</id>
+  <access>protected</access>
   <extraction>regular</extraction>
   <parent>BrX2oZup9qgy4SfJloKCuUYZshA=</parent>
   <func-class>normal</func-class>
@@ -381,6 +393,7 @@
   </source>
   <kind>function</kind>
   <id>B3IB3WYPg106i0ziVCj3FHkRNAE=</id>
+  <access>protected</access>
   <extraction>regular</extraction>
   <parent>BrX2oZup9qgy4SfJloKCuUYZshA=</parent>
   <named>
@@ -414,6 +427,7 @@
     </named>
   </param>
   <func-class>normal</func-class>
+  <storage-class>static</storage-class>
   <is-record-method>1</is-record-method>
 </function>
 <function>
@@ -428,6 +442,7 @@
   </source>
   <kind>function</kind>
   <id>9QPd0C7ERvmPWPhi4ucPT1LXybM=</id>
+  <access>protected</access>
   <extraction>regular</extraction>
   <parent>BrX2oZup9qgy4SfJloKCuUYZshA=</parent>
   <named>
@@ -469,6 +484,7 @@
     </named>
   </param>
   <func-class>normal</func-class>
+  <storage-class>static</storage-class>
   <is-record-method>1</is-record-method>
 </function>
 </mrdocs>
diff --git a/test-files/golden-tests/config/sort-members-by/sort-members-by-location.xml b/test-files/golden-tests/config/sort-members-by/sort-members-by-location.xml
index df94dcadf6..2a69c2beb0 100644
--- a/test-files/golden-tests/config/sort-members-by/sort-members-by-location.xml
+++ b/test-files/golden-tests/config/sort-members-by/sort-members-by-location.xml
@@ -62,6 +62,7 @@
   </source>
   <kind>overloads</kind>
   <id>Cnsc4OfzqGbrnICr/PmPGh6bkZc=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>NQ8uQgTcafPcttyBMHHLHAXA4MA=</parent>
   <doc-comment>
@@ -95,6 +96,7 @@
   </source>
   <kind>function</kind>
   <id>aQWtFVa4Xa+eceLXiLW74q44JRk=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>NQ8uQgTcafPcttyBMHHLHAXA4MA=</parent>
   <doc-comment>
@@ -151,6 +153,7 @@
   </source>
   <kind>function</kind>
   <id>WltomC+2IcmzMN0COGL0OWWmbZk=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>NQ8uQgTcafPcttyBMHHLHAXA4MA=</parent>
   <doc-comment>
@@ -183,6 +186,7 @@
   </source>
   <kind>function</kind>
   <id>HMG56OCQ5OpB2E9hu4bG3/hoOho=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>NQ8uQgTcafPcttyBMHHLHAXA4MA=</parent>
   <doc-comment>
@@ -215,6 +219,7 @@
   </source>
   <kind>function</kind>
   <id>lBA1besl9J3wAZAcEn9C+K05hf4=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>NQ8uQgTcafPcttyBMHHLHAXA4MA=</parent>
   <named>
@@ -239,6 +244,7 @@
   </source>
   <kind>function</kind>
   <id>gRx0djRTyQ5zuzBd9ujP7LLlWNg=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>NQ8uQgTcafPcttyBMHHLHAXA4MA=</parent>
   <named>
@@ -263,6 +269,7 @@
   </source>
   <kind>function</kind>
   <id>zQ0DYAZMF+xhfbo8hUyqZRNKJ+U=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>NQ8uQgTcafPcttyBMHHLHAXA4MA=</parent>
   <doc-comment>
@@ -317,6 +324,7 @@
   </source>
   <kind>function</kind>
   <id>rjPdhFxUkaC43tWXi+kka78JQxI=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>NQ8uQgTcafPcttyBMHHLHAXA4MA=</parent>
   <doc-comment>
@@ -375,6 +383,7 @@
   </source>
   <kind>function</kind>
   <id>atwUGLD+QHVhH3x1+8qzINNxzMY=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>NQ8uQgTcafPcttyBMHHLHAXA4MA=</parent>
   <doc-comment>
@@ -454,6 +463,7 @@
   </source>
   <kind>function</kind>
   <id>CB0pXrzU8BKZ2LF0BSpclxIfgrs=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>NQ8uQgTcafPcttyBMHHLHAXA4MA=</parent>
   <doc-comment>
@@ -533,6 +543,7 @@
   </source>
   <kind>function</kind>
   <id>6/NYLeQdPqWrbu5kHnTpE3u6Yg4=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>NQ8uQgTcafPcttyBMHHLHAXA4MA=</parent>
   <doc-comment>
diff --git a/test-files/golden-tests/config/sort-members-by/sort-members-by-name.xml b/test-files/golden-tests/config/sort-members-by/sort-members-by-name.xml
index b2146c68cd..1c3f56c83e 100644
--- a/test-files/golden-tests/config/sort-members-by/sort-members-by-name.xml
+++ b/test-files/golden-tests/config/sort-members-by/sort-members-by-name.xml
@@ -62,6 +62,7 @@
   </source>
   <kind>overloads</kind>
   <id>Cnsc4OfzqGbrnICr/PmPGh6bkZc=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>NQ8uQgTcafPcttyBMHHLHAXA4MA=</parent>
   <doc-comment>
@@ -95,6 +96,7 @@
   </source>
   <kind>function</kind>
   <id>WltomC+2IcmzMN0COGL0OWWmbZk=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>NQ8uQgTcafPcttyBMHHLHAXA4MA=</parent>
   <doc-comment>
@@ -127,6 +129,7 @@
   </source>
   <kind>function</kind>
   <id>aQWtFVa4Xa+eceLXiLW74q44JRk=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>NQ8uQgTcafPcttyBMHHLHAXA4MA=</parent>
   <doc-comment>
@@ -183,6 +186,7 @@
   </source>
   <kind>function</kind>
   <id>HMG56OCQ5OpB2E9hu4bG3/hoOho=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>NQ8uQgTcafPcttyBMHHLHAXA4MA=</parent>
   <doc-comment>
@@ -215,6 +219,7 @@
   </source>
   <kind>function</kind>
   <id>gRx0djRTyQ5zuzBd9ujP7LLlWNg=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>NQ8uQgTcafPcttyBMHHLHAXA4MA=</parent>
   <named>
@@ -239,6 +244,7 @@
   </source>
   <kind>function</kind>
   <id>lBA1besl9J3wAZAcEn9C+K05hf4=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>NQ8uQgTcafPcttyBMHHLHAXA4MA=</parent>
   <named>
@@ -263,6 +269,7 @@
   </source>
   <kind>function</kind>
   <id>zQ0DYAZMF+xhfbo8hUyqZRNKJ+U=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>NQ8uQgTcafPcttyBMHHLHAXA4MA=</parent>
   <doc-comment>
@@ -317,6 +324,7 @@
   </source>
   <kind>function</kind>
   <id>rjPdhFxUkaC43tWXi+kka78JQxI=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>NQ8uQgTcafPcttyBMHHLHAXA4MA=</parent>
   <doc-comment>
@@ -375,6 +383,7 @@
   </source>
   <kind>function</kind>
   <id>atwUGLD+QHVhH3x1+8qzINNxzMY=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>NQ8uQgTcafPcttyBMHHLHAXA4MA=</parent>
   <doc-comment>
@@ -454,6 +463,7 @@
   </source>
   <kind>function</kind>
   <id>CB0pXrzU8BKZ2LF0BSpclxIfgrs=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>NQ8uQgTcafPcttyBMHHLHAXA4MA=</parent>
   <doc-comment>
@@ -533,6 +543,7 @@
   </source>
   <kind>function</kind>
   <id>6/NYLeQdPqWrbu5kHnTpE3u6Yg4=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>NQ8uQgTcafPcttyBMHHLHAXA4MA=</parent>
   <doc-comment>
diff --git a/test-files/golden-tests/config/sort-namespace-members-by/sort-namespace-members-by-location.adoc b/test-files/golden-tests/config/sort-namespace-members-by/sort-namespace-members-by-location.adoc
index c88bd28d08..feed9ec9be 100644
--- a/test-files/golden-tests/config/sort-namespace-members-by/sort-namespace-members-by-location.adoc
+++ b/test-files/golden-tests/config/sort-namespace-members-by/sort-namespace-members-by-location.adoc
@@ -27,7 +27,7 @@
 | Name| Description
 | link:#h[`h`] 
 | 
-| link:#g-0f[`g`] 
+| link:#g-0c[`g`] 
 | 
 | link:#f[`f`] 
 | 
@@ -425,7 +425,7 @@ void
 h();
 ----
 
-[#g-0f]
+[#g-0c]
 == g
 
 === Synopses
diff --git a/test-files/golden-tests/config/sort-namespace-members-by/sort-namespace-members-by-location.html b/test-files/golden-tests/config/sort-namespace-members-by/sort-namespace-members-by-location.html
index 0ea675a24c..1a65a9b7be 100644
--- a/test-files/golden-tests/config/sort-namespace-members-by/sort-namespace-members-by-location.html
+++ b/test-files/golden-tests/config/sort-namespace-members-by/sort-namespace-members-by-location.html
@@ -44,7 +44,7 @@ <h2>
 <tbody>
 <tr>
 <td><a href="#h"><code>h</code></a> </td><td></td></tr><tr>
-<td><a href="#g-0f"><code>g</code></a> </td><td></td></tr><tr>
+<td><a href="#g-0c"><code>g</code></a> </td><td></td></tr><tr>
 <td><a href="#f"><code>f</code></a> </td><td></td></tr><tr>
 <td><a href="#operator_not"><code>operator!</code></a> </td><td>Negation operator</td></tr><tr>
 <td><a href="#operator_eq"><code>operator&#x3D;&#x3D;</code></a> </td><td>Equality operator</td></tr><tr>
@@ -518,7 +518,7 @@ <h3>
 </div>
 <div>
 <div>
-<h2 id="g-0f">
+<h2 id="g-0c">
 g</h2>
 </div>
 <div>
diff --git a/test-files/golden-tests/config/sort-namespace-members-by/sort-namespace-members-by-location.xml b/test-files/golden-tests/config/sort-namespace-members-by/sort-namespace-members-by-location.xml
index 81fc115fb9..67cbbc4d3f 100644
--- a/test-files/golden-tests/config/sort-namespace-members-by/sort-namespace-members-by-location.xml
+++ b/test-files/golden-tests/config/sort-namespace-members-by/sort-namespace-members-by-location.xml
@@ -18,7 +18,7 @@
     <records>YrPSaKAbmXgzCAX5WByx4eVoqBM=</records>
     <records>NQ8uQgTcafPcttyBMHHLHAXA4MA=</records>
     <functions>rvT6OxIrrSI0KxJ2nkfEgBz/Lz4=</functions>
-    <functions>9JfSlZfEThLXiWTez3b8eT/AbZU=</functions>
+    <functions>yrBu1PLNI6d+uEC9ml1Q/9KAt4o=</functions>
     <functions>s6nsa+zVhpzzrN+yUVPP5rvdXqs=</functions>
     <functions>yuKyBhGbND+Kyypyb9UsuC4Qe3E=</functions>
     <functions>kibUx6k1SXB+HsXkRXroJl9f59w=</functions>
@@ -397,6 +397,7 @@
   </source>
   <kind>overloads</kind>
   <id>Cnsc4OfzqGbrnICr/PmPGh6bkZc=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>NQ8uQgTcafPcttyBMHHLHAXA4MA=</parent>
   <doc-comment>
@@ -430,6 +431,7 @@
   </source>
   <kind>function</kind>
   <id>WltomC+2IcmzMN0COGL0OWWmbZk=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>NQ8uQgTcafPcttyBMHHLHAXA4MA=</parent>
   <doc-comment>
@@ -462,6 +464,7 @@
   </source>
   <kind>function</kind>
   <id>aQWtFVa4Xa+eceLXiLW74q44JRk=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>NQ8uQgTcafPcttyBMHHLHAXA4MA=</parent>
   <doc-comment>
@@ -518,6 +521,7 @@
   </source>
   <kind>function</kind>
   <id>HMG56OCQ5OpB2E9hu4bG3/hoOho=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>NQ8uQgTcafPcttyBMHHLHAXA4MA=</parent>
   <doc-comment>
@@ -550,6 +554,7 @@
   </source>
   <kind>function</kind>
   <id>lBA1besl9J3wAZAcEn9C+K05hf4=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>NQ8uQgTcafPcttyBMHHLHAXA4MA=</parent>
   <named>
@@ -574,6 +579,7 @@
   </source>
   <kind>function</kind>
   <id>zQ0DYAZMF+xhfbo8hUyqZRNKJ+U=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>NQ8uQgTcafPcttyBMHHLHAXA4MA=</parent>
   <doc-comment>
@@ -628,6 +634,7 @@
   </source>
   <kind>function</kind>
   <id>rjPdhFxUkaC43tWXi+kka78JQxI=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>NQ8uQgTcafPcttyBMHHLHAXA4MA=</parent>
   <doc-comment>
@@ -686,6 +693,7 @@
   </source>
   <kind>function</kind>
   <id>atwUGLD+QHVhH3x1+8qzINNxzMY=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>NQ8uQgTcafPcttyBMHHLHAXA4MA=</parent>
   <doc-comment>
@@ -765,6 +773,7 @@
   </source>
   <kind>function</kind>
   <id>CB0pXrzU8BKZ2LF0BSpclxIfgrs=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>NQ8uQgTcafPcttyBMHHLHAXA4MA=</parent>
   <doc-comment>
@@ -844,6 +853,7 @@
   </source>
   <kind>function</kind>
   <id>6/NYLeQdPqWrbu5kHnTpE3u6Yg4=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>NQ8uQgTcafPcttyBMHHLHAXA4MA=</parent>
   <doc-comment>
@@ -964,7 +974,7 @@
     </location>
   </source>
   <kind>overloads</kind>
-  <id>9JfSlZfEThLXiWTez3b8eT/AbZU=</id>
+  <id>yrBu1PLNI6d+uEC9ml1Q/9KAt4o=</id>
   <extraction>regular</extraction>
   <parent>//////////////////////////8=</parent>
   <func-class>normal</func-class>
diff --git a/test-files/golden-tests/config/sort-namespace-members-by/sort-namespace-members-by-name.adoc b/test-files/golden-tests/config/sort-namespace-members-by/sort-namespace-members-by-name.adoc
index a5c37427ed..bf05895cb7 100644
--- a/test-files/golden-tests/config/sort-namespace-members-by/sort-namespace-members-by-name.adoc
+++ b/test-files/golden-tests/config/sort-namespace-members-by/sort-namespace-members-by-name.adoc
@@ -27,7 +27,7 @@
 | Name| Description
 | link:#f[`f`] 
 | 
-| link:#g-0f[`g`] 
+| link:#g-0c[`g`] 
 | 
 | link:#h[`h`] 
 | 
@@ -425,7 +425,7 @@ void
 f();
 ----
 
-[#g-0f]
+[#g-0c]
 == g
 
 === Synopses
diff --git a/test-files/golden-tests/config/sort-namespace-members-by/sort-namespace-members-by-name.html b/test-files/golden-tests/config/sort-namespace-members-by/sort-namespace-members-by-name.html
index c73dd3066f..8993068cec 100644
--- a/test-files/golden-tests/config/sort-namespace-members-by/sort-namespace-members-by-name.html
+++ b/test-files/golden-tests/config/sort-namespace-members-by/sort-namespace-members-by-name.html
@@ -44,7 +44,7 @@ <h2>
 <tbody>
 <tr>
 <td><a href="#f"><code>f</code></a> </td><td></td></tr><tr>
-<td><a href="#g-0f"><code>g</code></a> </td><td></td></tr><tr>
+<td><a href="#g-0c"><code>g</code></a> </td><td></td></tr><tr>
 <td><a href="#h"><code>h</code></a> </td><td></td></tr><tr>
 <td><a href="#operator_not"><code>operator!</code></a> </td><td>Negation operator</td></tr><tr>
 <td><a href="#operator_eq"><code>operator&#x3D;&#x3D;</code></a> </td><td>Equality operator</td></tr><tr>
@@ -518,7 +518,7 @@ <h3>
 </div>
 <div>
 <div>
-<h2 id="g-0f">
+<h2 id="g-0c">
 g</h2>
 </div>
 <div>
diff --git a/test-files/golden-tests/config/sort-namespace-members-by/sort-namespace-members-by-name.xml b/test-files/golden-tests/config/sort-namespace-members-by/sort-namespace-members-by-name.xml
index 58f9b39153..b80caaf8fb 100644
--- a/test-files/golden-tests/config/sort-namespace-members-by/sort-namespace-members-by-name.xml
+++ b/test-files/golden-tests/config/sort-namespace-members-by/sort-namespace-members-by-name.xml
@@ -18,7 +18,7 @@
     <records>CSFzdUEgi4+pu0K2D3isHXeaoFQ=</records>
     <records>NQ8uQgTcafPcttyBMHHLHAXA4MA=</records>
     <functions>s6nsa+zVhpzzrN+yUVPP5rvdXqs=</functions>
-    <functions>9JfSlZfEThLXiWTez3b8eT/AbZU=</functions>
+    <functions>yrBu1PLNI6d+uEC9ml1Q/9KAt4o=</functions>
     <functions>rvT6OxIrrSI0KxJ2nkfEgBz/Lz4=</functions>
     <functions>yuKyBhGbND+Kyypyb9UsuC4Qe3E=</functions>
     <functions>kibUx6k1SXB+HsXkRXroJl9f59w=</functions>
@@ -397,6 +397,7 @@
   </source>
   <kind>overloads</kind>
   <id>Cnsc4OfzqGbrnICr/PmPGh6bkZc=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>NQ8uQgTcafPcttyBMHHLHAXA4MA=</parent>
   <doc-comment>
@@ -430,6 +431,7 @@
   </source>
   <kind>function</kind>
   <id>WltomC+2IcmzMN0COGL0OWWmbZk=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>NQ8uQgTcafPcttyBMHHLHAXA4MA=</parent>
   <doc-comment>
@@ -462,6 +464,7 @@
   </source>
   <kind>function</kind>
   <id>aQWtFVa4Xa+eceLXiLW74q44JRk=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>NQ8uQgTcafPcttyBMHHLHAXA4MA=</parent>
   <doc-comment>
@@ -518,6 +521,7 @@
   </source>
   <kind>function</kind>
   <id>HMG56OCQ5OpB2E9hu4bG3/hoOho=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>NQ8uQgTcafPcttyBMHHLHAXA4MA=</parent>
   <doc-comment>
@@ -550,6 +554,7 @@
   </source>
   <kind>function</kind>
   <id>lBA1besl9J3wAZAcEn9C+K05hf4=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>NQ8uQgTcafPcttyBMHHLHAXA4MA=</parent>
   <named>
@@ -574,6 +579,7 @@
   </source>
   <kind>function</kind>
   <id>zQ0DYAZMF+xhfbo8hUyqZRNKJ+U=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>NQ8uQgTcafPcttyBMHHLHAXA4MA=</parent>
   <doc-comment>
@@ -628,6 +634,7 @@
   </source>
   <kind>function</kind>
   <id>rjPdhFxUkaC43tWXi+kka78JQxI=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>NQ8uQgTcafPcttyBMHHLHAXA4MA=</parent>
   <doc-comment>
@@ -686,6 +693,7 @@
   </source>
   <kind>function</kind>
   <id>atwUGLD+QHVhH3x1+8qzINNxzMY=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>NQ8uQgTcafPcttyBMHHLHAXA4MA=</parent>
   <doc-comment>
@@ -765,6 +773,7 @@
   </source>
   <kind>function</kind>
   <id>CB0pXrzU8BKZ2LF0BSpclxIfgrs=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>NQ8uQgTcafPcttyBMHHLHAXA4MA=</parent>
   <doc-comment>
@@ -844,6 +853,7 @@
   </source>
   <kind>function</kind>
   <id>6/NYLeQdPqWrbu5kHnTpE3u6Yg4=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>NQ8uQgTcafPcttyBMHHLHAXA4MA=</parent>
   <doc-comment>
@@ -964,7 +974,7 @@
     </location>
   </source>
   <kind>overloads</kind>
-  <id>9JfSlZfEThLXiWTez3b8eT/AbZU=</id>
+  <id>yrBu1PLNI6d+uEC9ml1Q/9KAt4o=</id>
   <extraction>regular</extraction>
   <parent>//////////////////////////8=</parent>
   <func-class>normal</func-class>
diff --git a/test-files/golden-tests/config/sort/sort-members.adoc b/test-files/golden-tests/config/sort/sort-members.adoc
index 162873f655..7448843ba6 100644
--- a/test-files/golden-tests/config/sort/sort-members.adoc
+++ b/test-files/golden-tests/config/sort/sort-members.adoc
@@ -27,7 +27,7 @@
 | Name| Description
 | link:#f[`f`] 
 | 
-| link:#g-0f[`g`] 
+| link:#g-0c[`g`] 
 | 
 | link:#h[`h`] 
 | 
@@ -425,7 +425,7 @@ void
 f();
 ----
 
-[#g-0f]
+[#g-0c]
 == g
 
 === Synopses
diff --git a/test-files/golden-tests/config/sort/sort-members.html b/test-files/golden-tests/config/sort/sort-members.html
index b851359ade..544b6db524 100644
--- a/test-files/golden-tests/config/sort/sort-members.html
+++ b/test-files/golden-tests/config/sort/sort-members.html
@@ -44,7 +44,7 @@ <h2>
 <tbody>
 <tr>
 <td><a href="#f"><code>f</code></a> </td><td></td></tr><tr>
-<td><a href="#g-0f"><code>g</code></a> </td><td></td></tr><tr>
+<td><a href="#g-0c"><code>g</code></a> </td><td></td></tr><tr>
 <td><a href="#h"><code>h</code></a> </td><td></td></tr><tr>
 <td><a href="#operator_not"><code>operator!</code></a> </td><td>Negation operator</td></tr><tr>
 <td><a href="#operator_eq"><code>operator&#x3D;&#x3D;</code></a> </td><td>Equality operator</td></tr><tr>
@@ -518,7 +518,7 @@ <h3>
 </div>
 <div>
 <div>
-<h2 id="g-0f">
+<h2 id="g-0c">
 g</h2>
 </div>
 <div>
diff --git a/test-files/golden-tests/config/sort/sort-members.xml b/test-files/golden-tests/config/sort/sort-members.xml
index cffd20302d..da97e6c8f0 100644
--- a/test-files/golden-tests/config/sort/sort-members.xml
+++ b/test-files/golden-tests/config/sort/sort-members.xml
@@ -18,7 +18,7 @@
     <records>CSFzdUEgi4+pu0K2D3isHXeaoFQ=</records>
     <records>NQ8uQgTcafPcttyBMHHLHAXA4MA=</records>
     <functions>s6nsa+zVhpzzrN+yUVPP5rvdXqs=</functions>
-    <functions>9JfSlZfEThLXiWTez3b8eT/AbZU=</functions>
+    <functions>yrBu1PLNI6d+uEC9ml1Q/9KAt4o=</functions>
     <functions>rvT6OxIrrSI0KxJ2nkfEgBz/Lz4=</functions>
     <functions>yuKyBhGbND+Kyypyb9UsuC4Qe3E=</functions>
     <functions>kibUx6k1SXB+HsXkRXroJl9f59w=</functions>
@@ -397,6 +397,7 @@
   </source>
   <kind>overloads</kind>
   <id>Cnsc4OfzqGbrnICr/PmPGh6bkZc=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>NQ8uQgTcafPcttyBMHHLHAXA4MA=</parent>
   <doc-comment>
@@ -430,6 +431,7 @@
   </source>
   <kind>function</kind>
   <id>WltomC+2IcmzMN0COGL0OWWmbZk=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>NQ8uQgTcafPcttyBMHHLHAXA4MA=</parent>
   <doc-comment>
@@ -462,6 +464,7 @@
   </source>
   <kind>function</kind>
   <id>aQWtFVa4Xa+eceLXiLW74q44JRk=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>NQ8uQgTcafPcttyBMHHLHAXA4MA=</parent>
   <doc-comment>
@@ -518,6 +521,7 @@
   </source>
   <kind>function</kind>
   <id>HMG56OCQ5OpB2E9hu4bG3/hoOho=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>NQ8uQgTcafPcttyBMHHLHAXA4MA=</parent>
   <doc-comment>
@@ -550,6 +554,7 @@
   </source>
   <kind>function</kind>
   <id>lBA1besl9J3wAZAcEn9C+K05hf4=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>NQ8uQgTcafPcttyBMHHLHAXA4MA=</parent>
   <named>
@@ -574,6 +579,7 @@
   </source>
   <kind>function</kind>
   <id>zQ0DYAZMF+xhfbo8hUyqZRNKJ+U=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>NQ8uQgTcafPcttyBMHHLHAXA4MA=</parent>
   <doc-comment>
@@ -628,6 +634,7 @@
   </source>
   <kind>function</kind>
   <id>rjPdhFxUkaC43tWXi+kka78JQxI=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>NQ8uQgTcafPcttyBMHHLHAXA4MA=</parent>
   <doc-comment>
@@ -686,6 +693,7 @@
   </source>
   <kind>function</kind>
   <id>atwUGLD+QHVhH3x1+8qzINNxzMY=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>NQ8uQgTcafPcttyBMHHLHAXA4MA=</parent>
   <doc-comment>
@@ -765,6 +773,7 @@
   </source>
   <kind>function</kind>
   <id>CB0pXrzU8BKZ2LF0BSpclxIfgrs=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>NQ8uQgTcafPcttyBMHHLHAXA4MA=</parent>
   <doc-comment>
@@ -844,6 +853,7 @@
   </source>
   <kind>function</kind>
   <id>6/NYLeQdPqWrbu5kHnTpE3u6Yg4=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>NQ8uQgTcafPcttyBMHHLHAXA4MA=</parent>
   <doc-comment>
@@ -964,7 +974,7 @@
     </location>
   </source>
   <kind>overloads</kind>
-  <id>9JfSlZfEThLXiWTez3b8eT/AbZU=</id>
+  <id>yrBu1PLNI6d+uEC9ml1Q/9KAt4o=</id>
   <extraction>regular</extraction>
   <parent>//////////////////////////8=</parent>
   <func-class>normal</func-class>
diff --git a/test-files/golden-tests/config/sort/unordered.adoc b/test-files/golden-tests/config/sort/unordered.adoc
index ec08d339ac..0e0af0bd54 100644
--- a/test-files/golden-tests/config/sort/unordered.adoc
+++ b/test-files/golden-tests/config/sort/unordered.adoc
@@ -33,7 +33,7 @@
 | Negation operator
 | link:#h[`h`] 
 | 
-| link:#g-0f[`g`] 
+| link:#g-0c[`g`] 
 | 
 | link:#f[`f`] 
 | 
@@ -520,7 +520,7 @@ void
 h();
 ----
 
-[#g-0f]
+[#g-0c]
 == g
 
 === Synopses
diff --git a/test-files/golden-tests/config/sort/unordered.html b/test-files/golden-tests/config/sort/unordered.html
index 262308744c..3b0aefbebe 100644
--- a/test-files/golden-tests/config/sort/unordered.html
+++ b/test-files/golden-tests/config/sort/unordered.html
@@ -47,7 +47,7 @@ <h2>
 <td><a href="#operator_eq"><code>operator&#x3D;&#x3D;</code></a> </td><td>Equality operator</td></tr><tr>
 <td><a href="#operator_not"><code>operator!</code></a> </td><td>Negation operator</td></tr><tr>
 <td><a href="#h"><code>h</code></a> </td><td></td></tr><tr>
-<td><a href="#g-0f"><code>g</code></a> </td><td></td></tr><tr>
+<td><a href="#g-0c"><code>g</code></a> </td><td></td></tr><tr>
 <td><a href="#f"><code>f</code></a> </td><td></td></tr>
 </tbody>
 </table>
@@ -650,7 +650,7 @@ <h3>
 </div>
 <div>
 <div>
-<h2 id="g-0f">
+<h2 id="g-0c">
 g</h2>
 </div>
 <div>
diff --git a/test-files/golden-tests/config/sort/unordered.xml b/test-files/golden-tests/config/sort/unordered.xml
index b14dd090e9..d90efc2c3b 100644
--- a/test-files/golden-tests/config/sort/unordered.xml
+++ b/test-files/golden-tests/config/sort/unordered.xml
@@ -21,7 +21,7 @@
     <functions>kibUx6k1SXB+HsXkRXroJl9f59w=</functions>
     <functions>yuKyBhGbND+Kyypyb9UsuC4Qe3E=</functions>
     <functions>rvT6OxIrrSI0KxJ2nkfEgBz/Lz4=</functions>
-    <functions>9JfSlZfEThLXiWTez3b8eT/AbZU=</functions>
+    <functions>yrBu1PLNI6d+uEC9ml1Q/9KAt4o=</functions>
     <functions>s6nsa+zVhpzzrN+yUVPP5rvdXqs=</functions>
   </namespace-tranche>
 </namespace>
@@ -391,6 +391,7 @@
   </source>
   <kind>function</kind>
   <id>6/NYLeQdPqWrbu5kHnTpE3u6Yg4=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>NQ8uQgTcafPcttyBMHHLHAXA4MA=</parent>
   <doc-comment>
@@ -448,6 +449,7 @@
   </source>
   <kind>function</kind>
   <id>CB0pXrzU8BKZ2LF0BSpclxIfgrs=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>NQ8uQgTcafPcttyBMHHLHAXA4MA=</parent>
   <doc-comment>
@@ -527,6 +529,7 @@
   </source>
   <kind>function</kind>
   <id>atwUGLD+QHVhH3x1+8qzINNxzMY=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>NQ8uQgTcafPcttyBMHHLHAXA4MA=</parent>
   <doc-comment>
@@ -606,6 +609,7 @@
   </source>
   <kind>function</kind>
   <id>rjPdhFxUkaC43tWXi+kka78JQxI=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>NQ8uQgTcafPcttyBMHHLHAXA4MA=</parent>
   <doc-comment>
@@ -664,6 +668,7 @@
   </source>
   <kind>function</kind>
   <id>zQ0DYAZMF+xhfbo8hUyqZRNKJ+U=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>NQ8uQgTcafPcttyBMHHLHAXA4MA=</parent>
   <doc-comment>
@@ -718,6 +723,7 @@
   </source>
   <kind>function</kind>
   <id>lBA1besl9J3wAZAcEn9C+K05hf4=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>NQ8uQgTcafPcttyBMHHLHAXA4MA=</parent>
   <named>
@@ -742,6 +748,7 @@
   </source>
   <kind>function</kind>
   <id>HMG56OCQ5OpB2E9hu4bG3/hoOho=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>NQ8uQgTcafPcttyBMHHLHAXA4MA=</parent>
   <doc-comment>
@@ -780,6 +787,7 @@
   </source>
   <kind>overloads</kind>
   <id>Cnsc4OfzqGbrnICr/PmPGh6bkZc=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>NQ8uQgTcafPcttyBMHHLHAXA4MA=</parent>
   <doc-comment>
@@ -813,6 +821,7 @@
   </source>
   <kind>function</kind>
   <id>WltomC+2IcmzMN0COGL0OWWmbZk=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>NQ8uQgTcafPcttyBMHHLHAXA4MA=</parent>
   <doc-comment>
@@ -845,6 +854,7 @@
   </source>
   <kind>function</kind>
   <id>aQWtFVa4Xa+eceLXiLW74q44JRk=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>NQ8uQgTcafPcttyBMHHLHAXA4MA=</parent>
   <doc-comment>
@@ -1252,7 +1262,7 @@
     </location>
   </source>
   <kind>overloads</kind>
-  <id>9JfSlZfEThLXiWTez3b8eT/AbZU=</id>
+  <id>yrBu1PLNI6d+uEC9ml1Q/9KAt4o=</id>
   <extraction>regular</extraction>
   <parent>//////////////////////////8=</parent>
   <func-class>normal</func-class>
diff --git a/test-files/golden-tests/filters/symbol-name/excluded-base-class.xml b/test-files/golden-tests/filters/symbol-name/excluded-base-class.xml
index c14bf55a2f..03012df967 100644
--- a/test-files/golden-tests/filters/symbol-name/excluded-base-class.xml
+++ b/test-files/golden-tests/filters/symbol-name/excluded-base-class.xml
@@ -59,6 +59,7 @@
         </name>
       </name>
     </named>
+    <access>public</access>
   </base>
   <record-interface>
     <record-tranche>
@@ -85,6 +86,7 @@
   </source>
   <kind>function</kind>
   <id>BcIYmKdVh0f6TsMPCA/M0Cmr9VI=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <is-copy-from-inherited>1</is-copy-from-inherited>
   <parent>/TldxA72JGXtufh5RbJgxLW2mwU=</parent>
@@ -109,6 +111,7 @@
   </source>
   <kind>function</kind>
   <id>o+85JO3Sv4bIWiG3+bfyUw5gJWI=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>/TldxA72JGXtufh5RbJgxLW2mwU=</parent>
   <named>
@@ -134,6 +137,7 @@
   </source>
   <kind>function</kind>
   <id>NiHV825xQJhfQDhKCeAex3UuHGY=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>/TldxA72JGXtufh5RbJgxLW2mwU=</parent>
   <named>
@@ -159,6 +163,7 @@
   </source>
   <kind>function</kind>
   <id>d5/JtPJCrP6OG8ToxUKNR5xqJ4I=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>/TldxA72JGXtufh5RbJgxLW2mwU=</parent>
   <named>
@@ -198,6 +203,7 @@
         </name>
       </name>
     </named>
+    <access>public</access>
   </base>
   <record-interface>
     <record-tranche>
@@ -224,6 +230,7 @@
   </source>
   <kind>function</kind>
   <id>e7VYD0d5BKg0c6yEn8zt92t304s=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <is-copy-from-inherited>1</is-copy-from-inherited>
   <parent>ejPqzkotYMoiJcYkJf0fmJ0UNFM=</parent>
@@ -248,6 +255,7 @@
   </source>
   <kind>function</kind>
   <id>JgPp0cAF/suYYKB1RQalvRP+hjk=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <is-copy-from-inherited>1</is-copy-from-inherited>
   <parent>ejPqzkotYMoiJcYkJf0fmJ0UNFM=</parent>
@@ -274,6 +282,7 @@
   </source>
   <kind>function</kind>
   <id>KiY+7o+uUp3h7bndNOpI2AuCrAE=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>ejPqzkotYMoiJcYkJf0fmJ0UNFM=</parent>
   <named>
@@ -299,6 +308,7 @@
   </source>
   <kind>function</kind>
   <id>0wO8aZwuOLvF7/RooHUZJ5SyKzk=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>ejPqzkotYMoiJcYkJf0fmJ0UNFM=</parent>
   <named>
diff --git a/test-files/golden-tests/filters/symbol-name/extraction-mode.xml b/test-files/golden-tests/filters/symbol-name/extraction-mode.xml
index e728175f12..32e6ebcc99 100644
--- a/test-files/golden-tests/filters/symbol-name/extraction-mode.xml
+++ b/test-files/golden-tests/filters/symbol-name/extraction-mode.xml
@@ -194,6 +194,7 @@
   </source>
   <kind>record</kind>
   <id>HIH1h4hOIdF5+btaX+gwmErtATY=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>uwCvFwfbmTvoEwwfxdL9EV+P8/c=</parent>
   <doc-comment>
@@ -229,6 +230,7 @@
   </source>
   <kind>record</kind>
   <id>ZZiAG+2jvp211xfxhzPQi3p+JQU=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>HIH1h4hOIdF5+btaX+gwmErtATY=</parent>
   <doc-comment>
@@ -959,6 +961,7 @@
   </source>
   <kind>record</kind>
   <id>bCLHAM9lOQrXlNa5dlpbk5UpW2k=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>cw0xJkxH12xMAqMkCi84zr2R6nQ=</parent>
   <doc-comment>
@@ -994,6 +997,7 @@
   </source>
   <kind>record</kind>
   <id>cF5hGQlXVxQ9lU9qT768m47j5fE=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>bCLHAM9lOQrXlNa5dlpbk5UpW2k=</parent>
   <doc-comment>
diff --git a/test-files/golden-tests/filters/symbol-name/whitelist_0.xml b/test-files/golden-tests/filters/symbol-name/whitelist_0.xml
index 8d7e3fea1a..06cb754d9b 100644
--- a/test-files/golden-tests/filters/symbol-name/whitelist_0.xml
+++ b/test-files/golden-tests/filters/symbol-name/whitelist_0.xml
@@ -584,6 +584,7 @@
   </source>
   <kind>record</kind>
   <id>WRUY2j3O9l2Pd1qDymu1ksSw07c=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>BrX2oZup9qgy4SfJloKCuUYZshA=</parent>
   <doc-comment>
@@ -626,6 +627,7 @@
   </source>
   <kind>function</kind>
   <id>/QkJ00FbaOOH1IQKxpOPbklxM0c=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>WRUY2j3O9l2Pd1qDymu1ksSw07c=</parent>
   <doc-comment>
@@ -666,6 +668,7 @@
   </source>
   <kind>function</kind>
   <id>vL6CN4hW4T9Ah0GmoIu9Hx4iaPo=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>BrX2oZup9qgy4SfJloKCuUYZshA=</parent>
   <doc-comment>
diff --git a/test-files/golden-tests/filters/symbol-type/nested-private-template.xml b/test-files/golden-tests/filters/symbol-type/nested-private-template.xml
index c4da398361..307d781bab 100644
--- a/test-files/golden-tests/filters/symbol-type/nested-private-template.xml
+++ b/test-files/golden-tests/filters/symbol-type/nested-private-template.xml
@@ -56,6 +56,7 @@
   </source>
   <kind>record</kind>
   <id>7XlFKPcXRfyYPWc4WPN3PAH+m58=</id>
+  <access>private</access>
   <extraction>regular</extraction>
   <parent>sjnSu9g/42wrfWC6AbtyVuLVV6Y=</parent>
   <key-kind>struct</key-kind>
@@ -96,6 +97,7 @@
   </source>
   <kind>record</kind>
   <id>BCRU3eMBRSysyvFsjJj+0yg+Vfc=</id>
+  <access>private</access>
   <extraction>regular</extraction>
   <parent>sjnSu9g/42wrfWC6AbtyVuLVV6Y=</parent>
   <key-kind>struct</key-kind>
diff --git a/test-files/golden-tests/javadoc/brief/brief-3.adoc b/test-files/golden-tests/javadoc/brief/brief-3.adoc
index b97aeeeaaf..f13b0f4050 100644
--- a/test-files/golden-tests/javadoc/brief/brief-3.adoc
+++ b/test-files/golden-tests/javadoc/brief/brief-3.adoc
@@ -9,11 +9,11 @@
 [cols="1,4"]
 |===
 | Name| Description
-| link:#f-0c[`f`] 
+| link:#f-01[`f`] 
 | `f` overloads
 |===
 
-[#f-0c]
+[#f-01]
 == f
 
 `f` overloads
diff --git a/test-files/golden-tests/javadoc/brief/brief-3.html b/test-files/golden-tests/javadoc/brief/brief-3.html
index 28164b5343..1db0f0280d 100644
--- a/test-files/golden-tests/javadoc/brief/brief-3.html
+++ b/test-files/golden-tests/javadoc/brief/brief-3.html
@@ -21,14 +21,14 @@ <h2>
 </thead>
 <tbody>
 <tr>
-<td><a href="#f-0c"><code>f</code></a> </td><td><code>f</code> overloads</td></tr>
+<td><a href="#f-01"><code>f</code></a> </td><td><code>f</code> overloads</td></tr>
 </tbody>
 </table>
 
 </div>
 <div>
 <div>
-<h2 id="f-0c">
+<h2 id="f-01">
 f</h2>
 <div>
 <p><code>f</code> overloads</p>
diff --git a/test-files/golden-tests/javadoc/brief/brief-3.xml b/test-files/golden-tests/javadoc/brief/brief-3.xml
index 32485ecf07..028a0ce920 100644
--- a/test-files/golden-tests/javadoc/brief/brief-3.xml
+++ b/test-files/golden-tests/javadoc/brief/brief-3.xml
@@ -8,7 +8,7 @@
   <id>//////////////////////////8=</id>
   <extraction>regular</extraction>
   <namespace-tranche>
-    <functions>x0B55dWJmTMqTXm6ZEu790gmPxY=</functions>
+    <functions>GDxqxKc4bkmO2HKXdEn9Zgy37O8=</functions>
   </namespace-tranche>
 </namespace>
 <overloads>
@@ -44,7 +44,7 @@
     </location>
   </source>
   <kind>overloads</kind>
-  <id>x0B55dWJmTMqTXm6ZEu790gmPxY=</id>
+  <id>GDxqxKc4bkmO2HKXdEn9Zgy37O8=</id>
   <extraction>regular</extraction>
   <parent>//////////////////////////8=</parent>
   <doc-comment>
diff --git a/test-files/golden-tests/javadoc/copydoc/conversion.xml b/test-files/golden-tests/javadoc/copydoc/conversion.xml
index 1e0142412f..d071a70682 100644
--- a/test-files/golden-tests/javadoc/copydoc/conversion.xml
+++ b/test-files/golden-tests/javadoc/copydoc/conversion.xml
@@ -60,6 +60,7 @@
   </source>
   <kind>overloads</kind>
   <id>TBURMVj9++7bBh2sg4BgMGmdMP4=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>YrPSaKAbmXgzCAX5WByx4eVoqBM=</parent>
   <doc-comment>
@@ -112,6 +113,7 @@
   </source>
   <kind>function</kind>
   <id>gnscUVeCG+RVOHYPi/rKmD4KT3k=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>YrPSaKAbmXgzCAX5WByx4eVoqBM=</parent>
   <doc-comment>
@@ -176,6 +178,7 @@
   </source>
   <kind>function</kind>
   <id>CGrNRU4S73WU6e3HjSzK2ehtLi0=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>YrPSaKAbmXgzCAX5WByx4eVoqBM=</parent>
   <doc-comment>
@@ -241,6 +244,7 @@
   </source>
   <kind>function</kind>
   <id>KpKT2IPgl8pNnQdWRqrAmcPRtV0=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>YrPSaKAbmXgzCAX5WByx4eVoqBM=</parent>
   <doc-comment>
@@ -283,6 +287,7 @@
   </source>
   <kind>function</kind>
   <id>DKM26GOkLsGMoiNoOqDVjK/yk6A=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>YrPSaKAbmXgzCAX5WByx4eVoqBM=</parent>
   <doc-comment>
diff --git a/test-files/golden-tests/javadoc/copydoc/decay-params.adoc b/test-files/golden-tests/javadoc/copydoc/decay-params.adoc
index 9ceb9e6f4d..ebc8db5c46 100644
--- a/test-files/golden-tests/javadoc/copydoc/decay-params.adoc
+++ b/test-files/golden-tests/javadoc/copydoc/decay-params.adoc
@@ -11,7 +11,7 @@
 | Name| Description
 | link:#bar[`bar`] 
 | Brief from `foo()`
-| link:#foo-02[`foo`] 
+| link:#foo-0a[`foo`] 
 | `foo` overloads
 |===
 
@@ -49,7 +49,7 @@ A boolean value&period;
 | An array of integers&period;
 |===
 
-[#foo-02]
+[#foo-0a]
 == foo
 
 `foo` overloads
diff --git a/test-files/golden-tests/javadoc/copydoc/decay-params.html b/test-files/golden-tests/javadoc/copydoc/decay-params.html
index 76edf11d01..18f62994fa 100644
--- a/test-files/golden-tests/javadoc/copydoc/decay-params.html
+++ b/test-files/golden-tests/javadoc/copydoc/decay-params.html
@@ -22,7 +22,7 @@ <h2>
 <tbody>
 <tr>
 <td><a href="#bar"><code>bar</code></a> </td><td>Brief from <code>foo()</code></td></tr><tr>
-<td><a href="#foo-02"><code>foo</code></a> </td><td><code>foo</code> overloads</td></tr>
+<td><a href="#foo-0a"><code>foo</code></a> </td><td><code>foo</code> overloads</td></tr>
 </tbody>
 </table>
 
@@ -75,7 +75,7 @@ <h3>
 </div>
 <div>
 <div>
-<h2 id="foo-02">
+<h2 id="foo-0a">
 foo</h2>
 <div>
 <p><code>foo</code> overloads</p>
diff --git a/test-files/golden-tests/javadoc/copydoc/decay-params.xml b/test-files/golden-tests/javadoc/copydoc/decay-params.xml
index 08ccc14115..c45af03630 100644
--- a/test-files/golden-tests/javadoc/copydoc/decay-params.xml
+++ b/test-files/golden-tests/javadoc/copydoc/decay-params.xml
@@ -9,7 +9,7 @@
   <extraction>regular</extraction>
   <namespace-tranche>
     <functions>mHoykrvnCPrloD8rIG6+dIga8dM=</functions>
-    <functions>IPZj2cmKd30EV/ztyuacllbdZcg=</functions>
+    <functions>pcjPlb94+CIWLp/GqtdwNH0kKCY=</functions>
   </namespace-tranche>
 </namespace>
 <function>
@@ -84,6 +84,7 @@
     <name>a</name>
   </param>
   <func-class>normal</func-class>
+  <constexpr>constexpr</constexpr>
 </function>
 <overloads>
   <name>foo</name>
@@ -111,7 +112,7 @@
     </location>
   </source>
   <kind>overloads</kind>
-  <id>IPZj2cmKd30EV/ztyuacllbdZcg=</id>
+  <id>pcjPlb94+CIWLp/GqtdwNH0kKCY=</id>
   <extraction>regular</extraction>
   <parent>//////////////////////////8=</parent>
   <doc-comment>
@@ -332,5 +333,6 @@
     <name>a</name>
   </param>
   <func-class>normal</func-class>
+  <constexpr>constexpr</constexpr>
 </function>
 </mrdocs>
diff --git a/test-files/golden-tests/javadoc/copydoc/fundamental.adoc b/test-files/golden-tests/javadoc/copydoc/fundamental.adoc
index a2205a55b8..7c02a0d0fa 100644
--- a/test-files/golden-tests/javadoc/copydoc/fundamental.adoc
+++ b/test-files/golden-tests/javadoc/copydoc/fundamental.adoc
@@ -9,7 +9,7 @@
 [cols="1,4"]
 |===
 | Name| Description
-| link:#f-0c[`f`] 
+| link:#f-01[`f`] 
 | `f` overloads
 | link:#g[`g`] 
 | Brief
@@ -17,7 +17,7 @@
 | Brief
 |===
 
-[#f-0c]
+[#f-01]
 == f
 
 `f` overloads
diff --git a/test-files/golden-tests/javadoc/copydoc/fundamental.html b/test-files/golden-tests/javadoc/copydoc/fundamental.html
index 1ac53f61f2..8845cc9607 100644
--- a/test-files/golden-tests/javadoc/copydoc/fundamental.html
+++ b/test-files/golden-tests/javadoc/copydoc/fundamental.html
@@ -21,7 +21,7 @@ <h2>
 </thead>
 <tbody>
 <tr>
-<td><a href="#f-0c"><code>f</code></a> </td><td><code>f</code> overloads</td></tr><tr>
+<td><a href="#f-01"><code>f</code></a> </td><td><code>f</code> overloads</td></tr><tr>
 <td><a href="#g"><code>g</code></a> </td><td>Brief</td></tr><tr>
 <td><a href="#h"><code>h</code></a> </td><td>Brief</td></tr>
 </tbody>
@@ -30,7 +30,7 @@ <h2>
 </div>
 <div>
 <div>
-<h2 id="f-0c">
+<h2 id="f-01">
 f</h2>
 <div>
 <p><code>f</code> overloads</p>
diff --git a/test-files/golden-tests/javadoc/copydoc/fundamental.xml b/test-files/golden-tests/javadoc/copydoc/fundamental.xml
index 66db07fb9b..ed15384ead 100644
--- a/test-files/golden-tests/javadoc/copydoc/fundamental.xml
+++ b/test-files/golden-tests/javadoc/copydoc/fundamental.xml
@@ -8,7 +8,7 @@
   <id>//////////////////////////8=</id>
   <extraction>regular</extraction>
   <namespace-tranche>
-    <functions>x0B55dWJmTMqTXm6ZEu790gmPxY=</functions>
+    <functions>GDxqxKc4bkmO2HKXdEn9Zgy37O8=</functions>
     <functions>YeUN6nJ9c4mQKDbDWPlXFODDK1Y=</functions>
     <functions>AF4Au7CviDbKZx+hVBlelmlAwJ0=</functions>
   </namespace-tranche>
@@ -32,7 +32,7 @@
     </location>
   </source>
   <kind>overloads</kind>
-  <id>x0B55dWJmTMqTXm6ZEu790gmPxY=</id>
+  <id>GDxqxKc4bkmO2HKXdEn9Zgy37O8=</id>
   <extraction>regular</extraction>
   <parent>//////////////////////////8=</parent>
   <doc-comment>
diff --git a/test-files/golden-tests/javadoc/copydoc/no-param.adoc b/test-files/golden-tests/javadoc/copydoc/no-param.adoc
index eba4864efc..efbb68a60e 100644
--- a/test-files/golden-tests/javadoc/copydoc/no-param.adoc
+++ b/test-files/golden-tests/javadoc/copydoc/no-param.adoc
@@ -13,7 +13,7 @@
 | Brief from `foo()`
 | link:#copyfromOverloads[`copyfromOverloads`] 
 | Brief from `foo()`
-| link:#foo-02[`foo`] 
+| link:#foo-0a5[`foo`] 
 | Brief from `foo()`
 |===
 
@@ -67,7 +67,7 @@ This documentation is copied from the page containing all overloads of foo&perio
 
 A boolean value&period;
 
-[#foo-02]
+[#foo-0a5]
 == foo
 
 Brief from `foo()`
@@ -95,10 +95,10 @@ Brief from `foo()`
 ----
 constexpr
 bool
-link:#foo-0a[foo](char ch);
+link:#foo-0af[foo](char ch);
 ----
 
-[.small]#link:#foo-0a[_» more&period;&period;&period;_]#
+[.small]#link:#foo-0af[_» more&period;&period;&period;_]#
 
 === Return Value
 
@@ -138,7 +138,7 @@ This is the function original documentation for the foo function with no paramet
 
 A boolean value&period;
 
-[#foo-0a]
+[#foo-0af]
 == foo
 
 Brief from `foo()`
diff --git a/test-files/golden-tests/javadoc/copydoc/no-param.html b/test-files/golden-tests/javadoc/copydoc/no-param.html
index 8d9dae51b1..b89b333d22 100644
--- a/test-files/golden-tests/javadoc/copydoc/no-param.html
+++ b/test-files/golden-tests/javadoc/copydoc/no-param.html
@@ -23,7 +23,7 @@ <h2>
 <tr>
 <td><a href="#copyFromNoParam"><code>copyFromNoParam</code></a> </td><td>Brief from <code>foo()</code></td></tr><tr>
 <td><a href="#copyfromOverloads"><code>copyfromOverloads</code></a> </td><td>Brief from <code>foo()</code></td></tr><tr>
-<td><a href="#foo-02"><code>foo</code></a> </td><td>Brief from <code>foo()</code></td></tr>
+<td><a href="#foo-0a5"><code>foo</code></a> </td><td>Brief from <code>foo()</code></td></tr>
 </tbody>
 </table>
 
@@ -87,7 +87,7 @@ <h3>
 </div>
 <div>
 <div>
-<h2 id="foo-02">
+<h2 id="foo-0a5">
 foo</h2>
 <div>
 <p>Brief from <code>foo()</code></p>
@@ -107,8 +107,8 @@ <h3>
 <p>Brief from <code>foo()</code></p>
 <pre><code class="source-code cpp">constexpr
 bool
-<a href="#foo-0a">foo</a>(char ch);</code></pre>
-<span class="small"><a href="#foo-0a"><em>» more...</em></a></span>
+<a href="#foo-0af">foo</a>(char ch);</code></pre>
+<span class="small"><a href="#foo-0af"><em>» more...</em></a></span>
 
 </div>
 <div>
@@ -165,7 +165,7 @@ <h3>
 </div>
 <div>
 <div>
-<h2 id="foo-0a">
+<h2 id="foo-0af">
 foo</h2>
 <div>
 <p>Brief from <code>foo()</code></p>
diff --git a/test-files/golden-tests/javadoc/copydoc/no-param.xml b/test-files/golden-tests/javadoc/copydoc/no-param.xml
index de06d32f8c..1d5af907d5 100644
--- a/test-files/golden-tests/javadoc/copydoc/no-param.xml
+++ b/test-files/golden-tests/javadoc/copydoc/no-param.xml
@@ -10,7 +10,7 @@
   <namespace-tranche>
     <functions>w/4YwvbadDuW7Jcd/fzixfCXP54=</functions>
     <functions>3y+Rt2TVgN8SW9EozffoZoL4lCI=</functions>
-    <functions>IPZj2cmKd30EV/ztyuacllbdZcg=</functions>
+    <functions>pcjPlb94+CIWLp/GqtdwNH0kKCY=</functions>
   </namespace-tranche>
 </namespace>
 <function>
@@ -73,6 +73,7 @@
     </name>
   </named>
   <func-class>normal</func-class>
+  <constexpr>constexpr</constexpr>
 </function>
 <function>
   <name>copyfromOverloads</name>
@@ -127,6 +128,7 @@
     </name>
   </named>
   <func-class>normal</func-class>
+  <constexpr>constexpr</constexpr>
 </function>
 <overloads>
   <name>foo</name>
@@ -147,7 +149,7 @@
     </location>
   </source>
   <kind>overloads</kind>
-  <id>IPZj2cmKd30EV/ztyuacllbdZcg=</id>
+  <id>pcjPlb94+CIWLp/GqtdwNH0kKCY=</id>
   <extraction>regular</extraction>
   <parent>//////////////////////////8=</parent>
   <doc-comment>
@@ -243,6 +245,7 @@
     </name>
   </named>
   <func-class>normal</func-class>
+  <constexpr>constexpr</constexpr>
 </function>
 <function>
   <name>foo</name>
@@ -314,5 +317,6 @@
     <name>ch</name>
   </param>
   <func-class>normal</func-class>
+  <constexpr>constexpr</constexpr>
 </function>
 </mrdocs>
diff --git a/test-files/golden-tests/javadoc/copydoc/operator-param.xml b/test-files/golden-tests/javadoc/copydoc/operator-param.xml
index eab467ca8a..8d00b43908 100644
--- a/test-files/golden-tests/javadoc/copydoc/operator-param.xml
+++ b/test-files/golden-tests/javadoc/copydoc/operator-param.xml
@@ -56,6 +56,7 @@
   </source>
   <kind>overloads</kind>
   <id>iwz19PoDb0ZmejgAK2mR0j19c9I=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>YrPSaKAbmXgzCAX5WByx4eVoqBM=</parent>
   <doc-comment>
@@ -106,6 +107,7 @@
   </source>
   <kind>function</kind>
   <id>+yVVNLbCaXDXfZPFoKE5xv2xPZQ=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>YrPSaKAbmXgzCAX5WByx4eVoqBM=</parent>
   <doc-comment>
@@ -156,6 +158,7 @@
     <name>ch</name>
   </param>
   <func-class>normal</func-class>
+  <constexpr>constexpr</constexpr>
   <is-record-method>1</is-record-method>
   <is-const>1</is-const>
 </function>
@@ -172,6 +175,7 @@
   </source>
   <kind>function</kind>
   <id>tslXb2aqh8tYThe+A16a9felw5M=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>YrPSaKAbmXgzCAX5WByx4eVoqBM=</parent>
   <doc-comment>
@@ -221,6 +225,7 @@
     <name>ch</name>
   </param>
   <func-class>normal</func-class>
+  <constexpr>constexpr</constexpr>
   <is-record-method>1</is-record-method>
   <is-const>1</is-const>
 </function>
diff --git a/test-files/golden-tests/javadoc/copydoc/param-types.adoc b/test-files/golden-tests/javadoc/copydoc/param-types.adoc
index 1d48ffbe88..71c11bfaa7 100644
--- a/test-files/golden-tests/javadoc/copydoc/param-types.adoc
+++ b/test-files/golden-tests/javadoc/copydoc/param-types.adoc
@@ -37,9 +37,9 @@
 [cols="1,4"]
 |===
 | Name| Description
-| link:#f-0c7[`f`] 
+| link:#f-018[`f`] 
 | `f` overloads
-| link:#g-0f[`g`] 
+| link:#g-0ca[`g`] 
 | `g` overloads
 |===
 
@@ -231,7 +231,7 @@ struct paramType;
 | Reference function&period;
 | link:#f-0b5[`f`]
 | struct param function
-| link:#f-0c1[`f`]
+| link:#f-0c[`f`]
 | Non&hyphen;variadic function
 |===
 
@@ -257,7 +257,7 @@ enum testEnum;
 | Enum param function
 |===
 
-[#f-0c7]
+[#f-018]
 == f
 
 `f` overloads
@@ -316,10 +316,10 @@ Non&hyphen;variadic function
 [source,cpp,subs="verbatim,replacements,macros,-callouts"]
 ----
 void
-link:#f-0c1[f](link:#paramType[paramType&lt;3&gt;] a);
+link:#f-0c[f](link:#paramType[paramType&lt;3&gt;] a);
 ----
 
-[.small]#link:#f-0c1[_» more&period;&period;&period;_]#
+[.small]#link:#f-0c[_» more&period;&period;&period;_]#
 
 struct param function
 
@@ -498,7 +498,7 @@ This reference uses the `&period;&period;&period;` keyword&period;
 | The first parameter of g
 |===
 
-[#f-0c1]
+[#f-0c]
 == f
 
 Non&hyphen;variadic function
@@ -684,7 +684,7 @@ This reference uses the qualified identifier `N&colon;&colon;M&colon;&colon;Q`&p
 | The first parameter of g
 |===
 
-[#g-0f]
+[#g-0ca]
 == g
 
 `g` overloads
@@ -765,12 +765,12 @@ Decltype function
 [source,cpp,subs="verbatim,replacements,macros,-callouts"]
 ----
 void
-link:#g-0c[g](
+link:#g-0c0[g](
     int a,
     decltype(a) b);
 ----
 
-[.small]#link:#g-0c[_» more&period;&period;&period;_]#
+[.small]#link:#g-0c0[_» more&period;&period;&period;_]#
 
 === Parameters
 
@@ -958,7 +958,7 @@ Documentation for a function with an enum parameter&period;
 | The first parameter of g
 |===
 
-[#g-0c]
+[#g-0c0]
 == g
 
 Decltype function
diff --git a/test-files/golden-tests/javadoc/copydoc/param-types.html b/test-files/golden-tests/javadoc/copydoc/param-types.html
index e6817c7388..ce353a5f2c 100644
--- a/test-files/golden-tests/javadoc/copydoc/param-types.html
+++ b/test-files/golden-tests/javadoc/copydoc/param-types.html
@@ -64,8 +64,8 @@ <h2>
 </thead>
 <tbody>
 <tr>
-<td><a href="#f-0c7"><code>f</code></a> </td><td><code>f</code> overloads</td></tr><tr>
-<td><a href="#g-0f"><code>g</code></a> </td><td><code>g</code> overloads</td></tr>
+<td><a href="#f-018"><code>f</code></a> </td><td><code>f</code> overloads</td></tr><tr>
+<td><a href="#g-0ca"><code>g</code></a> </td><td><code>g</code> overloads</td></tr>
 </tbody>
 </table>
 
@@ -321,7 +321,7 @@ <h2>
 <tr><td><a href="#f-081"><code>f</code></a></td><td>Qualified identifier param function</td></tr>
 <tr><td><a href="#f-08c"><code>f</code></a></td><td>Reference function.</td></tr>
 <tr><td><a href="#f-0b5"><code>f</code></a></td><td>struct param function</td></tr>
-<tr><td><a href="#f-0c1"><code>f</code></a></td><td>Non-variadic function</td></tr>
+<tr><td><a href="#f-0c"><code>f</code></a></td><td>Non-variadic function</td></tr>
 </tbody>
 </table>
 </div>
@@ -356,7 +356,7 @@ <h2>
 </div>
 <div>
 <div>
-<h2 id="f-0c7">
+<h2 id="f-018">
 f</h2>
 <div>
 <p><code>f</code> overloads</p>
@@ -389,8 +389,8 @@ <h3>
 
 <p>Non-variadic function</p>
 <pre><code class="source-code cpp">void
-<a href="#f-0c1">f</a>(<a href="#paramType">paramType&lt;3&gt;</a> a);</code></pre>
-<span class="small"><a href="#f-0c1"><em>» more...</em></a></span>
+<a href="#f-0c">f</a>(<a href="#paramType">paramType&lt;3&gt;</a> a);</code></pre>
+<span class="small"><a href="#f-0c"><em>» more...</em></a></span>
 
 <p>struct param function</p>
 <pre><code class="source-code cpp">void
@@ -584,7 +584,7 @@ <h3>
 </div>
 <div>
 <div>
-<h2 id="f-0c1">
+<h2 id="f-0c">
 f</h2>
 <div>
 <p>Non-variadic function</p>
@@ -830,7 +830,7 @@ <h3>
 </div>
 <div>
 <div>
-<h2 id="g-0f">
+<h2 id="g-0ca">
 g</h2>
 <div>
 <p><code>g</code> overloads</p>
@@ -873,10 +873,10 @@ <h3>
 
 <p>Decltype function</p>
 <pre><code class="source-code cpp">void
-<a href="#g-0c">g</a>(
+<a href="#g-0c0">g</a>(
     int a,
     decltype(a) b);</code></pre>
-<span class="small"><a href="#g-0c"><em>» more...</em></a></span>
+<span class="small"><a href="#g-0c0"><em>» more...</em></a></span>
 
 </div>
 <div>
@@ -1144,7 +1144,7 @@ <h3>
 </div>
 <div>
 <div>
-<h2 id="g-0c">
+<h2 id="g-0c0">
 g</h2>
 <div>
 <p>Decltype function</p>
diff --git a/test-files/golden-tests/javadoc/copydoc/param-types.xml b/test-files/golden-tests/javadoc/copydoc/param-types.xml
index f63c1e6365..af30f307b0 100644
--- a/test-files/golden-tests/javadoc/copydoc/param-types.xml
+++ b/test-files/golden-tests/javadoc/copydoc/param-types.xml
@@ -12,8 +12,8 @@
     <records>YrPSaKAbmXgzCAX5WByx4eVoqBM=</records>
     <records>5uZOiQm8Wn76QPmEs/Kkcw4y7Uc=</records>
     <enums>pUJEk/x997P8q+ILVKlwge3u5Ag=</enums>
-    <functions>x0B55dWJmTMqTXm6ZEu790gmPxY=</functions>
-    <functions>9JfSlZfEThLXiWTez3b8eT/AbZU=</functions>
+    <functions>GDxqxKc4bkmO2HKXdEn9Zgy37O8=</functions>
+    <functions>yrBu1PLNI6d+uEC9ml1Q/9KAt4o=</functions>
   </namespace-tranche>
 </namespace>
 <namespace>
@@ -165,6 +165,7 @@
   </source>
   <kind>function</kind>
   <id>ZtNDo4tS35tJKrXxGM1LJZVrCwA=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>YrPSaKAbmXgzCAX5WByx4eVoqBM=</parent>
   <doc-comment>
@@ -242,6 +243,7 @@
   </source>
   <kind>function</kind>
   <id>c2hExG7/ditEkntdYONY88sivsA=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>YrPSaKAbmXgzCAX5WByx4eVoqBM=</parent>
   <doc-comment>
@@ -495,7 +497,7 @@
     </location>
   </source>
   <kind>overloads</kind>
-  <id>x0B55dWJmTMqTXm6ZEu790gmPxY=</id>
+  <id>GDxqxKc4bkmO2HKXdEn9Zgy37O8=</id>
   <extraction>regular</extraction>
   <parent>//////////////////////////8=</parent>
   <doc-comment>
@@ -1362,7 +1364,7 @@
     </location>
   </source>
   <kind>overloads</kind>
-  <id>9JfSlZfEThLXiWTez3b8eT/AbZU=</id>
+  <id>yrBu1PLNI6d+uEC9ml1Q/9KAt4o=</id>
   <extraction>regular</extraction>
   <parent>//////////////////////////8=</parent>
   <doc-comment>
diff --git a/test-files/golden-tests/javadoc/copydoc/qualified.xml b/test-files/golden-tests/javadoc/copydoc/qualified.xml
index fc8060380a..3458b10289 100644
--- a/test-files/golden-tests/javadoc/copydoc/qualified.xml
+++ b/test-files/golden-tests/javadoc/copydoc/qualified.xml
@@ -70,6 +70,7 @@
   </source>
   <kind>record</kind>
   <id>xp72Inw+cnb6GxbVsJgjH7TkgII=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>xFab/Y8fwS0B1mPatfT5Qz3HpRI=</parent>
   <key-kind>struct</key-kind>
@@ -144,6 +145,7 @@
   </source>
   <kind>overloads</kind>
   <id>VwIx9C7xzurmuUedpdVgpyfl23w=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>xFab/Y8fwS0B1mPatfT5Qz3HpRI=</parent>
   <doc-comment>
@@ -193,6 +195,7 @@
   </source>
   <kind>function</kind>
   <id>pUFM90f8kBr9AsLuseHTO2tsfaM=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>xFab/Y8fwS0B1mPatfT5Qz3HpRI=</parent>
   <doc-comment>
@@ -252,6 +255,7 @@
   </source>
   <kind>function</kind>
   <id>sdXtSkU3z9AnRNxz51/MgSpAzhc=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>xFab/Y8fwS0B1mPatfT5Qz3HpRI=</parent>
   <doc-comment>
@@ -311,6 +315,7 @@
   </source>
   <kind>function</kind>
   <id>6IcyV8zPUVI0rQ9Cb7I4fWxuKOw=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>xFab/Y8fwS0B1mPatfT5Qz3HpRI=</parent>
   <doc-comment>
@@ -370,6 +375,7 @@
   </source>
   <kind>function</kind>
   <id>D9aUerVEX7T3i7vZrYEez8hDwJQ=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>xFab/Y8fwS0B1mPatfT5Qz3HpRI=</parent>
   <doc-comment>
@@ -429,6 +435,7 @@
   </source>
   <kind>function</kind>
   <id>LPZyZzCf0L+0jI1iS+qmDhm0/KM=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>xFab/Y8fwS0B1mPatfT5Qz3HpRI=</parent>
   <doc-comment>
@@ -488,6 +495,7 @@
   </source>
   <kind>function</kind>
   <id>ku9bOec7VX6p5+pyDlhlgll7QfY=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>xFab/Y8fwS0B1mPatfT5Qz3HpRI=</parent>
   <doc-comment>
@@ -547,6 +555,7 @@
   </source>
   <kind>function</kind>
   <id>l8nlq2W8r0sGfJplanVYEUfvO8o=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>xFab/Y8fwS0B1mPatfT5Qz3HpRI=</parent>
   <doc-comment>
@@ -606,6 +615,7 @@
   </source>
   <kind>function</kind>
   <id>c8O1q40UylpJzj8XWv17OnPP6Ow=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>xFab/Y8fwS0B1mPatfT5Qz3HpRI=</parent>
   <doc-comment>
@@ -672,6 +682,7 @@
   </source>
   <kind>overloads</kind>
   <id>buGkrq4c7sN9WxxEp57nMvk43N0=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>xFab/Y8fwS0B1mPatfT5Qz3HpRI=</parent>
   <doc-comment>
@@ -721,6 +732,7 @@
   </source>
   <kind>function</kind>
   <id>pkByPldRuMDs8h9fkQnHTrf/rxM=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>xFab/Y8fwS0B1mPatfT5Qz3HpRI=</parent>
   <doc-comment>
@@ -779,6 +791,7 @@
   </source>
   <kind>function</kind>
   <id>bDQUNJ3SHpCjwF8zCqo7Jw8Cjic=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>xFab/Y8fwS0B1mPatfT5Qz3HpRI=</parent>
   <doc-comment>
@@ -843,6 +856,7 @@
   </source>
   <kind>overloads</kind>
   <id>XzuysJJQNENYd3Lg4r+yuMp2bnw=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>xFab/Y8fwS0B1mPatfT5Qz3HpRI=</parent>
   <doc-comment>
@@ -892,6 +906,7 @@
   </source>
   <kind>function</kind>
   <id>8LU2TGwTCTeuAKkMvJpmvMdlTeE=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>xFab/Y8fwS0B1mPatfT5Qz3HpRI=</parent>
   <doc-comment>
@@ -960,6 +975,7 @@
   </source>
   <kind>function</kind>
   <id>aEsACCmKRAV5MPYavFglHXgugn0=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>xFab/Y8fwS0B1mPatfT5Qz3HpRI=</parent>
   <doc-comment>
diff --git a/test-files/golden-tests/javadoc/copydoc/qualifiers.xml b/test-files/golden-tests/javadoc/copydoc/qualifiers.xml
index 32f600f9df..a3b85dc98b 100644
--- a/test-files/golden-tests/javadoc/copydoc/qualifiers.xml
+++ b/test-files/golden-tests/javadoc/copydoc/qualifiers.xml
@@ -54,6 +54,7 @@
   </source>
   <kind>record</kind>
   <id>mHefDbLazHBw57+qAsFRfF7H528=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>YrPSaKAbmXgzCAX5WByx4eVoqBM=</parent>
   <key-kind>class</key-kind>
@@ -78,6 +79,7 @@
   </source>
   <kind>record</kind>
   <id>js4a2N+AFdpGVqiwDoP6CRe5qnw=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>YrPSaKAbmXgzCAX5WByx4eVoqBM=</parent>
   <key-kind>class</key-kind>
@@ -110,6 +112,7 @@
   </source>
   <kind>overloads</kind>
   <id>MmuFIkmRn2CIRDHWFph0P7qxq6s=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>YrPSaKAbmXgzCAX5WByx4eVoqBM=</parent>
   <doc-comment>
@@ -161,6 +164,7 @@
   </source>
   <kind>function</kind>
   <id>bHIVx85/epfX445qui1ES+eXxAE=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>YrPSaKAbmXgzCAX5WByx4eVoqBM=</parent>
   <doc-comment>
@@ -209,6 +213,7 @@
   </source>
   <kind>function</kind>
   <id>wdqJSwTs1MoRjomfd+M0f99GpL0=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>YrPSaKAbmXgzCAX5WByx4eVoqBM=</parent>
   <doc-comment>
@@ -258,6 +263,7 @@
   </source>
   <kind>function</kind>
   <id>nrGLN7FWjL9EkildFya4MufPTi8=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>YrPSaKAbmXgzCAX5WByx4eVoqBM=</parent>
   <doc-comment>
@@ -308,6 +314,7 @@
   </source>
   <kind>function</kind>
   <id>up/n+NenUj2VFy/iJnzCQL2/j3E=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>YrPSaKAbmXgzCAX5WByx4eVoqBM=</parent>
   <doc-comment>
@@ -374,6 +381,7 @@
   </source>
   <kind>overloads</kind>
   <id>X2obKmJv3pBU/lvZ6h+2rPfxXow=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>YrPSaKAbmXgzCAX5WByx4eVoqBM=</parent>
   <doc-comment>
@@ -420,6 +428,7 @@
   </source>
   <kind>function</kind>
   <id>UdqSOVfju1IlXGfdLPp3gwh4bQo=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>YrPSaKAbmXgzCAX5WByx4eVoqBM=</parent>
   <doc-comment>
@@ -463,6 +472,7 @@
   </source>
   <kind>function</kind>
   <id>51kEb0dyrnHV5CD4f0ndIecmNig=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>YrPSaKAbmXgzCAX5WByx4eVoqBM=</parent>
   <doc-comment>
@@ -506,6 +516,7 @@
   </source>
   <kind>function</kind>
   <id>RPHQosc2m05tKyyFkpodac2CBUU=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>YrPSaKAbmXgzCAX5WByx4eVoqBM=</parent>
   <doc-comment>
@@ -551,6 +562,7 @@
   </source>
   <kind>function</kind>
   <id>eQB30nnNgju4ULQ5w/fxpDFoRmI=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>YrPSaKAbmXgzCAX5WByx4eVoqBM=</parent>
   <doc-comment>
@@ -596,6 +608,7 @@
   </source>
   <kind>function</kind>
   <id>6KwEPWneBuFYEn0I8T3yYt0yN+k=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>YrPSaKAbmXgzCAX5WByx4eVoqBM=</parent>
   <doc-comment>
diff --git a/test-files/golden-tests/javadoc/function-object/function-object.xml b/test-files/golden-tests/javadoc/function-object/function-object.xml
index 8743a5e992..6870ea992d 100644
--- a/test-files/golden-tests/javadoc/function-object/function-object.xml
+++ b/test-files/golden-tests/javadoc/function-object/function-object.xml
@@ -66,6 +66,7 @@
   </source>
   <kind>function</kind>
   <id>SJcq0OY0c+Sn2qeErP31YsnigRE=</id>
+  <access>public</access>
   <extraction>implementation-defined</extraction>
   <parent>DBR3jN3uyfnI20zmAUSKJdd5czg=</parent>
   <doc-comment>
@@ -142,6 +143,7 @@
   </source>
   <kind>function</kind>
   <id>WetcQwZF2HLFqHvCelvdZkd3uKw=</id>
+  <access>public</access>
   <extraction>implementation-defined</extraction>
   <parent>wkfZ7hBp72uNy/H08ouKSfh83xw=</parent>
   <doc-comment>
@@ -226,6 +228,7 @@
   </source>
   <kind>function</kind>
   <id>dPBhh3IXC4bo1W1R+KW7DKUhWXc=</id>
+  <access>public</access>
   <extraction>implementation-defined</extraction>
   <parent>btOmu4Wi+12LN0yOtwktdItL6TI=</parent>
   <doc-comment>
@@ -263,6 +266,7 @@
   </source>
   <kind>function</kind>
   <id>yzemSe6FSS2yygjwWU0fDjnApag=</id>
+  <access>public</access>
   <extraction>implementation-defined</extraction>
   <parent>btOmu4Wi+12LN0yOtwktdItL6TI=</parent>
   <doc-comment>
@@ -329,6 +333,7 @@
   </source>
   <kind>function</kind>
   <id>ADXCgWvBcGrBZsanaYhrkqsGrm0=</id>
+  <access>public</access>
   <extraction>implementation-defined</extraction>
   <parent>8MtMw2t61OoqkEmw6hklgOf9YUY=</parent>
   <doc-comment>
diff --git a/test-files/golden-tests/javadoc/inline/styled.xml b/test-files/golden-tests/javadoc/inline/styled.xml
index 5bcbba48f2..3cfdc9d4ef 100644
--- a/test-files/golden-tests/javadoc/inline/styled.xml
+++ b/test-files/golden-tests/javadoc/inline/styled.xml
@@ -106,6 +106,7 @@
   </source>
   <kind>function</kind>
   <id>CKPqawUTt6FNIN9qEFTMcdnvPkI=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>YrPSaKAbmXgzCAX5WByx4eVoqBM=</parent>
   <doc-comment>
diff --git a/test-files/golden-tests/javadoc/param/param-1.xml b/test-files/golden-tests/javadoc/param/param-1.xml
index 2c5da8d5e7..22fb52bc73 100644
--- a/test-files/golden-tests/javadoc/param/param-1.xml
+++ b/test-files/golden-tests/javadoc/param/param-1.xml
@@ -80,6 +80,7 @@
         <literal>int</literal>
       </text>
       <name>i</name>
+      <direction>in</direction>
     </param>
   </doc-comment>
   <named>
@@ -122,6 +123,7 @@
         <literal>int</literal>
       </text>
       <name>i</name>
+      <direction>out</direction>
     </param>
   </doc-comment>
   <named>
@@ -166,6 +168,7 @@
         <literal>int</literal>
       </text>
       <name>i</name>
+      <direction>inout</direction>
     </param>
   </doc-comment>
   <named>
diff --git a/test-files/golden-tests/javadoc/param/param-direction.xml b/test-files/golden-tests/javadoc/param/param-direction.xml
index 1f2c003193..46df07731b 100644
--- a/test-files/golden-tests/javadoc/param/param-direction.xml
+++ b/test-files/golden-tests/javadoc/param/param-direction.xml
@@ -114,6 +114,7 @@
         </text>
       </code>
       <name>y1</name>
+      <direction>in</direction>
     </param>
   </doc-comment>
   <named>
@@ -187,6 +188,7 @@
         </text>
       </code>
       <name>y2</name>
+      <direction>out</direction>
     </param>
   </doc-comment>
   <named>
@@ -245,6 +247,7 @@
         </text>
       </code>
       <name>x3</name>
+      <direction>in</direction>
     </param>
     <param>
       <kind>param</kind>
@@ -260,6 +263,7 @@
         </text>
       </code>
       <name>y3</name>
+      <direction>out</direction>
     </param>
   </doc-comment>
   <named>
@@ -333,6 +337,7 @@
         </text>
       </code>
       <name>y4</name>
+      <direction>inout</direction>
     </param>
   </doc-comment>
   <named>
@@ -391,6 +396,7 @@
         </text>
       </code>
       <name>x5</name>
+      <direction>out</direction>
     </param>
     <param>
       <kind>param</kind>
@@ -406,6 +412,7 @@
         </text>
       </code>
       <name>y5</name>
+      <direction>in</direction>
     </param>
     <param>
       <kind>param</kind>
@@ -488,6 +495,7 @@
         </text>
       </code>
       <name>x6</name>
+      <direction>out</direction>
     </param>
     <param>
       <kind>param</kind>
@@ -518,6 +526,7 @@
         </text>
       </code>
       <name>z6</name>
+      <direction>in</direction>
     </param>
   </doc-comment>
   <named>
@@ -600,6 +609,7 @@
         </text>
       </code>
       <name>x7</name>
+      <direction>in</direction>
     </param>
     <param>
       <kind>param</kind>
@@ -615,6 +625,7 @@
         </text>
       </code>
       <name>y7</name>
+      <direction>out</direction>
     </param>
   </doc-comment>
   <named>
@@ -680,6 +691,7 @@
         </text>
       </code>
       <name>x8</name>
+      <direction>in</direction>
     </param>
   </doc-comment>
   <named>
@@ -736,6 +748,7 @@
         </text>
       </code>
       <name>x9</name>
+      <direction>in</direction>
     </param>
     <param>
       <kind>param</kind>
@@ -751,6 +764,7 @@
         </text>
       </code>
       <name>x9</name>
+      <direction>out</direction>
     </param>
   </doc-comment>
   <named>
diff --git a/test-files/golden-tests/javadoc/ref/parent_context.adoc b/test-files/golden-tests/javadoc/ref/parent_context.adoc
index 9e4bc24f38..dc358863db 100644
--- a/test-files/golden-tests/javadoc/ref/parent_context.adoc
+++ b/test-files/golden-tests/javadoc/ref/parent_context.adoc
@@ -39,7 +39,7 @@
 [cols=1]
 |===
 | Name
-| link:#boost-openmethod-final_virtual_ptr-04[`final&lowbar;virtual&lowbar;ptr`] 
+| link:#boost-openmethod-final_virtual_ptr-085[`final&lowbar;virtual&lowbar;ptr`] 
 |===
 
 [#boost-openmethod-policies]
@@ -81,9 +81,9 @@ struct runtime&lowbar;checks;
 
 === Description
 
-See link:#boost-openmethod-final_virtual_ptr-04[`final&lowbar;virtual&lowbar;ptr`]
+See link:#boost-openmethod-final_virtual_ptr-085[`final&lowbar;virtual&lowbar;ptr`]
 
-[#boost-openmethod-final_virtual_ptr-04]
+[#boost-openmethod-final_virtual_ptr-085]
 == link:#boost[boost]::link:#boost-openmethod[openmethod]::final&lowbar;virtual&lowbar;ptr
 
 === Synopses
@@ -95,10 +95,10 @@ Declared in `&lt;parent&lowbar;context&period;cpp&gt;`
 ----
 template&lt;class Arg&gt;
 auto
-link:#boost-openmethod-final_virtual_ptr-08[final&lowbar;virtual&lowbar;ptr](Arg&& obj);
+link:#boost-openmethod-final_virtual_ptr-08e[final&lowbar;virtual&lowbar;ptr](Arg&& obj);
 ----
 
-[.small]#link:#boost-openmethod-final_virtual_ptr-08[_» more&period;&period;&period;_]#
+[.small]#link:#boost-openmethod-final_virtual_ptr-08e[_» more&period;&period;&period;_]#
 
 
 [source,cpp,subs="verbatim,replacements,macros,-callouts"]
@@ -112,7 +112,7 @@ link:#boost-openmethod-final_virtual_ptr-03[final&lowbar;virtual&lowbar;ptr](Arg
 
 [.small]#link:#boost-openmethod-final_virtual_ptr-03[_» more&period;&period;&period;_]#
 
-[#boost-openmethod-final_virtual_ptr-08]
+[#boost-openmethod-final_virtual_ptr-08e]
 == link:#boost[boost]::link:#boost-openmethod[openmethod]::final&lowbar;virtual&lowbar;ptr
 
 === Synopsis
diff --git a/test-files/golden-tests/javadoc/ref/parent_context.html b/test-files/golden-tests/javadoc/ref/parent_context.html
index c19e9f0140..c16c05ff4a 100644
--- a/test-files/golden-tests/javadoc/ref/parent_context.html
+++ b/test-files/golden-tests/javadoc/ref/parent_context.html
@@ -75,7 +75,7 @@ <h2>
 </thead>
 <tbody>
 <tr>
-<td><a href="#boost-openmethod-final_virtual_ptr-04"><code>final_virtual_ptr</code></a> </td></tr>
+<td><a href="#boost-openmethod-final_virtual_ptr-085"><code>final_virtual_ptr</code></a> </td></tr>
 </tbody>
 </table>
 
@@ -138,14 +138,14 @@ <h3>
 <div>
 <h3>
 Description</h3>
-<p>See <a href="#boost-openmethod-final_virtual_ptr-04"><code>final_virtual_ptr</code></a></p>
+<p>See <a href="#boost-openmethod-final_virtual_ptr-085"><code>final_virtual_ptr</code></a></p>
 </div>
 
 
 </div>
 <div>
 <div>
-<h2 id="boost-openmethod-final_virtual_ptr-04">
+<h2 id="boost-openmethod-final_virtual_ptr-085">
 boost::openmethod::final_virtual_ptr</h2>
 </div>
 <div>
@@ -156,8 +156,8 @@ <h3>
 
 <pre><code class="source-code cpp">template&lt;class Arg&gt;
 auto
-<a href="#boost-openmethod-final_virtual_ptr-08">final_virtual_ptr</a>(Arg&& obj);</code></pre>
-<span class="small"><a href="#boost-openmethod-final_virtual_ptr-08"><em>» more...</em></a></span>
+<a href="#boost-openmethod-final_virtual_ptr-08e">final_virtual_ptr</a>(Arg&& obj);</code></pre>
+<span class="small"><a href="#boost-openmethod-final_virtual_ptr-08e"><em>» more...</em></a></span>
 
 
 <pre><code class="source-code cpp">template&lt;
@@ -171,7 +171,7 @@ <h3>
 </div>
 <div>
 <div>
-<h2 id="boost-openmethod-final_virtual_ptr-08">
+<h2 id="boost-openmethod-final_virtual_ptr-08e">
 boost::openmethod::final_virtual_ptr</h2>
 </div>
 <div>
diff --git a/test-files/golden-tests/javadoc/ref/parent_context.xml b/test-files/golden-tests/javadoc/ref/parent_context.xml
index 50e41756f5..274d4308ac 100644
--- a/test-files/golden-tests/javadoc/ref/parent_context.xml
+++ b/test-files/golden-tests/javadoc/ref/parent_context.xml
@@ -45,7 +45,7 @@
   <parent>+jO0pmMB/RXahxtatVUYoEwUKWs=</parent>
   <namespace-tranche>
     <namespaces>iyqzr2bAIIz4tcVOh2wjYTkCOC0=</namespaces>
-    <functions>RgmcrbKVGmXz6c3Lxk0nacbfXkg=</functions>
+    <functions>hR1icsm+sLZATXeAwQs0Rg3Bgbc=</functions>
   </namespace-tranche>
 </namespace>
 <namespace>
@@ -109,7 +109,7 @@
       <reference>
         <kind>reference</kind>
         <literal>final_virtual_ptr</literal>
-        <id>RgmcrbKVGmXz6c3Lxk0nacbfXkg=</id>
+        <id>hR1icsm+sLZATXeAwQs0Rg3Bgbc=</id>
       </reference>
     </paragraph>
     <brief>
@@ -147,7 +147,7 @@
     </location>
   </source>
   <kind>overloads</kind>
-  <id>RgmcrbKVGmXz6c3Lxk0nacbfXkg=</id>
+  <id>hR1icsm+sLZATXeAwQs0Rg3Bgbc=</id>
   <extraction>regular</extraction>
   <parent>8vOLQN1FS3phbXzrBx8KohfFQCw=</parent>
   <func-class>normal</func-class>
diff --git a/test-files/golden-tests/javadoc/ref/ref.xml b/test-files/golden-tests/javadoc/ref/ref.xml
index 55c2f7dd66..c72b2a5c71 100644
--- a/test-files/golden-tests/javadoc/ref/ref.xml
+++ b/test-files/golden-tests/javadoc/ref/ref.xml
@@ -118,6 +118,7 @@
   </source>
   <kind>function</kind>
   <id>UrNEyy62P/QaY1BkJmO7NDGZSj4=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>w1h8sAoo8RqYTF+5WQRakdFasXg=</parent>
   <named>
@@ -168,6 +169,7 @@
   </source>
   <kind>function</kind>
   <id>zsIKv6vJxoUhHtYtugUJIB9aWMo=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>DJrmic0LRMkHQmpzqYXGqAbcxAc=</parent>
   <named>
@@ -191,6 +193,7 @@
   </source>
   <kind>function</kind>
   <id>8ScA2YfwRe5KHsj/rEbtJeXWYz8=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>DJrmic0LRMkHQmpzqYXGqAbcxAc=</parent>
   <named>
@@ -225,6 +228,7 @@
         <identifier>C</identifier>
       </name>
     </named>
+    <access>public</access>
   </base>
   <record-interface>
     <record-tranche>
@@ -251,6 +255,7 @@
   </source>
   <kind>record</kind>
   <id>10qzjzJQhBscbAmic63bnI+Xm4g=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>/TldxA72JGXtufh5RbJgxLW2mwU=</parent>
   <doc-comment>
@@ -313,6 +318,7 @@
   </source>
   <kind>function</kind>
   <id>zsIKv6vJxoUhHtYtugUJIB9aWMo=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>DJrmic0LRMkHQmpzqYXGqAbcxAc=</parent>
   <named>
@@ -336,6 +342,7 @@
   </source>
   <kind>function</kind>
   <id>BJ7/Ds7ODvX+B2GNt69Xylatb0M=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>/TldxA72JGXtufh5RbJgxLW2mwU=</parent>
   <named>
@@ -471,6 +478,7 @@
   </source>
   <kind>function</kind>
   <id>4kEX5cyrkrbZqQhxb/7zuwJe06c=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>47VHAvq/9ANwJboZT8J8RwBjMLU=</parent>
   <named>
@@ -506,6 +514,7 @@
   </source>
   <kind>function</kind>
   <id>73SLmNIvWuD1x05NFJfjN5Tw9dI=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>47VHAvq/9ANwJboZT8J8RwBjMLU=</parent>
   <named>
@@ -541,6 +550,7 @@
   </source>
   <kind>function</kind>
   <id>eH/S82KH2Afa//Il8eL+eetP2oY=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>47VHAvq/9ANwJboZT8J8RwBjMLU=</parent>
   <named>
@@ -576,6 +586,7 @@
   </source>
   <kind>function</kind>
   <id>Ua+I8TjggG4f6Kh9Cd4PqWl+L3c=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>47VHAvq/9ANwJboZT8J8RwBjMLU=</parent>
   <named>
@@ -611,6 +622,7 @@
   </source>
   <kind>function</kind>
   <id>q1RRcpfiolN+sGlkQKFIR7zXw3Y=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>47VHAvq/9ANwJboZT8J8RwBjMLU=</parent>
   <named>
@@ -646,6 +658,7 @@
   </source>
   <kind>function</kind>
   <id>s8Sj0SHvk8ztPnOv7kqTpLOFym0=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>47VHAvq/9ANwJboZT8J8RwBjMLU=</parent>
   <named>
@@ -681,6 +694,7 @@
   </source>
   <kind>function</kind>
   <id>dgeFs66S2JTHtYJ46SdfSKrTHpw=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>47VHAvq/9ANwJboZT8J8RwBjMLU=</parent>
   <named>
@@ -716,6 +730,7 @@
   </source>
   <kind>function</kind>
   <id>6E9Wc51OXC1EuYFyXcfnRKyaSUQ=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>47VHAvq/9ANwJboZT8J8RwBjMLU=</parent>
   <named>
@@ -751,6 +766,7 @@
   </source>
   <kind>function</kind>
   <id>iRsJO4RJUDxRReCEOEGUr8z2Dog=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>47VHAvq/9ANwJboZT8J8RwBjMLU=</parent>
   <named>
@@ -786,6 +802,7 @@
   </source>
   <kind>function</kind>
   <id>uWgcvJSykruOksCy3oG6mliThTU=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>47VHAvq/9ANwJboZT8J8RwBjMLU=</parent>
   <named>
@@ -821,6 +838,7 @@
   </source>
   <kind>function</kind>
   <id>ayIMyqIPvK5ooT3+6bzqvikAe2M=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>47VHAvq/9ANwJboZT8J8RwBjMLU=</parent>
   <named>
@@ -844,6 +862,7 @@
   </source>
   <kind>function</kind>
   <id>PJEPb391sh5h9UGcBsg9S+NbbOc=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>47VHAvq/9ANwJboZT8J8RwBjMLU=</parent>
   <named>
@@ -879,6 +898,7 @@
   </source>
   <kind>function</kind>
   <id>MdfknCJ8anbDNS7X0ZYzre/aWQQ=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>47VHAvq/9ANwJboZT8J8RwBjMLU=</parent>
   <named>
@@ -914,6 +934,7 @@
   </source>
   <kind>function</kind>
   <id>gvnFfUpiWSxAgTxhtpuiEjIoCb4=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>47VHAvq/9ANwJboZT8J8RwBjMLU=</parent>
   <named>
@@ -949,6 +970,7 @@
   </source>
   <kind>function</kind>
   <id>IMTroH5DZKQ9XB1WksK3iSCShbU=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>47VHAvq/9ANwJboZT8J8RwBjMLU=</parent>
   <named>
@@ -972,6 +994,7 @@
   </source>
   <kind>function</kind>
   <id>KDQr8/lEqgd8pJtSdTnd3fC66vY=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>47VHAvq/9ANwJboZT8J8RwBjMLU=</parent>
   <named>
@@ -1007,6 +1030,7 @@
   </source>
   <kind>function</kind>
   <id>jEkSq3UPl4dH1KNAwrVl3jY5lw4=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>47VHAvq/9ANwJboZT8J8RwBjMLU=</parent>
   <named>
@@ -1030,6 +1054,7 @@
   </source>
   <kind>function</kind>
   <id>O/dGYwCIdWpqL6atSM3pmq8Yk98=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>47VHAvq/9ANwJboZT8J8RwBjMLU=</parent>
   <named>
@@ -1065,6 +1090,7 @@
   </source>
   <kind>function</kind>
   <id>CqAcZ21y0JP32hw7PHO31UxiviA=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>47VHAvq/9ANwJboZT8J8RwBjMLU=</parent>
   <named>
@@ -1100,6 +1126,7 @@
   </source>
   <kind>function</kind>
   <id>nlXVuPy3T3MP7qelm3WGXP9sxHs=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>47VHAvq/9ANwJboZT8J8RwBjMLU=</parent>
   <named>
@@ -1135,6 +1162,7 @@
   </source>
   <kind>function</kind>
   <id>rn2dr+lEU1Y+nZ76RvF705Amt7Y=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>47VHAvq/9ANwJboZT8J8RwBjMLU=</parent>
   <named>
@@ -1170,6 +1198,7 @@
   </source>
   <kind>function</kind>
   <id>UW/rnK+Cj7mGybqf3Ftz8ov8AAk=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>47VHAvq/9ANwJboZT8J8RwBjMLU=</parent>
   <named>
@@ -1205,6 +1234,7 @@
   </source>
   <kind>function</kind>
   <id>P2xgjlanIonF9IWlntd4b45qHv8=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>47VHAvq/9ANwJboZT8J8RwBjMLU=</parent>
   <named>
@@ -1240,6 +1270,7 @@
   </source>
   <kind>function</kind>
   <id>3JThobgsU4rdNkfW2McxqHS/9CA=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>47VHAvq/9ANwJboZT8J8RwBjMLU=</parent>
   <named>
@@ -1275,6 +1306,7 @@
   </source>
   <kind>function</kind>
   <id>SSFNeC35i5KtYL6Tno8HnVjyX4U=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>47VHAvq/9ANwJboZT8J8RwBjMLU=</parent>
   <named>
@@ -1310,6 +1342,7 @@
   </source>
   <kind>function</kind>
   <id>PCZOPisEjvPudnFdMOV2Wqc+HDI=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>47VHAvq/9ANwJboZT8J8RwBjMLU=</parent>
   <named>
@@ -1345,6 +1378,7 @@
   </source>
   <kind>function</kind>
   <id>MJ6J65nDyFc+MnN7Jx4/DjOFJGw=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>47VHAvq/9ANwJboZT8J8RwBjMLU=</parent>
   <named>
@@ -1380,6 +1414,7 @@
   </source>
   <kind>function</kind>
   <id>oSeQzrs59Zd9rcweG2DRZVa6OpQ=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>47VHAvq/9ANwJboZT8J8RwBjMLU=</parent>
   <named>
@@ -1415,6 +1450,7 @@
   </source>
   <kind>function</kind>
   <id>GKmeopHLbzp3t6uxUtanpR4Tdk4=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>47VHAvq/9ANwJboZT8J8RwBjMLU=</parent>
   <named>
@@ -1450,6 +1486,7 @@
   </source>
   <kind>function</kind>
   <id>i0ULCt5GV/PS0YAGQP2fValTik8=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>47VHAvq/9ANwJboZT8J8RwBjMLU=</parent>
   <named>
@@ -1473,6 +1510,7 @@
   </source>
   <kind>function</kind>
   <id>1pkl7XGJ2JVw7Xbm/xwSNKmflV4=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>47VHAvq/9ANwJboZT8J8RwBjMLU=</parent>
   <named>
@@ -1508,6 +1546,7 @@
   </source>
   <kind>function</kind>
   <id>ZoClmvCX93Yg08gfEaOD38rj0EM=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>47VHAvq/9ANwJboZT8J8RwBjMLU=</parent>
   <named>
@@ -1531,6 +1570,7 @@
   </source>
   <kind>function</kind>
   <id>k1TITJ9F+RdpX68VCHzCVjpumSE=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>47VHAvq/9ANwJboZT8J8RwBjMLU=</parent>
   <named>
@@ -1566,6 +1606,7 @@
   </source>
   <kind>function</kind>
   <id>+h1YcypZimsCxOl2AOqurQDO6/w=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>47VHAvq/9ANwJboZT8J8RwBjMLU=</parent>
   <named>
@@ -1601,6 +1642,7 @@
   </source>
   <kind>function</kind>
   <id>qZqDjtbfsftj0EhxY2cdp4y5r6E=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>47VHAvq/9ANwJboZT8J8RwBjMLU=</parent>
   <named>
@@ -1636,6 +1678,7 @@
   </source>
   <kind>function</kind>
   <id>0rK5iNi5hwJI0k+ajN7X/jsUDew=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>47VHAvq/9ANwJboZT8J8RwBjMLU=</parent>
   <named>
@@ -1671,6 +1714,7 @@
   </source>
   <kind>function</kind>
   <id>im95jlqAf+bFSRJ6laltkGbJj38=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>47VHAvq/9ANwJboZT8J8RwBjMLU=</parent>
   <named>
@@ -1706,6 +1750,7 @@
   </source>
   <kind>function</kind>
   <id>c1PYDvrte7rUAE4DaiUopjWnAWY=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>47VHAvq/9ANwJboZT8J8RwBjMLU=</parent>
   <named>
@@ -1741,6 +1786,7 @@
   </source>
   <kind>function</kind>
   <id>cqSDwRFzB3Z6A5z95/VLPQSp5GI=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>47VHAvq/9ANwJboZT8J8RwBjMLU=</parent>
   <named>
diff --git a/test-files/golden-tests/javadoc/returns/returns.xml b/test-files/golden-tests/javadoc/returns/returns.xml
index 6ba754c46d..4af30f5e4d 100644
--- a/test-files/golden-tests/javadoc/returns/returns.xml
+++ b/test-files/golden-tests/javadoc/returns/returns.xml
@@ -70,6 +70,7 @@
   </source>
   <kind>variable</kind>
   <id>zYZRwoC/XWBesPi1AQs+kPHibHI=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>Hu9BKPbk/tFDZMVcFeVpIqFnAJE=</parent>
   <named>
@@ -92,6 +93,7 @@
   </source>
   <kind>variable</kind>
   <id>AfaC9XI9L85KNgrioXVThVhljqA=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>Hu9BKPbk/tFDZMVcFeVpIqFnAJE=</parent>
   <named>
diff --git a/test-files/golden-tests/snippets/function_object.xml b/test-files/golden-tests/snippets/function_object.xml
index 0372d4af92..c298b37426 100644
--- a/test-files/golden-tests/snippets/function_object.xml
+++ b/test-files/golden-tests/snippets/function_object.xml
@@ -50,6 +50,7 @@
   </source>
   <kind>function</kind>
   <id>0fCnNSyclgzOiis0FFRJ3fBSGtM=</id>
+  <access>public</access>
   <extraction>implementation-defined</extraction>
   <parent>7X78dvKaHCvXfNokuB9sZf6Fq4o=</parent>
   <doc-comment>
diff --git a/test-files/golden-tests/symbols/concept/requires-clause.adoc b/test-files/golden-tests/symbols/concept/requires-clause.adoc
index 239e905cd3..7abcad3f1f 100644
--- a/test-files/golden-tests/symbols/concept/requires-clause.adoc
+++ b/test-files/golden-tests/symbols/concept/requires-clause.adoc
@@ -19,7 +19,7 @@
 |===
 | Name
 | link:#f[`f`] 
-| link:#g-0f49[`g`] 
+| link:#g-0c[`g`] 
 |===
 
 [#A-09]
@@ -65,7 +65,7 @@ f()
 requires (sizeof(U) &equals;&equals; 2);
 ----
 
-[#g-0f49]
+[#g-0c]
 == g
 
 === Synopses
@@ -89,10 +89,10 @@ link:#g-0d[g]();
 template&lt;typename T&gt;
 requires (sizeof(T) &equals;&equals; 4)
 void
-link:#g-0f4d[g]();
+link:#g-0f[g]();
 ----
 
-[.small]#link:#g-0f4d[_» more&period;&period;&period;_]#
+[.small]#link:#g-0f[_» more&period;&period;&period;_]#
 
 
 [source,cpp,subs="verbatim,replacements,macros,-callouts"]
@@ -120,7 +120,7 @@ void
 g();
 ----
 
-[#g-0f4d]
+[#g-0f]
 == g
 
 === Synopsis
diff --git a/test-files/golden-tests/symbols/concept/requires-clause.html b/test-files/golden-tests/symbols/concept/requires-clause.html
index 6db9c317b3..a439b96e09 100644
--- a/test-files/golden-tests/symbols/concept/requires-clause.html
+++ b/test-files/golden-tests/symbols/concept/requires-clause.html
@@ -37,7 +37,7 @@ <h2>
 <tbody>
 <tr>
 <td><a href="#f"><code>f</code></a> </td></tr><tr>
-<td><a href="#g-0f49"><code>g</code></a> </td></tr>
+<td><a href="#g-0c"><code>g</code></a> </td></tr>
 </tbody>
 </table>
 
@@ -94,7 +94,7 @@ <h3>
 </div>
 <div>
 <div>
-<h2 id="g-0f49">
+<h2 id="g-0c">
 g</h2>
 </div>
 <div>
@@ -113,8 +113,8 @@ <h3>
 <pre><code class="source-code cpp">template&lt;typename T&gt;
 requires (sizeof(T) &#x3D;&#x3D; 4)
 void
-<a href="#g-0f4d">g</a>();</code></pre>
-<span class="small"><a href="#g-0f4d"><em>» more...</em></a></span>
+<a href="#g-0f">g</a>();</code></pre>
+<span class="small"><a href="#g-0f"><em>» more...</em></a></span>
 
 
 <pre><code class="source-code cpp">template&lt;typename U&gt;
@@ -143,7 +143,7 @@ <h3>
 </div>
 <div>
 <div>
-<h2 id="g-0f4d">
+<h2 id="g-0f">
 g</h2>
 </div>
 <div>
diff --git a/test-files/golden-tests/symbols/concept/requires-clause.xml b/test-files/golden-tests/symbols/concept/requires-clause.xml
index ed2c11e5d2..8b801f16b9 100644
--- a/test-files/golden-tests/symbols/concept/requires-clause.xml
+++ b/test-files/golden-tests/symbols/concept/requires-clause.xml
@@ -11,7 +11,7 @@
     <records>kkH6jADpFuYV65W9qUpVvq20Cgs=</records>
     <records>EBNjyD4nMb0o/Bpkztrno/0a+tA=</records>
     <functions>PmhXjCXUJYVnj/a7NhfjjSesyp0=</functions>
-    <functions>9JfSlZfEThLXiWTez3b8eT/AbZU=</functions>
+    <functions>yrBu1PLNI6d+uEC9ml1Q/9KAt4o=</functions>
   </namespace-tranche>
 </namespace>
 <record>
@@ -143,7 +143,7 @@
     </location>
   </source>
   <kind>overloads</kind>
-  <id>9JfSlZfEThLXiWTez3b8eT/AbZU=</id>
+  <id>yrBu1PLNI6d+uEC9ml1Q/9KAt4o=</id>
   <extraction>regular</extraction>
   <parent>//////////////////////////8=</parent>
   <func-class>normal</func-class>
diff --git a/test-files/golden-tests/symbols/function/explicit-conv-operator.xml b/test-files/golden-tests/symbols/function/explicit-conv-operator.xml
index 35c1e9fbd9..2c286707cb 100644
--- a/test-files/golden-tests/symbols/function/explicit-conv-operator.xml
+++ b/test-files/golden-tests/symbols/function/explicit-conv-operator.xml
@@ -51,6 +51,7 @@
   </source>
   <kind>function</kind>
   <id>64zY8rVu+TzEUayzMrnV65i9nFc=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>bonobNKGOblPVcRjxpiPan4nYnc=</parent>
   <doc-comment>
@@ -141,6 +142,7 @@
   </source>
   <kind>function</kind>
   <id>q6N8XkMK9WWWGKNQnlx/o2E1EYc=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>ztb0u1Q4SVBUQ0roTOM7MFlUt/o=</parent>
   <doc-comment>
@@ -219,6 +221,7 @@
   </source>
   <kind>function</kind>
   <id>hJXOxv26Y9uxUYMMVZRsp3Wps4A=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>Lt5u3k14Z7EBxY7Ike3h9qkJ0fo=</parent>
   <doc-comment>
@@ -297,6 +300,7 @@
   </source>
   <kind>function</kind>
   <id>9tpZWv9eJGfWj37jmTdNTg+gp14=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>htdCGapMsdazR1XkXoanrOCkvDE=</parent>
   <doc-comment>
diff --git a/test-files/golden-tests/symbols/function/explicit-ctor.xml b/test-files/golden-tests/symbols/function/explicit-ctor.xml
index 2e8c1a432a..cb37109058 100644
--- a/test-files/golden-tests/symbols/function/explicit-ctor.xml
+++ b/test-files/golden-tests/symbols/function/explicit-ctor.xml
@@ -69,6 +69,7 @@
   </source>
   <kind>overloads</kind>
   <id>Q0rFzGKBYJzUfWemkMds75mPjJU=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>bonobNKGOblPVcRjxpiPan4nYnc=</parent>
   <doc-comment>
@@ -104,6 +105,7 @@
   </source>
   <kind>function</kind>
   <id>JPrjQsrkg+QoApI2wln2eGwCGP4=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>bonobNKGOblPVcRjxpiPan4nYnc=</parent>
   <doc-comment>
@@ -136,6 +138,7 @@
   </source>
   <kind>function</kind>
   <id>CuzDbFSxtCdVcGerq2UySnHF7po=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>bonobNKGOblPVcRjxpiPan4nYnc=</parent>
   <doc-comment>
@@ -189,6 +192,7 @@
   </source>
   <kind>function</kind>
   <id>saOH3agrCzNHcRhbXHOM0FYFxGc=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>bonobNKGOblPVcRjxpiPan4nYnc=</parent>
   <doc-comment>
@@ -241,6 +245,7 @@
   </source>
   <kind>function</kind>
   <id>Oj6cGCOaarVfZXkgsr/pOPOOiFY=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>bonobNKGOblPVcRjxpiPan4nYnc=</parent>
   <doc-comment>
@@ -344,6 +349,7 @@
   </source>
   <kind>overloads</kind>
   <id>f+Hwm4zWY/Tvp2r3/j/hgeahqjE=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>ztb0u1Q4SVBUQ0roTOM7MFlUt/o=</parent>
   <doc-comment>
@@ -379,6 +385,7 @@
   </source>
   <kind>function</kind>
   <id>s6L5UKI8FLTRiyny1rXgYxG/f/0=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>ztb0u1Q4SVBUQ0roTOM7MFlUt/o=</parent>
   <doc-comment>
@@ -411,6 +418,7 @@
   </source>
   <kind>function</kind>
   <id>Ty1Sv+L6at7TykYdCITSQKmXwVs=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>ztb0u1Q4SVBUQ0roTOM7MFlUt/o=</parent>
   <doc-comment>
@@ -464,6 +472,7 @@
   </source>
   <kind>function</kind>
   <id>gDoLCstIvgYYJng1jhLOLe/yz+Q=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>ztb0u1Q4SVBUQ0roTOM7MFlUt/o=</parent>
   <doc-comment>
@@ -516,6 +525,7 @@
   </source>
   <kind>function</kind>
   <id>J31K1hQq31LWiQhVy5ro0V+1pD0=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>ztb0u1Q4SVBUQ0roTOM7MFlUt/o=</parent>
   <doc-comment>
@@ -607,6 +617,7 @@
   </source>
   <kind>overloads</kind>
   <id>dnlN/iFc3Ih19qTLmv3gczFwHjA=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>Lt5u3k14Z7EBxY7Ike3h9qkJ0fo=</parent>
   <doc-comment>
@@ -642,6 +653,7 @@
   </source>
   <kind>function</kind>
   <id>GVN7KvqFotNClBLUnxR3nnPlH7Y=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>Lt5u3k14Z7EBxY7Ike3h9qkJ0fo=</parent>
   <doc-comment>
@@ -674,6 +686,7 @@
   </source>
   <kind>function</kind>
   <id>gsl+2i8v8v4Lifq3SZ5sFhSfseQ=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>Lt5u3k14Z7EBxY7Ike3h9qkJ0fo=</parent>
   <doc-comment>
@@ -727,6 +740,7 @@
   </source>
   <kind>function</kind>
   <id>qXjKOO0FQ3p2vTehkEQl2kIKpFs=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>Lt5u3k14Z7EBxY7Ike3h9qkJ0fo=</parent>
   <doc-comment>
@@ -779,6 +793,7 @@
   </source>
   <kind>function</kind>
   <id>T0aRgSzz7xtFbPWKv3q57ueIYlI=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>Lt5u3k14Z7EBxY7Ike3h9qkJ0fo=</parent>
   <doc-comment>
@@ -870,6 +885,7 @@
   </source>
   <kind>overloads</kind>
   <id>EX6X/2XknCtjmarXemc0JA+x364=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>htdCGapMsdazR1XkXoanrOCkvDE=</parent>
   <doc-comment>
@@ -905,6 +921,7 @@
   </source>
   <kind>function</kind>
   <id>3sd37ryB4gMx1BgYdDdQzVJFniU=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>htdCGapMsdazR1XkXoanrOCkvDE=</parent>
   <doc-comment>
@@ -937,6 +954,7 @@
   </source>
   <kind>function</kind>
   <id>Tj9uY+jY7QBYQC8IsjplHuoDgQo=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>htdCGapMsdazR1XkXoanrOCkvDE=</parent>
   <doc-comment>
@@ -990,6 +1008,7 @@
   </source>
   <kind>function</kind>
   <id>iQOO8pEh0iNSnpupVwR9tCVIf8U=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>htdCGapMsdazR1XkXoanrOCkvDE=</parent>
   <doc-comment>
@@ -1042,6 +1061,7 @@
   </source>
   <kind>function</kind>
   <id>XCoHYDLlYJYpV6Ut7Ms0GjcQKjM=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>htdCGapMsdazR1XkXoanrOCkvDE=</parent>
   <doc-comment>
diff --git a/test-files/golden-tests/symbols/function/explicit-object-parameter.xml b/test-files/golden-tests/symbols/function/explicit-object-parameter.xml
index bc4963059d..d04266338b 100644
--- a/test-files/golden-tests/symbols/function/explicit-object-parameter.xml
+++ b/test-files/golden-tests/symbols/function/explicit-object-parameter.xml
@@ -54,6 +54,7 @@
   </source>
   <kind>overloads</kind>
   <id>yAoBkmRqQkJsKfweNOdQt2SnUkc=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>/TAtWMuvF+kz/B0ChmDlGQtnkaA=</parent>
   <func-class>normal</func-class>
@@ -76,6 +77,7 @@
   </source>
   <kind>function</kind>
   <id>XLLL4h9bZlRyA4AQMlfVPCuwMoU=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>/TAtWMuvF+kz/B0ChmDlGQtnkaA=</parent>
   <r-value-reference>
@@ -102,6 +104,7 @@
   </template>
   <func-class>normal</func-class>
   <is-explicit-object-member-function>1</is-explicit-object-member-function>
+  <constexpr>constexpr</constexpr>
   <is-record-method>1</is-record-method>
 </function>
 <function>
@@ -116,6 +119,7 @@
   </source>
   <kind>function</kind>
   <id>aOpxAmSvyM7g6X3lLAJG5i3CTZA=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>/TAtWMuvF+kz/B0ChmDlGQtnkaA=</parent>
   <r-value-reference>
@@ -151,6 +155,7 @@
   </template>
   <func-class>normal</func-class>
   <is-explicit-object-member-function>1</is-explicit-object-member-function>
+  <constexpr>constexpr</constexpr>
   <is-record-method>1</is-record-method>
 </function>
 </mrdocs>
diff --git a/test-files/golden-tests/symbols/function/function-template-template.xml b/test-files/golden-tests/symbols/function/function-template-template.xml
index c82d2cc0c9..63f860cc79 100644
--- a/test-files/golden-tests/symbols/function/function-template-template.xml
+++ b/test-files/golden-tests/symbols/function/function-template-template.xml
@@ -52,5 +52,6 @@
     </template-tparam>
   </template>
   <func-class>normal</func-class>
+  <constexpr>constexpr</constexpr>
 </function>
 </mrdocs>
diff --git a/test-files/golden-tests/symbols/function/mem-fn.xml b/test-files/golden-tests/symbols/function/mem-fn.xml
index cd386b9270..8f48600147 100644
--- a/test-files/golden-tests/symbols/function/mem-fn.xml
+++ b/test-files/golden-tests/symbols/function/mem-fn.xml
@@ -65,6 +65,7 @@
   </source>
   <kind>function</kind>
   <id>dmtEtFE6EVKE6hWuugP9vFuib6Y=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>O2UBDeG42PMrk1up8f8PGVFhIGk=</parent>
   <named>
@@ -113,6 +114,7 @@
   </source>
   <kind>function</kind>
   <id>QPLurkQ2BXODb4xY6bw1mlNtQ28=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>H+pnPDuG6B+W6+srjVP2qhqXCrQ=</parent>
   <named>
@@ -122,6 +124,7 @@
     </name>
   </named>
   <func-class>normal</func-class>
+  <storage-class>static</storage-class>
   <is-record-method>1</is-record-method>
 </function>
 <record>
@@ -161,6 +164,7 @@
   </source>
   <kind>function</kind>
   <id>p6A5dCCvCkASDE6pH4cJA/27/o8=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>rM+ml6ikwiS9Twa1IwpCHbSHTbg=</parent>
   <named>
@@ -209,6 +213,7 @@
   </source>
   <kind>function</kind>
   <id>G71rDzcAZPSKGoGGoDswQjD1JuA=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>MBpLzhyCDdQBHul4AN2i2fR8fw0=</parent>
   <named>
@@ -257,6 +262,7 @@
   </source>
   <kind>function</kind>
   <id>rWLMsKBEv1FtDyk7Y7XNzcgmt68=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>5s81XyCIgauM5viJN9KAwx2A6DU=</parent>
   <named>
@@ -306,6 +312,7 @@
   </source>
   <kind>function</kind>
   <id>A3MUO5+pwkURxw+SBeh1y0BKv7c=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>SzwXGFnhX4HlHjHolU7XF/KEqDs=</parent>
   <named>
@@ -315,6 +322,7 @@
     </name>
   </named>
   <func-class>normal</func-class>
+  <constexpr>constexpr</constexpr>
   <is-record-method>1</is-record-method>
 </function>
 <record>
@@ -354,6 +362,7 @@
   </source>
   <kind>function</kind>
   <id>jlrEtbnYd1B6OAjYlF0gQ/oYu5w=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>WU9ZeQm0IOT8cYJkWXom3NXeWsM=</parent>
   <named>
@@ -402,6 +411,7 @@
   </source>
   <kind>function</kind>
   <id>u+MePKsNF/sYSk6UpgNS65+USGU=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>SX7tpa77UInh7a4AsMFjfiCtoLY=</parent>
   <named>
@@ -450,6 +460,7 @@
   </source>
   <kind>function</kind>
   <id>0hjrVGeDlQhdYkOu4shvWWPqNKU=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>TJnjDRnoO8E/5XEw8BaODsKxlwQ=</parent>
   <named>
@@ -499,6 +510,7 @@
   </source>
   <kind>function</kind>
   <id>+NevzZlqigIe1KSKS7eqq7pCd40=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>MXMa4TZZfdRkREzWSLpIF6ruUyw=</parent>
   <named>
@@ -548,6 +560,7 @@
   </source>
   <kind>function</kind>
   <id>I0S8eMgTnTkagm+IrM34MBiU4XI=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>7rg34TfmIwu+7zOd7DN+Dq8mLCc=</parent>
   <named>
@@ -597,6 +610,7 @@
   </source>
   <kind>function</kind>
   <id>5d5eSOvkYwBOnpbLcrkRuFvJGP4=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>NyLraUP0R3lYeyTpHQYZpyZMstc=</parent>
   <named>
@@ -648,6 +662,7 @@
   </source>
   <kind>function</kind>
   <id>1Lz3aFupR+OsCqiPOaIFWqGuyCc=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>SLJhBKx+2u4KxSJ78Fg6wqlObPc=</parent>
   <named>
@@ -699,6 +714,7 @@
   </source>
   <kind>function</kind>
   <id>wSFf8IAx5Twq6aD5T8XdnXGuhw8=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>Bu7lz+fvOPzOR6oSlAo9R8R0alg=</parent>
   <named>
@@ -748,6 +764,7 @@
   </source>
   <kind>function</kind>
   <id>OEX+TUed8FjXJPiI4c3+9WHzJl4=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>75395VGvKeZbe1EhfJwktZuWLs0=</parent>
   <named>
@@ -757,6 +774,7 @@
     </name>
   </named>
   <func-class>normal</func-class>
+  <storage-class>static</storage-class>
   <is-record-method>1</is-record-method>
 </function>
 <record>
@@ -782,6 +800,7 @@
         <identifier>T14</identifier>
       </name>
     </named>
+    <access>public</access>
   </base>
   <record-interface>
     <record-tranche>
@@ -805,6 +824,7 @@
   </source>
   <kind>function</kind>
   <id>5+yfyWtDpz80IwKT3xugro18Ev0=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>HL3/1NhKSels2G5ay7F0IYzlSLs=</parent>
   <named>
@@ -858,6 +878,7 @@
   </source>
   <kind>function</kind>
   <id>DBXd564vaQo7GHkh6XCC6HV78/I=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>FLgkhM3m0U3Lo2o3XLPUizWPH00=</parent>
   <named>
@@ -869,6 +890,7 @@
   <func-class>normal</func-class>
   <is-variadic>1</is-variadic>
   <has-trailing-return>1</has-trailing-return>
+  <constexpr>constexpr</constexpr>
   <is-record-method>1</is-record-method>
   <is-const>1</is-const>
   <is-volatile>1</is-volatile>
@@ -885,6 +907,7 @@
   </source>
   <kind>function</kind>
   <id>YOkqb7VjZXBs2Rg5gWCOYGX3Tnw=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>FLgkhM3m0U3Lo2o3XLPUizWPH00=</parent>
   <named>
@@ -913,6 +936,7 @@
   </source>
   <kind>function</kind>
   <id>II436kVwM/ZBYOf9q474VxRXK6c=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>FLgkhM3m0U3Lo2o3XLPUizWPH00=</parent>
   <named>
@@ -923,6 +947,8 @@
   </named>
   <func-class>normal</func-class>
   <has-trailing-return>1</has-trailing-return>
+  <constexpr>constexpr</constexpr>
+  <storage-class>static</storage-class>
   <is-record-method>1</is-record-method>
 </function>
 <record>
@@ -948,6 +974,7 @@
         <identifier>U</identifier>
       </name>
     </named>
+    <access>public</access>
   </base>
   <record-interface>
     <record-tranche>
@@ -973,6 +1000,7 @@
   </source>
   <kind>function</kind>
   <id>DBXd564vaQo7GHkh6XCC6HV78/I=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>FLgkhM3m0U3Lo2o3XLPUizWPH00=</parent>
   <named>
@@ -984,6 +1012,7 @@
   <func-class>normal</func-class>
   <is-variadic>1</is-variadic>
   <has-trailing-return>1</has-trailing-return>
+  <constexpr>constexpr</constexpr>
   <is-record-method>1</is-record-method>
   <is-const>1</is-const>
   <is-volatile>1</is-volatile>
@@ -1000,6 +1029,7 @@
   </source>
   <kind>function</kind>
   <id>/C2pxLlwRMKnr6YRbVnykUArzEI=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>9kzYwt0WPztMEDUaFxul1Jvqqs8=</parent>
   <named>
@@ -1027,6 +1057,7 @@
   </source>
   <kind>function</kind>
   <id>II436kVwM/ZBYOf9q474VxRXK6c=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>FLgkhM3m0U3Lo2o3XLPUizWPH00=</parent>
   <named>
@@ -1037,6 +1068,8 @@
   </named>
   <func-class>normal</func-class>
   <has-trailing-return>1</has-trailing-return>
+  <constexpr>constexpr</constexpr>
+  <storage-class>static</storage-class>
   <is-record-method>1</is-record-method>
 </function>
 </mrdocs>
diff --git a/test-files/golden-tests/symbols/function/noreturn.xml b/test-files/golden-tests/symbols/function/noreturn.xml
index 30e5f99d32..ea212a8adb 100644
--- a/test-files/golden-tests/symbols/function/noreturn.xml
+++ b/test-files/golden-tests/symbols/function/noreturn.xml
@@ -53,6 +53,7 @@
   </source>
   <kind>function</kind>
   <id>TkBjWwqMDycyUbq+TJZ9qfUhSn0=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>CgGNdHpW5mG/i5741WPYQDw28OQ=</parent>
   <named>
@@ -78,6 +79,7 @@
   </source>
   <kind>function</kind>
   <id>QjsWLydQujVa097RP8f2Lq3nLQ4=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>CgGNdHpW5mG/i5741WPYQDw28OQ=</parent>
   <named>
@@ -88,6 +90,7 @@
   </named>
   <func-class>normal</func-class>
   <is-no-return>1</is-no-return>
+  <storage-class>static</storage-class>
   <is-record-method>1</is-record-method>
   <attributes>noreturn</attributes>
 </function>
diff --git a/test-files/golden-tests/symbols/function/overloaded-op-1.xml b/test-files/golden-tests/symbols/function/overloaded-op-1.xml
index 6a17c0bf9e..9a958db8b5 100644
--- a/test-files/golden-tests/symbols/function/overloaded-op-1.xml
+++ b/test-files/golden-tests/symbols/function/overloaded-op-1.xml
@@ -48,6 +48,7 @@
   </source>
   <kind>function</kind>
   <id>2JysU2zJdfiiAb7nyNnvkDzkKvU=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>CgGNdHpW5mG/i5741WPYQDw28OQ=</parent>
   <doc-comment>
diff --git a/test-files/golden-tests/symbols/function/overloaded-op-2.xml b/test-files/golden-tests/symbols/function/overloaded-op-2.xml
index 2af1afc77a..1ad0a70317 100644
--- a/test-files/golden-tests/symbols/function/overloaded-op-2.xml
+++ b/test-files/golden-tests/symbols/function/overloaded-op-2.xml
@@ -48,6 +48,7 @@
   </source>
   <kind>function</kind>
   <id>LhEvBUAmiZm97R+EE8Wp8+CtOwU=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>CgGNdHpW5mG/i5741WPYQDw28OQ=</parent>
   <doc-comment>
diff --git a/test-files/golden-tests/symbols/function/sfinae.xml b/test-files/golden-tests/symbols/function/sfinae.xml
index cfb4b1a3c9..31e8fb5a2f 100644
--- a/test-files/golden-tests/symbols/function/sfinae.xml
+++ b/test-files/golden-tests/symbols/function/sfinae.xml
@@ -250,6 +250,7 @@
   </source>
   <kind>function</kind>
   <id>KmwKarrWHSv7aalrBX18hjPbEfs=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>IZrmVBMJu1uvsP9zur5JVrwgYmE=</parent>
   <named>
@@ -351,6 +352,7 @@
   </source>
   <kind>function</kind>
   <id>2KfuSRGlpNo9Lk/lk1bhwZqm/BY=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>g0UNZpdodOU5mGCtcpviXd8o6Vk=</parent>
   <named>
diff --git a/test-files/golden-tests/symbols/function/spec-mem-implicit-instantiation.xml b/test-files/golden-tests/symbols/function/spec-mem-implicit-instantiation.xml
index 7d5ef71cf7..74ec5b5e3a 100644
--- a/test-files/golden-tests/symbols/function/spec-mem-implicit-instantiation.xml
+++ b/test-files/golden-tests/symbols/function/spec-mem-implicit-instantiation.xml
@@ -61,6 +61,7 @@
   </source>
   <kind>record</kind>
   <id>dKDSVrZun8skBV/NUCmJyCUOvJA=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>5tUSuMtQqtYE49jBjSYSWp0DJAM=</parent>
   <key-kind>struct</key-kind>
@@ -93,6 +94,7 @@
   </source>
   <kind>function</kind>
   <id>P0HRKTdcNYA5qjhIXTqtJIxYItQ=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>dKDSVrZun8skBV/NUCmJyCUOvJA=</parent>
   <named>
@@ -116,6 +118,7 @@
   </source>
   <kind>record</kind>
   <id>UYi0dO2mWSf0nD8WRfX9JD1eJyw=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>5tUSuMtQqtYE49jBjSYSWp0DJAM=</parent>
   <key-kind>struct</key-kind>
@@ -148,6 +151,7 @@
   </source>
   <kind>function</kind>
   <id>5XAhWGI1AQuRh2DnECuhvkGU0qs=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>UYi0dO2mWSf0nD8WRfX9JD1eJyw=</parent>
   <named>
@@ -171,6 +175,7 @@
   </source>
   <kind>function</kind>
   <id>c4jAAYDw9qnOxUCpXquNT7fALUY=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>5tUSuMtQqtYE49jBjSYSWp0DJAM=</parent>
   <named>
@@ -235,6 +240,7 @@
   </source>
   <kind>record</kind>
   <id>6QY0PJXWe/WbREWJNqGWAxKfjl8=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>/vjeowK9rbOfBZNuMjVMRn2iGMo=</parent>
   <key-kind>struct</key-kind>
@@ -266,6 +272,7 @@
   </source>
   <kind>record</kind>
   <id>CmGU1i/sBhCN4qrHoR7Et/3vN18=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>/vjeowK9rbOfBZNuMjVMRn2iGMo=</parent>
   <key-kind>struct</key-kind>
@@ -297,6 +304,7 @@
   </source>
   <kind>record</kind>
   <id>EyperGIiZ7cSv/PB2BApKjPRQVA=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>/vjeowK9rbOfBZNuMjVMRn2iGMo=</parent>
   <key-kind>struct</key-kind>
@@ -342,6 +350,7 @@
   </source>
   <kind>function</kind>
   <id>4hePn1dLCqLal3xld/sSlBvpu6U=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>EyperGIiZ7cSv/PB2BApKjPRQVA=</parent>
   <named>
@@ -365,6 +374,7 @@
   </source>
   <kind>record</kind>
   <id>xYK8qpEgWzczUMGnNUx+ozeBle0=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>/vjeowK9rbOfBZNuMjVMRn2iGMo=</parent>
   <key-kind>struct</key-kind>
@@ -409,6 +419,7 @@
   </source>
   <kind>function</kind>
   <id>ks7mzzkRLaNXkyZ4CdZPO75g8js=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>xYK8qpEgWzczUMGnNUx+ozeBle0=</parent>
   <named>
@@ -432,6 +443,7 @@
   </source>
   <kind>function</kind>
   <id>MXnrYOauCPqySxkgtxhqKGFRX5w=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>/vjeowK9rbOfBZNuMjVMRn2iGMo=</parent>
   <named>
@@ -495,6 +507,7 @@
   </source>
   <kind>record</kind>
   <id>O0cvG3FLegojxWfTpLGLrtCaiDg=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>AKwlChAOi+0ttIAPsD7uitS+gk0=</parent>
   <key-kind>struct</key-kind>
@@ -526,6 +539,7 @@
   </source>
   <kind>record</kind>
   <id>kLfkJ6zwS7/fgRzTYaPfbg3WHg8=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>AKwlChAOi+0ttIAPsD7uitS+gk0=</parent>
   <key-kind>struct</key-kind>
@@ -569,6 +583,7 @@
   </source>
   <kind>function</kind>
   <id>7fGykhsl+TDnhidf/wArzvaeUXY=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>kLfkJ6zwS7/fgRzTYaPfbg3WHg8=</parent>
   <named>
@@ -592,6 +607,7 @@
   </source>
   <kind>record</kind>
   <id>TIHR+/r3scoX8MpUnGX9TnhdTMw=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>AKwlChAOi+0ttIAPsD7uitS+gk0=</parent>
   <key-kind>struct</key-kind>
@@ -629,6 +645,7 @@
   </source>
   <kind>function</kind>
   <id>5vQMmBbKdcjmr6fZ5KE/+hqkRD0=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>AKwlChAOi+0ttIAPsD7uitS+gk0=</parent>
   <named>
@@ -691,6 +708,7 @@
   </source>
   <kind>record</kind>
   <id>7YGPyrC+yNaV349G+Ofic+lrQQ0=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>C6fFmGgpPJ7jgwKJA98mfx5cxts=</parent>
   <key-kind>struct</key-kind>
@@ -728,6 +746,7 @@
   </source>
   <kind>record</kind>
   <id>bJ8v5jNLvcM2EtaEdF2cpbTmU5s=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>C6fFmGgpPJ7jgwKJA98mfx5cxts=</parent>
   <key-kind>struct</key-kind>
@@ -760,6 +779,7 @@
   </source>
   <kind>function</kind>
   <id>FnUXB08e7tKDcXA1I7E6hiu2/i0=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>bJ8v5jNLvcM2EtaEdF2cpbTmU5s=</parent>
   <named>
@@ -783,6 +803,7 @@
   </source>
   <kind>function</kind>
   <id>Bkfxhhw3rhTX4AsAahIpOZcNmmo=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>C6fFmGgpPJ7jgwKJA98mfx5cxts=</parent>
   <named>
@@ -832,6 +853,7 @@
   </source>
   <kind>record</kind>
   <id>7FuwQh5wWHsQZAFDRF5GiHXiYdI=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>CSFzdUEgi4+pu0K2D3isHXeaoFQ=</parent>
   <key-kind>struct</key-kind>
@@ -864,6 +886,7 @@
   </source>
   <kind>function</kind>
   <id>cJsLsaJ126sgoCXsFOa+lMSNEVI=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>7FuwQh5wWHsQZAFDRF5GiHXiYdI=</parent>
   <named>
@@ -887,6 +910,7 @@
   </source>
   <kind>record</kind>
   <id>27+9TQyh1Vcx+C3POBLdyXJP8bo=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>CSFzdUEgi4+pu0K2D3isHXeaoFQ=</parent>
   <key-kind>struct</key-kind>
@@ -930,6 +954,7 @@
   </source>
   <kind>function</kind>
   <id>ePyn5n+volZWM9Xn5rQhbb07Yn8=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>27+9TQyh1Vcx+C3POBLdyXJP8bo=</parent>
   <named>
diff --git a/test-files/golden-tests/symbols/overloads/overloads-brief.adoc b/test-files/golden-tests/symbols/overloads/overloads-brief.adoc
index a0080c7024..2b456302cf 100644
--- a/test-files/golden-tests/symbols/overloads/overloads-brief.adoc
+++ b/test-files/golden-tests/symbols/overloads/overloads-brief.adoc
@@ -20,11 +20,11 @@
 [cols="1,4"]
 |===
 | Name| Description
-| link:#no_way_to_infer_this_brief-04[`no&lowbar;way&lowbar;to&lowbar;infer&lowbar;this&lowbar;brief`] 
+| link:#no_way_to_infer_this_brief-0f[`no&lowbar;way&lowbar;to&lowbar;infer&lowbar;this&lowbar;brief`] 
 | `no&lowbar;way&lowbar;to&lowbar;infer&lowbar;this&lowbar;brief` overloads
-| link:#operator_plus-09[`operator&plus;`] 
+| link:#operator_plus-08[`operator&plus;`] 
 | Unary plus operators
-| link:#sameBrief-07[`sameBrief`] 
+| link:#sameBrief-0f[`sameBrief`] 
 | Function with same brief
 |===
 
@@ -465,7 +465,7 @@ struct B;
 | Unary operator for B
 |===
 
-[#no_way_to_infer_this_brief-04]
+[#no_way_to_infer_this_brief-0f]
 == no&lowbar;way&lowbar;to&lowbar;infer&lowbar;this&lowbar;brief
 
 `no&lowbar;way&lowbar;to&lowbar;infer&lowbar;this&lowbar;brief` overloads
@@ -546,7 +546,7 @@ no&lowbar;way&lowbar;to&lowbar;infer&lowbar;this&lowbar;brief(int a);
 | Describe a
 |===
 
-[#operator_plus-09]
+[#operator_plus-08]
 == operator&plus;
 
 Unary plus operators
@@ -639,7 +639,7 @@ Result
 | The operand
 |===
 
-[#sameBrief-07]
+[#sameBrief-0f]
 == sameBrief
 
 Function with same brief
diff --git a/test-files/golden-tests/symbols/overloads/overloads-brief.html b/test-files/golden-tests/symbols/overloads/overloads-brief.html
index dc0ebaf644..4c4b199c69 100644
--- a/test-files/golden-tests/symbols/overloads/overloads-brief.html
+++ b/test-files/golden-tests/symbols/overloads/overloads-brief.html
@@ -36,9 +36,9 @@ <h2>
 </thead>
 <tbody>
 <tr>
-<td><a href="#no_way_to_infer_this_brief-04"><code>no_way_to_infer_this_brief</code></a> </td><td><code>no_way_to_infer_this_brief</code> overloads</td></tr><tr>
-<td><a href="#operator_plus-09"><code>operator+</code></a> </td><td>Unary plus operators</td></tr><tr>
-<td><a href="#sameBrief-07"><code>sameBrief</code></a> </td><td>Function with same brief</td></tr>
+<td><a href="#no_way_to_infer_this_brief-0f"><code>no_way_to_infer_this_brief</code></a> </td><td><code>no_way_to_infer_this_brief</code> overloads</td></tr><tr>
+<td><a href="#operator_plus-08"><code>operator+</code></a> </td><td>Unary plus operators</td></tr><tr>
+<td><a href="#sameBrief-0f"><code>sameBrief</code></a> </td><td>Function with same brief</td></tr>
 </tbody>
 </table>
 
@@ -577,7 +577,7 @@ <h2>
 </div>
 <div>
 <div>
-<h2 id="no_way_to_infer_this_brief-04">
+<h2 id="no_way_to_infer_this_brief-0f">
 no_way_to_infer_this_brief</h2>
 <div>
 <p><code>no_way_to_infer_this_brief</code> overloads</p>
@@ -672,7 +672,7 @@ <h3>
 </div>
 <div>
 <div>
-<h2 id="operator_plus-09">
+<h2 id="operator_plus-08">
 operator+</h2>
 <div>
 <p>Unary plus operators</p>
@@ -782,7 +782,7 @@ <h3>
 </div>
 <div>
 <div>
-<h2 id="sameBrief-07">
+<h2 id="sameBrief-0f">
 sameBrief</h2>
 <div>
 <p>Function with same brief</p>
diff --git a/test-files/golden-tests/symbols/overloads/overloads-brief.xml b/test-files/golden-tests/symbols/overloads/overloads-brief.xml
index 0c8234d9cd..692ad32e33 100644
--- a/test-files/golden-tests/symbols/overloads/overloads-brief.xml
+++ b/test-files/golden-tests/symbols/overloads/overloads-brief.xml
@@ -10,9 +10,9 @@
   <namespace-tranche>
     <records>YrPSaKAbmXgzCAX5WByx4eVoqBM=</records>
     <records>3JsK1DO0O+wZhv+0meptQrbs3fY=</records>
-    <functions>RjY3QWFLXBVMaEm9BnT1iH8A5JU=</functions>
-    <functions>lk5hZ+u3TPuYLv5UfIl4hOGGzjM=</functions>
-    <functions>fSdp0tRtLwcb+V3z/2Nwq8IdAAU=</functions>
+    <functions>/hucOiT8pcqRdkW15dk2G/D7xlU=</functions>
+    <functions>jE+MGE9EsNiR3aQKMfpwCmL6a/k=</functions>
+    <functions>/2uLQOeZ13kuKGEODAupW4G5i8o=</functions>
   </namespace-tranche>
 </namespace>
 <record>
@@ -78,6 +78,7 @@
   </source>
   <kind>overloads</kind>
   <id>+yf24/wS549V5ZqYWGboHExPRoY=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>YrPSaKAbmXgzCAX5WByx4eVoqBM=</parent>
   <doc-comment>
@@ -120,6 +121,7 @@
   </source>
   <kind>function</kind>
   <id>NsCpw4jurMmwsYzp5jE+NgG1eLE=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>YrPSaKAbmXgzCAX5WByx4eVoqBM=</parent>
   <doc-comment>
@@ -153,6 +155,7 @@
   </source>
   <kind>function</kind>
   <id>HkGsg4usg6CytwvmqPS1ZbH99t8=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>YrPSaKAbmXgzCAX5WByx4eVoqBM=</parent>
   <doc-comment>
@@ -210,6 +213,7 @@
   </source>
   <kind>overloads</kind>
   <id>TBURMVj9++7bBh2sg4BgMGmdMP4=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>YrPSaKAbmXgzCAX5WByx4eVoqBM=</parent>
   <doc-comment>
@@ -265,6 +269,7 @@
   </source>
   <kind>function</kind>
   <id>RRhK09XtJWQqLWvHlgZUv4deW1E=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>YrPSaKAbmXgzCAX5WByx4eVoqBM=</parent>
   <doc-comment>
@@ -332,6 +337,7 @@
   </source>
   <kind>function</kind>
   <id>aOkWiNwfbs/JSs8z9GP/vTAwsbA=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>YrPSaKAbmXgzCAX5WByx4eVoqBM=</parent>
   <doc-comment>
@@ -402,6 +408,7 @@
   </source>
   <kind>overloads</kind>
   <id>DqUsxXtK/1rFeA0YoMBaT2oD5iw=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>YrPSaKAbmXgzCAX5WByx4eVoqBM=</parent>
   <doc-comment>
@@ -455,6 +462,7 @@
   </source>
   <kind>function</kind>
   <id>ycaQWu1bpL50KsLIdks09uNq0fw=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>YrPSaKAbmXgzCAX5WByx4eVoqBM=</parent>
   <doc-comment>
@@ -516,6 +524,7 @@
   </source>
   <kind>function</kind>
   <id>4jg29DjTLdYrWC4PLhyeE68ztvQ=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>YrPSaKAbmXgzCAX5WByx4eVoqBM=</parent>
   <doc-comment>
@@ -588,6 +597,7 @@
   </source>
   <kind>overloads</kind>
   <id>nmsbNfdtYwc961rRlS7GTlnL3ik=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>YrPSaKAbmXgzCAX5WByx4eVoqBM=</parent>
   <doc-comment>
@@ -630,6 +640,7 @@
   </source>
   <kind>function</kind>
   <id>JJtrUCsKraCMZOeI5dC8UzKCEmI=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>YrPSaKAbmXgzCAX5WByx4eVoqBM=</parent>
   <doc-comment>
@@ -678,6 +689,7 @@
   </source>
   <kind>function</kind>
   <id>x8gblCF18xnamr/xm7nsLiL0taU=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>YrPSaKAbmXgzCAX5WByx4eVoqBM=</parent>
   <doc-comment>
@@ -792,7 +804,7 @@
     </location>
   </source>
   <kind>overloads</kind>
-  <id>RjY3QWFLXBVMaEm9BnT1iH8A5JU=</id>
+  <id>/hucOiT8pcqRdkW15dk2G/D7xlU=</id>
   <extraction>regular</extraction>
   <parent>//////////////////////////8=</parent>
   <doc-comment>
@@ -929,7 +941,7 @@
     </location>
   </source>
   <kind>overloads</kind>
-  <id>lk5hZ+u3TPuYLv5UfIl4hOGGzjM=</id>
+  <id>jE+MGE9EsNiR3aQKMfpwCmL6a/k=</id>
   <extraction>regular</extraction>
   <parent>//////////////////////////8=</parent>
   <doc-comment>
@@ -1107,7 +1119,7 @@
     </location>
   </source>
   <kind>overloads</kind>
-  <id>fSdp0tRtLwcb+V3z/2Nwq8IdAAU=</id>
+  <id>/2uLQOeZ13kuKGEODAupW4G5i8o=</id>
   <extraction>regular</extraction>
   <parent>//////////////////////////8=</parent>
   <doc-comment>
diff --git a/test-files/golden-tests/symbols/overloads/overloads-metadata.adoc b/test-files/golden-tests/symbols/overloads/overloads-metadata.adoc
index 22ad027650..cc4a6597c3 100644
--- a/test-files/golden-tests/symbols/overloads/overloads-metadata.adoc
+++ b/test-files/golden-tests/symbols/overloads/overloads-metadata.adoc
@@ -9,11 +9,11 @@
 [cols="1,4"]
 |===
 | Name| Description
-| link:#f-0c[`f`] 
+| link:#f-01[`f`] 
 | Test function
 |===
 
-[#f-0c]
+[#f-01]
 == f
 
 Test function
diff --git a/test-files/golden-tests/symbols/overloads/overloads-metadata.html b/test-files/golden-tests/symbols/overloads/overloads-metadata.html
index 50eecf3efd..8351210e96 100644
--- a/test-files/golden-tests/symbols/overloads/overloads-metadata.html
+++ b/test-files/golden-tests/symbols/overloads/overloads-metadata.html
@@ -21,14 +21,14 @@ <h2>
 </thead>
 <tbody>
 <tr>
-<td><a href="#f-0c"><code>f</code></a> </td><td>Test function</td></tr>
+<td><a href="#f-01"><code>f</code></a> </td><td>Test function</td></tr>
 </tbody>
 </table>
 
 </div>
 <div>
 <div>
-<h2 id="f-0c">
+<h2 id="f-01">
 f</h2>
 <div>
 <p>Test function</p>
diff --git a/test-files/golden-tests/symbols/overloads/overloads-metadata.xml b/test-files/golden-tests/symbols/overloads/overloads-metadata.xml
index 36c6db7e16..7465bf5f78 100644
--- a/test-files/golden-tests/symbols/overloads/overloads-metadata.xml
+++ b/test-files/golden-tests/symbols/overloads/overloads-metadata.xml
@@ -8,7 +8,7 @@
   <id>//////////////////////////8=</id>
   <extraction>regular</extraction>
   <namespace-tranche>
-    <functions>x0B55dWJmTMqTXm6ZEu790gmPxY=</functions>
+    <functions>GDxqxKc4bkmO2HKXdEn9Zgy37O8=</functions>
   </namespace-tranche>
 </namespace>
 <overloads>
@@ -37,7 +37,7 @@
     </location>
   </source>
   <kind>overloads</kind>
-  <id>x0B55dWJmTMqTXm6ZEu790gmPxY=</id>
+  <id>GDxqxKc4bkmO2HKXdEn9Zgy37O8=</id>
   <extraction>regular</extraction>
   <parent>//////////////////////////8=</parent>
   <doc-comment>
diff --git a/test-files/golden-tests/symbols/overloads/overloads-ostream.xml b/test-files/golden-tests/symbols/overloads/overloads-ostream.xml
index db5255e98f..1861d379c7 100644
--- a/test-files/golden-tests/symbols/overloads/overloads-ostream.xml
+++ b/test-files/golden-tests/symbols/overloads/overloads-ostream.xml
@@ -74,6 +74,7 @@
   </source>
   <kind>overloads</kind>
   <id>CHEdD6V2JZOWqrKOrzrAFB01ag4=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>mPR5L0+aXmfmkEAliRYGzCDx/No=</parent>
   <doc-comment>
@@ -110,6 +111,7 @@
   </source>
   <kind>function</kind>
   <id>933XchiQ+t56rbxrI6xHFc4VHpg=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>mPR5L0+aXmfmkEAliRYGzCDx/No=</parent>
   <doc-comment>
@@ -169,6 +171,7 @@
   </source>
   <kind>function</kind>
   <id>uV72HdBWsWZ4EwLG0yd905Rczwc=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>mPR5L0+aXmfmkEAliRYGzCDx/No=</parent>
   <doc-comment>
@@ -387,6 +390,7 @@
   </source>
   <kind>overloads</kind>
   <id>/s4tLGsRLchmoXSCfp1huP12grE=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>S5XtDqY96X0u1hXzl3cx6YoVW8A=</parent>
   <doc-comment>
@@ -423,6 +427,7 @@
   </source>
   <kind>function</kind>
   <id>1fuMcZHDrARpZPSclbAk4IYVnps=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>S5XtDqY96X0u1hXzl3cx6YoVW8A=</parent>
   <doc-comment>
diff --git a/test-files/golden-tests/symbols/overloads/overloads.adoc b/test-files/golden-tests/symbols/overloads/overloads.adoc
index 21cdd18c28..3ac98e3be1 100644
--- a/test-files/golden-tests/symbols/overloads/overloads.adoc
+++ b/test-files/golden-tests/symbols/overloads/overloads.adoc
@@ -18,7 +18,7 @@
 [cols="1,4"]
 |===
 | Name| Description
-| link:#f-0c[`f`] 
+| link:#f-01[`f`] 
 | 
 | link:#operator_eq-073[`operator&equals;&equals;`] 
 | Equality operators
@@ -194,7 +194,7 @@ struct B;
 | Equality operator
 |===
 
-[#f-0c]
+[#f-01]
 == f
 
 === Synopses
diff --git a/test-files/golden-tests/symbols/overloads/overloads.html b/test-files/golden-tests/symbols/overloads/overloads.html
index d5bbded430..81214d05a4 100644
--- a/test-files/golden-tests/symbols/overloads/overloads.html
+++ b/test-files/golden-tests/symbols/overloads/overloads.html
@@ -36,7 +36,7 @@ <h2>
 </thead>
 <tbody>
 <tr>
-<td><a href="#f-0c"><code>f</code></a> </td><td></td></tr><tr>
+<td><a href="#f-01"><code>f</code></a> </td><td></td></tr><tr>
 <td><a href="#operator_eq-073"><code>operator&#x3D;&#x3D;</code></a> </td><td>Equality operators</td></tr>
 </tbody>
 </table>
@@ -245,7 +245,7 @@ <h2>
 </div>
 <div>
 <div>
-<h2 id="f-0c">
+<h2 id="f-01">
 f</h2>
 </div>
 <div>
diff --git a/test-files/golden-tests/symbols/overloads/overloads.xml b/test-files/golden-tests/symbols/overloads/overloads.xml
index b1f00d884d..9ae63760b6 100644
--- a/test-files/golden-tests/symbols/overloads/overloads.xml
+++ b/test-files/golden-tests/symbols/overloads/overloads.xml
@@ -10,7 +10,7 @@
   <namespace-tranche>
     <records>YrPSaKAbmXgzCAX5WByx4eVoqBM=</records>
     <records>3JsK1DO0O+wZhv+0meptQrbs3fY=</records>
-    <functions>x0B55dWJmTMqTXm6ZEu790gmPxY=</functions>
+    <functions>GDxqxKc4bkmO2HKXdEn9Zgy37O8=</functions>
     <functions>c3LDQg7wK1RzpLzXObmUCRAFDco=</functions>
   </namespace-tranche>
 </namespace>
@@ -64,6 +64,7 @@
   </source>
   <kind>overloads</kind>
   <id>ct3b2BagsWFMKFtMRx/UVwhsQmo=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>YrPSaKAbmXgzCAX5WByx4eVoqBM=</parent>
   <func-class>normal</func-class>
@@ -84,6 +85,7 @@
   </source>
   <kind>function</kind>
   <id>hLXvGC+nOrLQRH9lODKkgi/oUas=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>YrPSaKAbmXgzCAX5WByx4eVoqBM=</parent>
   <named>
@@ -107,6 +109,7 @@
   </source>
   <kind>function</kind>
   <id>7Bg4Ruo9NHdsGok6ICFQWW1MBuE=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>YrPSaKAbmXgzCAX5WByx4eVoqBM=</parent>
   <named>
@@ -144,6 +147,7 @@
   </source>
   <kind>overloads</kind>
   <id>2gneMpbsIf1Dp6ctLj6MDFw9p/w=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>YrPSaKAbmXgzCAX5WByx4eVoqBM=</parent>
   <func-class>normal</func-class>
@@ -164,6 +168,7 @@
   </source>
   <kind>function</kind>
   <id>qw8/QuVZ7n9UkJWa5gz1gYkPlBc=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>YrPSaKAbmXgzCAX5WByx4eVoqBM=</parent>
   <named>
@@ -173,6 +178,7 @@
     </name>
   </named>
   <func-class>normal</func-class>
+  <storage-class>static</storage-class>
   <is-record-method>1</is-record-method>
 </function>
 <function>
@@ -187,6 +193,7 @@
   </source>
   <kind>function</kind>
   <id>E2RBHdoNQKveCfR6zUiWe+Ztmtk=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>YrPSaKAbmXgzCAX5WByx4eVoqBM=</parent>
   <named>
@@ -204,6 +211,7 @@
     </named>
   </param>
   <func-class>normal</func-class>
+  <storage-class>static</storage-class>
   <is-record-method>1</is-record-method>
 </function>
 <record>
@@ -259,7 +267,7 @@
     </location>
   </source>
   <kind>overloads</kind>
-  <id>x0B55dWJmTMqTXm6ZEu790gmPxY=</id>
+  <id>GDxqxKc4bkmO2HKXdEn9Zgy37O8=</id>
   <extraction>regular</extraction>
   <parent>//////////////////////////8=</parent>
   <func-class>normal</func-class>
@@ -350,6 +358,7 @@
   </source>
   <kind>overloads</kind>
   <id>c3LDQg7wK1RzpLzXObmUCRAFDco=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>//////////////////////////8=</parent>
   <doc-comment>
@@ -385,6 +394,7 @@
   </source>
   <kind>function</kind>
   <id>7bqo4XOxyyg5NIOu+8i4lZ3L47c=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>//////////////////////////8=</parent>
   <doc-comment>
@@ -476,6 +486,7 @@
   </source>
   <kind>function</kind>
   <id>pqHl3WkOZfX6m6ltquhjuQtzXp4=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>//////////////////////////8=</parent>
   <doc-comment>
diff --git a/test-files/golden-tests/symbols/record/class-private-alias.xml b/test-files/golden-tests/symbols/record/class-private-alias.xml
index 80921fe568..5a08d0834b 100644
--- a/test-files/golden-tests/symbols/record/class-private-alias.xml
+++ b/test-files/golden-tests/symbols/record/class-private-alias.xml
@@ -49,6 +49,7 @@
   </source>
   <kind>function</kind>
   <id>rEl08eLCQtT5kTV7R87YlkuVPa8=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>pOYGF6pLJlICuiGO0Xj0daDb/to=</parent>
   <named>
diff --git a/test-files/golden-tests/symbols/record/class-template-partial-spec.xml b/test-files/golden-tests/symbols/record/class-template-partial-spec.xml
index 25414be979..e9c652ea84 100644
--- a/test-files/golden-tests/symbols/record/class-template-partial-spec.xml
+++ b/test-files/golden-tests/symbols/record/class-template-partial-spec.xml
@@ -57,6 +57,7 @@
   </source>
   <kind>record</kind>
   <id>oAtKB0INIy/QCSdQExvcQwsaZJA=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>5tUSuMtQqtYE49jBjSYSWp0DJAM=</parent>
   <key-kind>struct</key-kind>
@@ -93,6 +94,7 @@
   </source>
   <kind>record</kind>
   <id>RB9DBMAJDxjxuRQCinQOVPFSNek=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>5tUSuMtQqtYE49jBjSYSWp0DJAM=</parent>
   <key-kind>struct</key-kind>
@@ -138,6 +140,7 @@
   </source>
   <kind>record</kind>
   <id>Y/lm1lkT88vf1Ml123mbuN6Fp2Y=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>5tUSuMtQqtYE49jBjSYSWp0DJAM=</parent>
   <key-kind>struct</key-kind>
diff --git a/test-files/golden-tests/symbols/record/class-template-spec.xml b/test-files/golden-tests/symbols/record/class-template-spec.xml
index 538adeb9e5..4f240fa6b8 100644
--- a/test-files/golden-tests/symbols/record/class-template-spec.xml
+++ b/test-files/golden-tests/symbols/record/class-template-spec.xml
@@ -63,6 +63,7 @@
   </source>
   <kind>function</kind>
   <id>c4jAAYDw9qnOxUCpXquNT7fALUY=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>5tUSuMtQqtYE49jBjSYSWp0DJAM=</parent>
   <named>
@@ -123,6 +124,7 @@
   </source>
   <kind>function</kind>
   <id>NCn1LYKSU8X/x/ejZTTGKsJQLug=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>AKwlChAOi+0ttIAPsD7uitS+gk0=</parent>
   <named>
@@ -183,6 +185,7 @@
   </source>
   <kind>function</kind>
   <id>t1Sc28cdaNrQCdMKo/gCBCog34Q=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>y/8TvVlacBAIG2ds2aYgZE+zGUU=</parent>
   <named>
@@ -238,6 +241,7 @@
   </source>
   <kind>function</kind>
   <id>toIq7IwIU6fbbbkqhsEmDYWVF00=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>Bu/3QcmNOdsc7RSM3OKHnuCxGPU=</parent>
   <named>
@@ -305,6 +309,7 @@
   </source>
   <kind>function</kind>
   <id>Y1o9DjZarkgpmS4JVrc/XkZMn3k=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>ZjUaxeOoGJ0Jol9Nmn7cGRE7RCo=</parent>
   <named>
@@ -372,6 +377,7 @@
   </source>
   <kind>function</kind>
   <id>YqMF7qPhrCzrLLwscZ76goyLl0k=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>dydGCFMdrM4nOwuv3RCXqg2KCUA=</parent>
   <named>
@@ -432,6 +438,7 @@
   </source>
   <kind>function</kind>
   <id>mhp5LhlIUPVO0i2zQmcJLvBQAlk=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>8nYw0KA23eAszqSOs0wOXAD1DYQ=</parent>
   <named>
@@ -501,6 +508,7 @@
   </source>
   <kind>function</kind>
   <id>xGwiZK/5LGsqcQUgiFrCHkH3zFU=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>qrcrkE8Br83XKNMh95Dvwpph/M8=</parent>
   <named>
@@ -577,6 +585,7 @@
   </source>
   <kind>function</kind>
   <id>N2KH/LGAYrCEUFXj6hyS4bkzaIs=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>6zS87fCNnLtFfHbRWEmcdeAT1Zg=</parent>
   <named>
diff --git a/test-files/golden-tests/symbols/record/class-template-specializations-1.xml b/test-files/golden-tests/symbols/record/class-template-specializations-1.xml
index 4a12a0927b..5898b1ac6f 100644
--- a/test-files/golden-tests/symbols/record/class-template-specializations-1.xml
+++ b/test-files/golden-tests/symbols/record/class-template-specializations-1.xml
@@ -128,6 +128,7 @@
         <identifier>S0</identifier>
       </name>
     </named>
+    <access>public</access>
   </base>
   <record-interface>
     <record-tranche>
@@ -153,6 +154,7 @@
   </source>
   <kind>record</kind>
   <id>2CQyWIWOAM25oQ1AdJcdT6hFqAE=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>z/QEAP16LEoD3NlABxA6BOFpYpA=</parent>
   <key-kind>struct</key-kind>
@@ -179,6 +181,7 @@
   </source>
   <kind>record</kind>
   <id>oNfOAnUjZE7WlBGdMiNtQ9ePi8g=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>2CQyWIWOAM25oQ1AdJcdT6hFqAE=</parent>
   <key-kind>struct</key-kind>
@@ -232,6 +235,7 @@
   </source>
   <kind>record</kind>
   <id>LjJr8jL1hFRtsFi7N5gXIU8pmt8=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>oNfOAnUjZE7WlBGdMiNtQ9ePi8g=</parent>
   <key-kind>struct</key-kind>
@@ -257,6 +261,7 @@
   </source>
   <kind>function</kind>
   <id>kggTp6wAC1WcJ2lc/xWgjVAOQuA=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>LjJr8jL1hFRtsFi7N5gXIU8pmt8=</parent>
   <named>
@@ -280,6 +285,7 @@
   </source>
   <kind>record</kind>
   <id>8UtqZHVItGCqKLwlXny0WJDLkDQ=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>oNfOAnUjZE7WlBGdMiNtQ9ePi8g=</parent>
   <key-kind>struct</key-kind>
@@ -331,6 +337,7 @@
   </source>
   <kind>function</kind>
   <id>Yvbv/xeM6X331Nb6AJbcVkWAahI=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>8UtqZHVItGCqKLwlXny0WJDLkDQ=</parent>
   <named>
@@ -354,6 +361,7 @@
   </source>
   <kind>function</kind>
   <id>5LiMTgzbzcSlhmq/BqmjMgGLylU=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>oNfOAnUjZE7WlBGdMiNtQ9ePi8g=</parent>
   <named>
@@ -377,6 +385,7 @@
   </source>
   <kind>function</kind>
   <id>Smls1Gk2gVcm6OCyBWhckfHGjdY=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>2CQyWIWOAM25oQ1AdJcdT6hFqAE=</parent>
   <named>
@@ -400,6 +409,7 @@
   </source>
   <kind>record</kind>
   <id>t/fAg/z+G5QClTBG74e6bR64CDI=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>z/QEAP16LEoD3NlABxA6BOFpYpA=</parent>
   <key-kind>struct</key-kind>
@@ -452,6 +462,7 @@
   </source>
   <kind>record</kind>
   <id>icRp7NeoOT+m93ddn+fcm7v0hWU=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>t/fAg/z+G5QClTBG74e6bR64CDI=</parent>
   <key-kind>struct</key-kind>
@@ -478,6 +489,7 @@
   </source>
   <kind>record</kind>
   <id>3ZrGNdgVY0Bl8pl2wuSUdgLSht4=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>icRp7NeoOT+m93ddn+fcm7v0hWU=</parent>
   <key-kind>struct</key-kind>
@@ -531,6 +543,7 @@
   </source>
   <kind>record</kind>
   <id>2R/ZzEEP3phjsDdKShbY468avc4=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>3ZrGNdgVY0Bl8pl2wuSUdgLSht4=</parent>
   <key-kind>struct</key-kind>
@@ -556,6 +569,7 @@
   </source>
   <kind>function</kind>
   <id>1qLmT/E1Z0aTdRbvVR5DlYKFIqU=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>2R/ZzEEP3phjsDdKShbY468avc4=</parent>
   <named>
@@ -579,6 +593,7 @@
   </source>
   <kind>record</kind>
   <id>T91uOH7uarKVQhSHZ7iIV+AOuBQ=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>3ZrGNdgVY0Bl8pl2wuSUdgLSht4=</parent>
   <key-kind>struct</key-kind>
@@ -630,6 +645,7 @@
   </source>
   <kind>function</kind>
   <id>iMAaUVX+WTUsZujSqIp9ktYZhik=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>T91uOH7uarKVQhSHZ7iIV+AOuBQ=</parent>
   <named>
@@ -653,6 +669,7 @@
   </source>
   <kind>function</kind>
   <id>Iwvgpu+8ybZBfaI59pUCSNk2QJU=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>3ZrGNdgVY0Bl8pl2wuSUdgLSht4=</parent>
   <named>
@@ -676,6 +693,7 @@
   </source>
   <kind>function</kind>
   <id>eyMfyb/yiMt+xDQ69MK4bQAQjpo=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>icRp7NeoOT+m93ddn+fcm7v0hWU=</parent>
   <named>
@@ -699,6 +717,7 @@
   </source>
   <kind>function</kind>
   <id>bGpHFhdgGF7bWiaCzWSwMOzJPg8=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>t/fAg/z+G5QClTBG74e6bR64CDI=</parent>
   <named>
@@ -722,6 +741,7 @@
   </source>
   <kind>function</kind>
   <id>tXE+VoFnukoh9WI4ll0zyAkhGOc=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>z/QEAP16LEoD3NlABxA6BOFpYpA=</parent>
   <named>
@@ -756,6 +776,7 @@
         <identifier>S0</identifier>
       </name>
     </named>
+    <access>public</access>
   </base>
   <record-interface>
     <record-tranche>
@@ -804,6 +825,7 @@
         </name>
       </name>
     </named>
+    <access>public</access>
   </base>
   <record-interface>
     <record-tranche>
@@ -852,6 +874,7 @@
         </name>
       </name>
     </named>
+    <access>public</access>
   </base>
   <record-interface>
     <record-tranche>
@@ -900,6 +923,7 @@
         </name>
       </name>
     </named>
+    <access>public</access>
   </base>
   <record-interface>
     <record-tranche>
@@ -948,6 +972,7 @@
         </name>
       </name>
     </named>
+    <access>public</access>
   </base>
   <record-interface>
     <record-tranche>
@@ -986,6 +1011,7 @@
         </name>
       </name>
     </named>
+    <access>public</access>
   </base>
   <record-interface>
     <record-tranche>
@@ -1024,6 +1050,7 @@
         </name>
       </name>
     </named>
+    <access>public</access>
   </base>
   <record-interface>
     <record-tranche>
@@ -1062,6 +1089,7 @@
         </name>
       </name>
     </named>
+    <access>public</access>
   </base>
   <record-interface>
     <record-tranche>
@@ -1100,6 +1128,7 @@
         </name>
       </name>
     </named>
+    <access>public</access>
   </base>
   <record-interface>
     <record-tranche>
@@ -1143,6 +1172,7 @@
         </name>
       </name>
     </named>
+    <access>public</access>
   </base>
   <record-interface>
     <record-tranche>
@@ -1191,6 +1221,7 @@
         </name>
       </name>
     </named>
+    <access>public</access>
   </base>
   <record-interface>
     <record-tranche>
@@ -1224,6 +1255,7 @@
         <identifier>S0</identifier>
       </name>
     </named>
+    <access>public</access>
   </base>
   <record-interface>
     <record-tranche>
@@ -1249,6 +1281,7 @@
   </source>
   <kind>record</kind>
   <id>2CQyWIWOAM25oQ1AdJcdT6hFqAE=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>z/QEAP16LEoD3NlABxA6BOFpYpA=</parent>
   <key-kind>struct</key-kind>
@@ -1275,6 +1308,7 @@
   </source>
   <kind>record</kind>
   <id>oNfOAnUjZE7WlBGdMiNtQ9ePi8g=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>2CQyWIWOAM25oQ1AdJcdT6hFqAE=</parent>
   <key-kind>struct</key-kind>
@@ -1328,6 +1362,7 @@
   </source>
   <kind>record</kind>
   <id>LjJr8jL1hFRtsFi7N5gXIU8pmt8=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>oNfOAnUjZE7WlBGdMiNtQ9ePi8g=</parent>
   <key-kind>struct</key-kind>
@@ -1353,6 +1388,7 @@
   </source>
   <kind>function</kind>
   <id>kggTp6wAC1WcJ2lc/xWgjVAOQuA=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>LjJr8jL1hFRtsFi7N5gXIU8pmt8=</parent>
   <named>
@@ -1376,6 +1412,7 @@
   </source>
   <kind>record</kind>
   <id>8UtqZHVItGCqKLwlXny0WJDLkDQ=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>oNfOAnUjZE7WlBGdMiNtQ9ePi8g=</parent>
   <key-kind>struct</key-kind>
@@ -1427,6 +1464,7 @@
   </source>
   <kind>function</kind>
   <id>Yvbv/xeM6X331Nb6AJbcVkWAahI=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>8UtqZHVItGCqKLwlXny0WJDLkDQ=</parent>
   <named>
@@ -1450,6 +1488,7 @@
   </source>
   <kind>function</kind>
   <id>5LiMTgzbzcSlhmq/BqmjMgGLylU=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>oNfOAnUjZE7WlBGdMiNtQ9ePi8g=</parent>
   <named>
@@ -1473,6 +1512,7 @@
   </source>
   <kind>function</kind>
   <id>Smls1Gk2gVcm6OCyBWhckfHGjdY=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>2CQyWIWOAM25oQ1AdJcdT6hFqAE=</parent>
   <named>
@@ -1496,6 +1536,7 @@
   </source>
   <kind>record</kind>
   <id>t/fAg/z+G5QClTBG74e6bR64CDI=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>z/QEAP16LEoD3NlABxA6BOFpYpA=</parent>
   <key-kind>struct</key-kind>
@@ -1548,6 +1589,7 @@
   </source>
   <kind>record</kind>
   <id>icRp7NeoOT+m93ddn+fcm7v0hWU=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>t/fAg/z+G5QClTBG74e6bR64CDI=</parent>
   <key-kind>struct</key-kind>
@@ -1574,6 +1616,7 @@
   </source>
   <kind>record</kind>
   <id>3ZrGNdgVY0Bl8pl2wuSUdgLSht4=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>icRp7NeoOT+m93ddn+fcm7v0hWU=</parent>
   <key-kind>struct</key-kind>
@@ -1627,6 +1670,7 @@
   </source>
   <kind>record</kind>
   <id>2R/ZzEEP3phjsDdKShbY468avc4=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>3ZrGNdgVY0Bl8pl2wuSUdgLSht4=</parent>
   <key-kind>struct</key-kind>
@@ -1652,6 +1696,7 @@
   </source>
   <kind>function</kind>
   <id>1qLmT/E1Z0aTdRbvVR5DlYKFIqU=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>2R/ZzEEP3phjsDdKShbY468avc4=</parent>
   <named>
@@ -1675,6 +1720,7 @@
   </source>
   <kind>record</kind>
   <id>T91uOH7uarKVQhSHZ7iIV+AOuBQ=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>3ZrGNdgVY0Bl8pl2wuSUdgLSht4=</parent>
   <key-kind>struct</key-kind>
@@ -1726,6 +1772,7 @@
   </source>
   <kind>function</kind>
   <id>iMAaUVX+WTUsZujSqIp9ktYZhik=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>T91uOH7uarKVQhSHZ7iIV+AOuBQ=</parent>
   <named>
@@ -1749,6 +1796,7 @@
   </source>
   <kind>function</kind>
   <id>Iwvgpu+8ybZBfaI59pUCSNk2QJU=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>3ZrGNdgVY0Bl8pl2wuSUdgLSht4=</parent>
   <named>
@@ -1772,6 +1820,7 @@
   </source>
   <kind>function</kind>
   <id>eyMfyb/yiMt+xDQ69MK4bQAQjpo=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>icRp7NeoOT+m93ddn+fcm7v0hWU=</parent>
   <named>
@@ -1795,6 +1844,7 @@
   </source>
   <kind>function</kind>
   <id>bGpHFhdgGF7bWiaCzWSwMOzJPg8=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>t/fAg/z+G5QClTBG74e6bR64CDI=</parent>
   <named>
@@ -1818,6 +1868,7 @@
   </source>
   <kind>function</kind>
   <id>tXE+VoFnukoh9WI4ll0zyAkhGOc=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>z/QEAP16LEoD3NlABxA6BOFpYpA=</parent>
   <named>
@@ -1867,6 +1918,7 @@
         </name>
       </name>
     </named>
+    <access>public</access>
   </base>
   <record-interface>
     <record-tranche>
@@ -1915,6 +1967,7 @@
         </name>
       </name>
     </named>
+    <access>public</access>
   </base>
   <record-interface>
     <record-tranche>
@@ -1963,6 +2016,7 @@
         </name>
       </name>
     </named>
+    <access>public</access>
   </base>
   <record-interface>
     <record-tranche>
@@ -2016,6 +2070,7 @@
         </name>
       </name>
     </named>
+    <access>public</access>
   </base>
   <record-interface>
     <record-tranche>
@@ -2069,6 +2124,7 @@
         </name>
       </name>
     </named>
+    <access>public</access>
   </base>
   <record-interface>
     <record-tranche>
@@ -2122,6 +2178,7 @@
         </name>
       </name>
     </named>
+    <access>public</access>
   </base>
   <record-interface>
     <record-tranche>
@@ -2175,6 +2232,7 @@
         </name>
       </name>
     </named>
+    <access>public</access>
   </base>
   <record-interface>
     <record-tranche>
@@ -2228,6 +2286,7 @@
         </name>
       </name>
     </named>
+    <access>public</access>
   </base>
   <record-interface>
     <record-tranche>
@@ -2261,6 +2320,7 @@
         <identifier>S0</identifier>
       </name>
     </named>
+    <access>public</access>
   </base>
   <record-interface>
     <record-tranche>
@@ -2286,6 +2346,7 @@
   </source>
   <kind>record</kind>
   <id>2CQyWIWOAM25oQ1AdJcdT6hFqAE=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>z/QEAP16LEoD3NlABxA6BOFpYpA=</parent>
   <key-kind>struct</key-kind>
@@ -2312,6 +2373,7 @@
   </source>
   <kind>record</kind>
   <id>oNfOAnUjZE7WlBGdMiNtQ9ePi8g=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>2CQyWIWOAM25oQ1AdJcdT6hFqAE=</parent>
   <key-kind>struct</key-kind>
@@ -2365,6 +2427,7 @@
   </source>
   <kind>record</kind>
   <id>LjJr8jL1hFRtsFi7N5gXIU8pmt8=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>oNfOAnUjZE7WlBGdMiNtQ9ePi8g=</parent>
   <key-kind>struct</key-kind>
@@ -2390,6 +2453,7 @@
   </source>
   <kind>function</kind>
   <id>kggTp6wAC1WcJ2lc/xWgjVAOQuA=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>LjJr8jL1hFRtsFi7N5gXIU8pmt8=</parent>
   <named>
@@ -2413,6 +2477,7 @@
   </source>
   <kind>record</kind>
   <id>8UtqZHVItGCqKLwlXny0WJDLkDQ=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>oNfOAnUjZE7WlBGdMiNtQ9ePi8g=</parent>
   <key-kind>struct</key-kind>
@@ -2464,6 +2529,7 @@
   </source>
   <kind>function</kind>
   <id>Yvbv/xeM6X331Nb6AJbcVkWAahI=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>8UtqZHVItGCqKLwlXny0WJDLkDQ=</parent>
   <named>
@@ -2487,6 +2553,7 @@
   </source>
   <kind>function</kind>
   <id>5LiMTgzbzcSlhmq/BqmjMgGLylU=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>oNfOAnUjZE7WlBGdMiNtQ9ePi8g=</parent>
   <named>
@@ -2510,6 +2577,7 @@
   </source>
   <kind>function</kind>
   <id>Smls1Gk2gVcm6OCyBWhckfHGjdY=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>2CQyWIWOAM25oQ1AdJcdT6hFqAE=</parent>
   <named>
@@ -2533,6 +2601,7 @@
   </source>
   <kind>record</kind>
   <id>t/fAg/z+G5QClTBG74e6bR64CDI=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>z/QEAP16LEoD3NlABxA6BOFpYpA=</parent>
   <key-kind>struct</key-kind>
@@ -2585,6 +2654,7 @@
   </source>
   <kind>record</kind>
   <id>icRp7NeoOT+m93ddn+fcm7v0hWU=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>t/fAg/z+G5QClTBG74e6bR64CDI=</parent>
   <key-kind>struct</key-kind>
@@ -2611,6 +2681,7 @@
   </source>
   <kind>record</kind>
   <id>3ZrGNdgVY0Bl8pl2wuSUdgLSht4=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>icRp7NeoOT+m93ddn+fcm7v0hWU=</parent>
   <key-kind>struct</key-kind>
@@ -2664,6 +2735,7 @@
   </source>
   <kind>record</kind>
   <id>2R/ZzEEP3phjsDdKShbY468avc4=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>3ZrGNdgVY0Bl8pl2wuSUdgLSht4=</parent>
   <key-kind>struct</key-kind>
@@ -2689,6 +2761,7 @@
   </source>
   <kind>function</kind>
   <id>1qLmT/E1Z0aTdRbvVR5DlYKFIqU=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>2R/ZzEEP3phjsDdKShbY468avc4=</parent>
   <named>
@@ -2712,6 +2785,7 @@
   </source>
   <kind>record</kind>
   <id>T91uOH7uarKVQhSHZ7iIV+AOuBQ=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>3ZrGNdgVY0Bl8pl2wuSUdgLSht4=</parent>
   <key-kind>struct</key-kind>
@@ -2763,6 +2837,7 @@
   </source>
   <kind>function</kind>
   <id>iMAaUVX+WTUsZujSqIp9ktYZhik=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>T91uOH7uarKVQhSHZ7iIV+AOuBQ=</parent>
   <named>
@@ -2786,6 +2861,7 @@
   </source>
   <kind>function</kind>
   <id>Iwvgpu+8ybZBfaI59pUCSNk2QJU=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>3ZrGNdgVY0Bl8pl2wuSUdgLSht4=</parent>
   <named>
@@ -2809,6 +2885,7 @@
   </source>
   <kind>function</kind>
   <id>eyMfyb/yiMt+xDQ69MK4bQAQjpo=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>icRp7NeoOT+m93ddn+fcm7v0hWU=</parent>
   <named>
@@ -2832,6 +2909,7 @@
   </source>
   <kind>function</kind>
   <id>bGpHFhdgGF7bWiaCzWSwMOzJPg8=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>t/fAg/z+G5QClTBG74e6bR64CDI=</parent>
   <named>
@@ -2855,6 +2933,7 @@
   </source>
   <kind>function</kind>
   <id>tXE+VoFnukoh9WI4ll0zyAkhGOc=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>z/QEAP16LEoD3NlABxA6BOFpYpA=</parent>
   <named>
@@ -2889,6 +2968,7 @@
         <identifier>S0</identifier>
       </name>
     </named>
+    <access>public</access>
   </base>
   <record-interface>
     <record-tranche>
@@ -2914,6 +2994,7 @@
   </source>
   <kind>record</kind>
   <id>2CQyWIWOAM25oQ1AdJcdT6hFqAE=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>z/QEAP16LEoD3NlABxA6BOFpYpA=</parent>
   <key-kind>struct</key-kind>
@@ -2940,6 +3021,7 @@
   </source>
   <kind>record</kind>
   <id>oNfOAnUjZE7WlBGdMiNtQ9ePi8g=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>2CQyWIWOAM25oQ1AdJcdT6hFqAE=</parent>
   <key-kind>struct</key-kind>
@@ -2993,6 +3075,7 @@
   </source>
   <kind>record</kind>
   <id>LjJr8jL1hFRtsFi7N5gXIU8pmt8=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>oNfOAnUjZE7WlBGdMiNtQ9ePi8g=</parent>
   <key-kind>struct</key-kind>
@@ -3018,6 +3101,7 @@
   </source>
   <kind>function</kind>
   <id>kggTp6wAC1WcJ2lc/xWgjVAOQuA=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>LjJr8jL1hFRtsFi7N5gXIU8pmt8=</parent>
   <named>
@@ -3041,6 +3125,7 @@
   </source>
   <kind>record</kind>
   <id>8UtqZHVItGCqKLwlXny0WJDLkDQ=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>oNfOAnUjZE7WlBGdMiNtQ9ePi8g=</parent>
   <key-kind>struct</key-kind>
@@ -3092,6 +3177,7 @@
   </source>
   <kind>function</kind>
   <id>Yvbv/xeM6X331Nb6AJbcVkWAahI=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>8UtqZHVItGCqKLwlXny0WJDLkDQ=</parent>
   <named>
@@ -3115,6 +3201,7 @@
   </source>
   <kind>function</kind>
   <id>5LiMTgzbzcSlhmq/BqmjMgGLylU=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>oNfOAnUjZE7WlBGdMiNtQ9ePi8g=</parent>
   <named>
@@ -3138,6 +3225,7 @@
   </source>
   <kind>function</kind>
   <id>Smls1Gk2gVcm6OCyBWhckfHGjdY=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>2CQyWIWOAM25oQ1AdJcdT6hFqAE=</parent>
   <named>
@@ -3161,6 +3249,7 @@
   </source>
   <kind>record</kind>
   <id>t/fAg/z+G5QClTBG74e6bR64CDI=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>z/QEAP16LEoD3NlABxA6BOFpYpA=</parent>
   <key-kind>struct</key-kind>
@@ -3213,6 +3302,7 @@
   </source>
   <kind>record</kind>
   <id>icRp7NeoOT+m93ddn+fcm7v0hWU=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>t/fAg/z+G5QClTBG74e6bR64CDI=</parent>
   <key-kind>struct</key-kind>
@@ -3239,6 +3329,7 @@
   </source>
   <kind>record</kind>
   <id>3ZrGNdgVY0Bl8pl2wuSUdgLSht4=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>icRp7NeoOT+m93ddn+fcm7v0hWU=</parent>
   <key-kind>struct</key-kind>
@@ -3292,6 +3383,7 @@
   </source>
   <kind>record</kind>
   <id>2R/ZzEEP3phjsDdKShbY468avc4=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>3ZrGNdgVY0Bl8pl2wuSUdgLSht4=</parent>
   <key-kind>struct</key-kind>
@@ -3317,6 +3409,7 @@
   </source>
   <kind>function</kind>
   <id>1qLmT/E1Z0aTdRbvVR5DlYKFIqU=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>2R/ZzEEP3phjsDdKShbY468avc4=</parent>
   <named>
@@ -3340,6 +3433,7 @@
   </source>
   <kind>record</kind>
   <id>T91uOH7uarKVQhSHZ7iIV+AOuBQ=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>3ZrGNdgVY0Bl8pl2wuSUdgLSht4=</parent>
   <key-kind>struct</key-kind>
@@ -3391,6 +3485,7 @@
   </source>
   <kind>function</kind>
   <id>iMAaUVX+WTUsZujSqIp9ktYZhik=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>T91uOH7uarKVQhSHZ7iIV+AOuBQ=</parent>
   <named>
@@ -3414,6 +3509,7 @@
   </source>
   <kind>function</kind>
   <id>Iwvgpu+8ybZBfaI59pUCSNk2QJU=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>3ZrGNdgVY0Bl8pl2wuSUdgLSht4=</parent>
   <named>
@@ -3437,6 +3533,7 @@
   </source>
   <kind>function</kind>
   <id>eyMfyb/yiMt+xDQ69MK4bQAQjpo=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>icRp7NeoOT+m93ddn+fcm7v0hWU=</parent>
   <named>
@@ -3460,6 +3557,7 @@
   </source>
   <kind>function</kind>
   <id>bGpHFhdgGF7bWiaCzWSwMOzJPg8=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>t/fAg/z+G5QClTBG74e6bR64CDI=</parent>
   <named>
@@ -3483,6 +3581,7 @@
   </source>
   <kind>function</kind>
   <id>tXE+VoFnukoh9WI4ll0zyAkhGOc=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>z/QEAP16LEoD3NlABxA6BOFpYpA=</parent>
   <named>
@@ -3517,6 +3616,7 @@
         <identifier>S0</identifier>
       </name>
     </named>
+    <access>public</access>
   </base>
   <record-interface>
     <record-tranche>
@@ -3555,6 +3655,7 @@
         </name>
       </name>
     </named>
+    <access>public</access>
   </base>
   <record-interface>
     <record-tranche>
@@ -3579,6 +3680,7 @@
   </source>
   <kind>record</kind>
   <id>boLQk9sIyBQTBaPhSeSLjkGr51k=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>yiTNiZbPnfj9SDdT8k1YKmjW68g=</parent>
   <key-kind>struct</key-kind>
@@ -3629,6 +3731,7 @@
   </source>
   <kind>function</kind>
   <id>boc7yC4tWsGrT4a762yRiFkFe3E=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>yiTNiZbPnfj9SDdT8k1YKmjW68g=</parent>
   <named>
@@ -3690,6 +3793,7 @@
         </name>
       </name>
     </named>
+    <access>public</access>
   </base>
   <record-interface>
     <record-tranche>
@@ -3733,6 +3837,7 @@
         </name>
       </name>
     </named>
+    <access>public</access>
   </base>
   <record-interface>
     <record-tranche>
@@ -3776,6 +3881,7 @@
         </name>
       </name>
     </named>
+    <access>public</access>
   </base>
   <record-interface>
     <record-tranche>
@@ -3824,6 +3930,7 @@
         </name>
       </name>
     </named>
+    <access>public</access>
   </base>
   <record-interface>
     <record-tranche>
@@ -3847,6 +3954,7 @@
   </source>
   <kind>function</kind>
   <id>bLNBUo4KpSS0BZPlsnEoRwbgQU0=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>aOsVfXK2YXy8YzpChV4neMCBUNE=</parent>
   <named>
@@ -3913,6 +4021,7 @@
         </name>
       </name>
     </named>
+    <access>public</access>
   </base>
   <record-interface>
     <record-tranche>
@@ -3961,6 +4070,7 @@
         </name>
       </name>
     </named>
+    <access>public</access>
   </base>
   <record-interface>
     <record-tranche>
@@ -4009,6 +4119,7 @@
         </name>
       </name>
     </named>
+    <access>public</access>
   </base>
   <record-interface>
     <record-tranche>
@@ -4064,6 +4175,7 @@
         </name>
       </name>
     </named>
+    <access>public</access>
   </base>
   <record-interface>
     <record-tranche>
@@ -4102,6 +4214,7 @@
         </name>
       </name>
     </named>
+    <access>public</access>
   </base>
   <record-interface>
     <record-tranche>
@@ -4140,6 +4253,7 @@
         </name>
       </name>
     </named>
+    <access>public</access>
   </base>
   <record-interface>
     <record-tranche>
@@ -4178,6 +4292,7 @@
         </name>
       </name>
     </named>
+    <access>public</access>
   </base>
   <record-interface>
     <record-tranche>
@@ -4221,6 +4336,7 @@
         </name>
       </name>
     </named>
+    <access>public</access>
   </base>
   <record-interface>
     <record-tranche>
@@ -4245,6 +4361,7 @@
   </source>
   <kind>record</kind>
   <id>Qi1L025HS2xzUSVM/EdHO3S86T8=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>ESA+jWIqD6n9bgbcE+2k+r76ElE=</parent>
   <key-kind>struct</key-kind>
@@ -4295,6 +4412,7 @@
   </source>
   <kind>function</kind>
   <id>3sJu+IqldeGkloa8X4vNDJFmKEQ=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>ESA+jWIqD6n9bgbcE+2k+r76ElE=</parent>
   <named>
@@ -4361,6 +4479,7 @@
         </name>
       </name>
     </named>
+    <access>public</access>
   </base>
   <record-interface>
     <record-tranche>
@@ -4409,6 +4528,7 @@
         </name>
       </name>
     </named>
+    <access>public</access>
   </base>
   <record-interface>
     <record-tranche>
@@ -4457,6 +4577,7 @@
         </name>
       </name>
     </named>
+    <access>public</access>
   </base>
   <record-interface>
     <record-tranche>
@@ -4510,6 +4631,7 @@
         </name>
       </name>
     </named>
+    <access>public</access>
   </base>
   <record-interface>
     <record-tranche>
@@ -4533,6 +4655,7 @@
   </source>
   <kind>function</kind>
   <id>dLKTrZfdhQpgAK1S0l66Tj7if2o=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>UTUtsfPLhT8t0PfqqpBYR2R6IeA=</parent>
   <named>
@@ -4604,6 +4727,7 @@
         </name>
       </name>
     </named>
+    <access>public</access>
   </base>
   <record-interface>
     <record-tranche>
@@ -4657,6 +4781,7 @@
         </name>
       </name>
     </named>
+    <access>public</access>
   </base>
   <record-interface>
     <record-tranche>
@@ -4710,6 +4835,7 @@
         </name>
       </name>
     </named>
+    <access>public</access>
   </base>
   <record-interface>
     <record-tranche>
@@ -4753,6 +4879,7 @@
         </name>
       </name>
     </named>
+    <access>public</access>
   </base>
   <record-interface>
     <record-tranche>
@@ -4796,6 +4923,7 @@
         </name>
       </name>
     </named>
+    <access>public</access>
   </base>
   <record-interface>
     <record-tranche>
@@ -4839,6 +4967,7 @@
         </name>
       </name>
     </named>
+    <access>public</access>
   </base>
   <record-interface>
     <record-tranche>
@@ -4882,6 +5011,7 @@
         </name>
       </name>
     </named>
+    <access>public</access>
   </base>
   <record-interface>
     <record-tranche>
@@ -4930,6 +5060,7 @@
         </name>
       </name>
     </named>
+    <access>public</access>
   </base>
   <record-interface>
     <record-tranche>
@@ -5009,6 +5140,7 @@
   </source>
   <kind>record</kind>
   <id>2CQyWIWOAM25oQ1AdJcdT6hFqAE=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>z/QEAP16LEoD3NlABxA6BOFpYpA=</parent>
   <key-kind>struct</key-kind>
@@ -5035,6 +5167,7 @@
   </source>
   <kind>record</kind>
   <id>oNfOAnUjZE7WlBGdMiNtQ9ePi8g=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>2CQyWIWOAM25oQ1AdJcdT6hFqAE=</parent>
   <key-kind>struct</key-kind>
@@ -5088,6 +5221,7 @@
   </source>
   <kind>record</kind>
   <id>LjJr8jL1hFRtsFi7N5gXIU8pmt8=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>oNfOAnUjZE7WlBGdMiNtQ9ePi8g=</parent>
   <key-kind>struct</key-kind>
@@ -5113,6 +5247,7 @@
   </source>
   <kind>function</kind>
   <id>kggTp6wAC1WcJ2lc/xWgjVAOQuA=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>LjJr8jL1hFRtsFi7N5gXIU8pmt8=</parent>
   <named>
@@ -5136,6 +5271,7 @@
   </source>
   <kind>record</kind>
   <id>8UtqZHVItGCqKLwlXny0WJDLkDQ=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>oNfOAnUjZE7WlBGdMiNtQ9ePi8g=</parent>
   <key-kind>struct</key-kind>
@@ -5187,6 +5323,7 @@
   </source>
   <kind>function</kind>
   <id>Yvbv/xeM6X331Nb6AJbcVkWAahI=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>8UtqZHVItGCqKLwlXny0WJDLkDQ=</parent>
   <named>
@@ -5210,6 +5347,7 @@
   </source>
   <kind>function</kind>
   <id>5LiMTgzbzcSlhmq/BqmjMgGLylU=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>oNfOAnUjZE7WlBGdMiNtQ9ePi8g=</parent>
   <named>
@@ -5233,6 +5371,7 @@
   </source>
   <kind>function</kind>
   <id>Smls1Gk2gVcm6OCyBWhckfHGjdY=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>2CQyWIWOAM25oQ1AdJcdT6hFqAE=</parent>
   <named>
@@ -5256,6 +5395,7 @@
   </source>
   <kind>record</kind>
   <id>t/fAg/z+G5QClTBG74e6bR64CDI=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>z/QEAP16LEoD3NlABxA6BOFpYpA=</parent>
   <key-kind>struct</key-kind>
@@ -5308,6 +5448,7 @@
   </source>
   <kind>record</kind>
   <id>icRp7NeoOT+m93ddn+fcm7v0hWU=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>t/fAg/z+G5QClTBG74e6bR64CDI=</parent>
   <key-kind>struct</key-kind>
@@ -5334,6 +5475,7 @@
   </source>
   <kind>record</kind>
   <id>3ZrGNdgVY0Bl8pl2wuSUdgLSht4=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>icRp7NeoOT+m93ddn+fcm7v0hWU=</parent>
   <key-kind>struct</key-kind>
@@ -5387,6 +5529,7 @@
   </source>
   <kind>record</kind>
   <id>2R/ZzEEP3phjsDdKShbY468avc4=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>3ZrGNdgVY0Bl8pl2wuSUdgLSht4=</parent>
   <key-kind>struct</key-kind>
@@ -5412,6 +5555,7 @@
   </source>
   <kind>function</kind>
   <id>1qLmT/E1Z0aTdRbvVR5DlYKFIqU=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>2R/ZzEEP3phjsDdKShbY468avc4=</parent>
   <named>
@@ -5435,6 +5579,7 @@
   </source>
   <kind>record</kind>
   <id>T91uOH7uarKVQhSHZ7iIV+AOuBQ=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>3ZrGNdgVY0Bl8pl2wuSUdgLSht4=</parent>
   <key-kind>struct</key-kind>
@@ -5486,6 +5631,7 @@
   </source>
   <kind>function</kind>
   <id>iMAaUVX+WTUsZujSqIp9ktYZhik=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>T91uOH7uarKVQhSHZ7iIV+AOuBQ=</parent>
   <named>
@@ -5509,6 +5655,7 @@
   </source>
   <kind>function</kind>
   <id>Iwvgpu+8ybZBfaI59pUCSNk2QJU=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>3ZrGNdgVY0Bl8pl2wuSUdgLSht4=</parent>
   <named>
@@ -5532,6 +5679,7 @@
   </source>
   <kind>function</kind>
   <id>eyMfyb/yiMt+xDQ69MK4bQAQjpo=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>icRp7NeoOT+m93ddn+fcm7v0hWU=</parent>
   <named>
@@ -5555,6 +5703,7 @@
   </source>
   <kind>function</kind>
   <id>bGpHFhdgGF7bWiaCzWSwMOzJPg8=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>t/fAg/z+G5QClTBG74e6bR64CDI=</parent>
   <named>
@@ -5578,6 +5727,7 @@
   </source>
   <kind>function</kind>
   <id>tXE+VoFnukoh9WI4ll0zyAkhGOc=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>z/QEAP16LEoD3NlABxA6BOFpYpA=</parent>
   <named>
@@ -5667,6 +5817,7 @@
   </source>
   <kind>record</kind>
   <id>H+OiQqpA/bs1dZi3ZS1WWNa5qBA=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>hwWIBHTi29w+6bJar0PyQvwnZWw=</parent>
   <key-kind>struct</key-kind>
@@ -5694,6 +5845,7 @@
   </source>
   <kind>record</kind>
   <id>s/+gz4h48mKOopEb9TmxFUzl6o8=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>H+OiQqpA/bs1dZi3ZS1WWNa5qBA=</parent>
   <key-kind>struct</key-kind>
@@ -5744,6 +5896,7 @@
   </source>
   <kind>record</kind>
   <id>g2iVCce1Dp6iPMyevfuMN/UU9F0=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>H+OiQqpA/bs1dZi3ZS1WWNa5qBA=</parent>
   <key-kind>struct</key-kind>
@@ -5779,6 +5932,7 @@
   </source>
   <kind>record</kind>
   <id>NW6Rl/c5GWs2dbFctQ6kW8Kbyh4=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>g2iVCce1Dp6iPMyevfuMN/UU9F0=</parent>
   <key-kind>struct</key-kind>
@@ -5809,6 +5963,7 @@
   </source>
   <kind>record</kind>
   <id>jsWbJZfAfgKMXbl9GaZXHLmhL2U=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>g2iVCce1Dp6iPMyevfuMN/UU9F0=</parent>
   <key-kind>struct</key-kind>
@@ -5860,6 +6015,7 @@
   </source>
   <kind>function</kind>
   <id>31rtLV2nV7nDWL7fCGb7qzxxfGw=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>g2iVCce1Dp6iPMyevfuMN/UU9F0=</parent>
   <named>
@@ -5883,6 +6039,7 @@
   </source>
   <kind>function</kind>
   <id>r8P4rZWYb+zKTgNEF+NSpJtmTQY=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>H+OiQqpA/bs1dZi3ZS1WWNa5qBA=</parent>
   <named>
@@ -5906,6 +6063,7 @@
   </source>
   <kind>record</kind>
   <id>Ba443e4B7ySMlh7XYx/5pmJ4VD8=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>hwWIBHTi29w+6bJar0PyQvwnZWw=</parent>
   <key-kind>struct</key-kind>
@@ -5956,6 +6114,7 @@
   </source>
   <kind>function</kind>
   <id>KGcMjUUMibv+s0wPtSt4tcBl4Y4=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>hwWIBHTi29w+6bJar0PyQvwnZWw=</parent>
   <named>
@@ -6013,6 +6172,7 @@
   </source>
   <kind>record</kind>
   <id>Pjf6KqCPylu2b46BR/wONC7VjWU=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>7v/tytUkZe7COeYW1bbrzC9LRio=</parent>
   <key-kind>struct</key-kind>
@@ -6040,6 +6200,7 @@
   </source>
   <kind>record</kind>
   <id>l5pN6etoKup4CUg+bcu1xKLH0TQ=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>Pjf6KqCPylu2b46BR/wONC7VjWU=</parent>
   <key-kind>struct</key-kind>
@@ -6090,6 +6251,7 @@
   </source>
   <kind>record</kind>
   <id>Lu2i8tgrw9I5p6DXmX9LfM8mVSo=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>Pjf6KqCPylu2b46BR/wONC7VjWU=</parent>
   <key-kind>struct</key-kind>
@@ -6125,6 +6287,7 @@
   </source>
   <kind>record</kind>
   <id>5Sz5l6GKNl23KxxZFfhqy7YgES0=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>Lu2i8tgrw9I5p6DXmX9LfM8mVSo=</parent>
   <key-kind>struct</key-kind>
@@ -6149,6 +6312,7 @@
   </source>
   <kind>record</kind>
   <id>Aj9j+drHHvowKlbxWQ6lW8Fl0rA=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>Lu2i8tgrw9I5p6DXmX9LfM8mVSo=</parent>
   <key-kind>struct</key-kind>
@@ -6199,6 +6363,7 @@
   </source>
   <kind>record</kind>
   <id>yPCRvP9B34hMThomBKlaCzkFM54=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>Lu2i8tgrw9I5p6DXmX9LfM8mVSo=</parent>
   <key-kind>struct</key-kind>
@@ -6231,6 +6396,7 @@
   </source>
   <kind>function</kind>
   <id>F7pj6JDH9H4/SWPMvDhp5qkE54M=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>Lu2i8tgrw9I5p6DXmX9LfM8mVSo=</parent>
   <named>
@@ -6254,6 +6420,7 @@
   </source>
   <kind>function</kind>
   <id>WQNriRYCsA5OMkiQoqrMlzbC990=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>Pjf6KqCPylu2b46BR/wONC7VjWU=</parent>
   <named>
@@ -6277,6 +6444,7 @@
   </source>
   <kind>record</kind>
   <id>OipUIhe/9mIgCedaT6w3xdMAnb0=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>7v/tytUkZe7COeYW1bbrzC9LRio=</parent>
   <key-kind>struct</key-kind>
@@ -6327,6 +6495,7 @@
   </source>
   <kind>function</kind>
   <id>x6IUm6XNKIu7PBFBBFhX+8fjDiY=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>7v/tytUkZe7COeYW1bbrzC9LRio=</parent>
   <named>
@@ -6384,6 +6553,7 @@
   </source>
   <kind>record</kind>
   <id>6gImp3XchQxxpQbqRhUq0szIb+A=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>nkoZM9sg9xpibNb1eDSyhqn/Ato=</parent>
   <key-kind>struct</key-kind>
@@ -6411,6 +6581,7 @@
   </source>
   <kind>record</kind>
   <id>f89EHPCeOKy7zB9suvC7AVQwNHk=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>6gImp3XchQxxpQbqRhUq0szIb+A=</parent>
   <key-kind>struct</key-kind>
@@ -6461,6 +6632,7 @@
   </source>
   <kind>record</kind>
   <id>JnRKKJOV9sM2/Wi7ytI5OenLTcs=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>6gImp3XchQxxpQbqRhUq0szIb+A=</parent>
   <key-kind>struct</key-kind>
@@ -6498,6 +6670,7 @@
   </source>
   <kind>record</kind>
   <id>RK410huBsKvtBfnloh7nxNTsrmA=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>JnRKKJOV9sM2/Wi7ytI5OenLTcs=</parent>
   <key-kind>struct</key-kind>
@@ -6522,6 +6695,7 @@
   </source>
   <kind>record</kind>
   <id>DWQYigctrt98IiK0iwD/f5A92cI=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>JnRKKJOV9sM2/Wi7ytI5OenLTcs=</parent>
   <key-kind>struct</key-kind>
@@ -6573,6 +6747,7 @@
   </source>
   <kind>record</kind>
   <id>J3UZDljdSJ1mGU9Js0JpA3TjVtc=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>JnRKKJOV9sM2/Wi7ytI5OenLTcs=</parent>
   <key-kind>struct</key-kind>
@@ -6616,6 +6791,7 @@
   </source>
   <kind>record</kind>
   <id>cV4O7e/J4xug1ZmsOQKwDVjE99M=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>JnRKKJOV9sM2/Wi7ytI5OenLTcs=</parent>
   <key-kind>struct</key-kind>
@@ -6663,6 +6839,7 @@
   </source>
   <kind>function</kind>
   <id>yEKI9aB0zN7ix7cfYpPWvZMxJnw=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>JnRKKJOV9sM2/Wi7ytI5OenLTcs=</parent>
   <named>
@@ -6686,6 +6863,7 @@
   </source>
   <kind>function</kind>
   <id>B8ooeOwYxxkXsZKKq+FKmDR88f0=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>6gImp3XchQxxpQbqRhUq0szIb+A=</parent>
   <named>
@@ -6709,6 +6887,7 @@
   </source>
   <kind>record</kind>
   <id>fUPoYhU5UIcUerJv8OMQMiEWtfU=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>nkoZM9sg9xpibNb1eDSyhqn/Ato=</parent>
   <key-kind>struct</key-kind>
@@ -6759,6 +6938,7 @@
   </source>
   <kind>function</kind>
   <id>HGOi9jg5kA0498DhhZWqajVngFE=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>nkoZM9sg9xpibNb1eDSyhqn/Ato=</parent>
   <named>
@@ -6817,6 +6997,7 @@
   </source>
   <kind>record</kind>
   <id>o00NNFGC28+7Dvmb3/cTyVzCRvQ=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>eiJusMAs3cvoF4DWqUBlAfXzYcA=</parent>
   <key-kind>struct</key-kind>
@@ -6847,6 +7028,7 @@
   </source>
   <kind>record</kind>
   <id>camC/bDL1+gedizXtv+BQXm3/4s=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>eiJusMAs3cvoF4DWqUBlAfXzYcA=</parent>
   <key-kind>struct</key-kind>
@@ -6898,6 +7080,7 @@
   </source>
   <kind>function</kind>
   <id>8EcOY24uh+c5ZuUim+J+NMoqDOQ=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>eiJusMAs3cvoF4DWqUBlAfXzYcA=</parent>
   <named>
@@ -6956,6 +7139,7 @@
   </source>
   <kind>record</kind>
   <id>XKSdNXUZ0e+FReoXOI4yAC6LBDQ=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>pxo3Lx5X+FdLdaGOmXmAiuNVQME=</parent>
   <key-kind>struct</key-kind>
@@ -6980,6 +7164,7 @@
   </source>
   <kind>record</kind>
   <id>MoHYU9ImAUNH5QobwugA5LN9DBQ=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>pxo3Lx5X+FdLdaGOmXmAiuNVQME=</parent>
   <key-kind>struct</key-kind>
@@ -7030,6 +7215,7 @@
   </source>
   <kind>record</kind>
   <id>dO93MwJZmA5Fpzul37ZMH6F1ong=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>pxo3Lx5X+FdLdaGOmXmAiuNVQME=</parent>
   <key-kind>struct</key-kind>
@@ -7062,6 +7248,7 @@
   </source>
   <kind>function</kind>
   <id>p4KEBJUJ+Mr75PasgEdMml3A0+A=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>pxo3Lx5X+FdLdaGOmXmAiuNVQME=</parent>
   <named>
@@ -7125,6 +7312,7 @@
   </source>
   <kind>record</kind>
   <id>yY+X2/Fqu8ENz37/HFEJCBOSfVg=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>nJGs54s6oYf7fHzIpo0tyaCSH9M=</parent>
   <key-kind>struct</key-kind>
@@ -7150,6 +7338,7 @@
   </source>
   <kind>record</kind>
   <id>5pMsyGC09WFCpWuQKcGtioRlb5Y=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>nJGs54s6oYf7fHzIpo0tyaCSH9M=</parent>
   <key-kind>struct</key-kind>
@@ -7200,6 +7389,7 @@
   </source>
   <kind>function</kind>
   <id>qS0LbdI34V5nviXbrQbdS1lCo1g=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>nJGs54s6oYf7fHzIpo0tyaCSH9M=</parent>
   <named>
@@ -7260,6 +7450,7 @@
   </source>
   <kind>record</kind>
   <id>acxje4ZpfatuwoQZl1hZ9D/KHM4=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>MUilGFE5YvyMgRjHIcQZ38yyl2c=</parent>
   <key-kind>struct</key-kind>
@@ -7284,6 +7475,7 @@
   </source>
   <kind>record</kind>
   <id>fJLNRIc/VqJctXPlhGCD5XwmXKg=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>MUilGFE5YvyMgRjHIcQZ38yyl2c=</parent>
   <key-kind>struct</key-kind>
@@ -7335,6 +7527,7 @@
   </source>
   <kind>record</kind>
   <id>NnzxSBCBz0/s6OkCTTL/yDO06Go=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>MUilGFE5YvyMgRjHIcQZ38yyl2c=</parent>
   <key-kind>struct</key-kind>
@@ -7378,6 +7571,7 @@
   </source>
   <kind>record</kind>
   <id>umZ8gPZZ+qTWuYY3zYO/hx1XCGI=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>MUilGFE5YvyMgRjHIcQZ38yyl2c=</parent>
   <key-kind>struct</key-kind>
@@ -7425,6 +7619,7 @@
   </source>
   <kind>function</kind>
   <id>7Fhe0DKsIelNVuC32GIw7+LNURg=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>MUilGFE5YvyMgRjHIcQZ38yyl2c=</parent>
   <named>
@@ -7483,6 +7678,7 @@
   </source>
   <kind>record</kind>
   <id>yAgJODUxUtNlmUvwjJFy8uTsQME=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>WK6dfZ+3VdrJbp4Egq7SCGyoAF8=</parent>
   <key-kind>struct</key-kind>
@@ -7507,6 +7703,7 @@
   </source>
   <kind>record</kind>
   <id>svdEQOjjswR4ileGG8pU+ldVtFk=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>WK6dfZ+3VdrJbp4Egq7SCGyoAF8=</parent>
   <key-kind>struct</key-kind>
@@ -7557,6 +7754,7 @@
   </source>
   <kind>record</kind>
   <id>lmGGu3RmJh5DZfXs5nd811FPf14=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>WK6dfZ+3VdrJbp4Egq7SCGyoAF8=</parent>
   <key-kind>struct</key-kind>
@@ -7596,6 +7794,7 @@
   </source>
   <kind>record</kind>
   <id>w4IHOtNv5zozrqG240cCIM/ceiU=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>lmGGu3RmJh5DZfXs5nd811FPf14=</parent>
   <key-kind>struct</key-kind>
@@ -7621,6 +7820,7 @@
   </source>
   <kind>function</kind>
   <id>ZlQDFmYDY0CqAw3CFoQKBQwjPn4=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>lmGGu3RmJh5DZfXs5nd811FPf14=</parent>
   <named>
@@ -7644,6 +7844,7 @@
   </source>
   <kind>function</kind>
   <id>cJsBKAiYFwG6lI+NjH5CwejBLr4=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>WK6dfZ+3VdrJbp4Egq7SCGyoAF8=</parent>
   <named>
@@ -7702,6 +7903,7 @@
   </source>
   <kind>record</kind>
   <id>CToVG+Nxp/obngx4xEPXSkKc6ec=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>oj8XjM2vuWbeoc2sBpfsIoleCao=</parent>
   <key-kind>struct</key-kind>
@@ -7726,6 +7928,7 @@
   </source>
   <kind>record</kind>
   <id>ROVvQTAm3IUCI9Z+u5p6znhCXIM=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>oj8XjM2vuWbeoc2sBpfsIoleCao=</parent>
   <key-kind>struct</key-kind>
@@ -7776,6 +7979,7 @@
   </source>
   <kind>record</kind>
   <id>I29LgIfKHs2KVKydoPZ2XncISyM=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>oj8XjM2vuWbeoc2sBpfsIoleCao=</parent>
   <key-kind>struct</key-kind>
@@ -7809,6 +8013,7 @@
   </source>
   <kind>record</kind>
   <id>JQyJB8YSN2kw6hjQe1bBwKlHuJ4=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>I29LgIfKHs2KVKydoPZ2XncISyM=</parent>
   <key-kind>struct</key-kind>
@@ -7842,6 +8047,7 @@
   </source>
   <kind>record</kind>
   <id>ExhHzwlrMNSfv2bLNPrl3Ts+Nvk=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>JQyJB8YSN2kw6hjQe1bBwKlHuJ4=</parent>
   <key-kind>struct</key-kind>
@@ -7893,6 +8099,7 @@
   </source>
   <kind>function</kind>
   <id>VDmoFK1cJeUnWAQxYAoG+ipxBV8=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>JQyJB8YSN2kw6hjQe1bBwKlHuJ4=</parent>
   <named>
@@ -7916,6 +8123,7 @@
   </source>
   <kind>function</kind>
   <id>M5V9ddQpexRbUHZGzxlaYkczsIU=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>I29LgIfKHs2KVKydoPZ2XncISyM=</parent>
   <named>
@@ -7939,6 +8147,7 @@
   </source>
   <kind>function</kind>
   <id>hQ+oG9vciFs+KwvLEeCE7WWRZE0=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>oj8XjM2vuWbeoc2sBpfsIoleCao=</parent>
   <named>
@@ -7997,6 +8206,7 @@
   </source>
   <kind>record</kind>
   <id>m95euF404cXorkuumA4YL7rf/M4=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>niyoFejCRrpY1Aa9GHwGMnaDfsQ=</parent>
   <key-kind>struct</key-kind>
@@ -8021,6 +8231,7 @@
   </source>
   <kind>record</kind>
   <id>t1Qlkn8HaE31JtoPhBd1DqNaK54=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>niyoFejCRrpY1Aa9GHwGMnaDfsQ=</parent>
   <key-kind>struct</key-kind>
@@ -8071,6 +8282,7 @@
   </source>
   <kind>record</kind>
   <id>wpJv75dxyLgHOdHJsb50f1IIDVc=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>niyoFejCRrpY1Aa9GHwGMnaDfsQ=</parent>
   <key-kind>struct</key-kind>
@@ -8104,6 +8316,7 @@
   </source>
   <kind>record</kind>
   <id>eSNDaVdF6Ls1X50hIBbC2/ZrfXc=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>wpJv75dxyLgHOdHJsb50f1IIDVc=</parent>
   <key-kind>struct</key-kind>
@@ -8133,6 +8346,7 @@
   </source>
   <kind>record</kind>
   <id>vfK1DPDpK0avS7QO2IsoINEq6hw=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>eSNDaVdF6Ls1X50hIBbC2/ZrfXc=</parent>
   <key-kind>struct</key-kind>
@@ -8184,6 +8398,7 @@
   </source>
   <kind>record</kind>
   <id>3eTbiMMR3GPY7/xRty3EmJ9bdQU=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>eSNDaVdF6Ls1X50hIBbC2/ZrfXc=</parent>
   <key-kind>struct</key-kind>
@@ -8227,6 +8442,7 @@
   </source>
   <kind>record</kind>
   <id>pbmVOgtPeZtTL7BQG/AM7NVsNdo=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>eSNDaVdF6Ls1X50hIBbC2/ZrfXc=</parent>
   <key-kind>struct</key-kind>
@@ -8274,6 +8490,7 @@
   </source>
   <kind>function</kind>
   <id>k6XRmHNKFO3DuTbVZ/jakKefbI4=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>eSNDaVdF6Ls1X50hIBbC2/ZrfXc=</parent>
   <named>
@@ -8297,6 +8514,7 @@
   </source>
   <kind>function</kind>
   <id>wRe5wKQpkh33p1oRAeIdiCcipWE=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>wpJv75dxyLgHOdHJsb50f1IIDVc=</parent>
   <named>
@@ -8320,6 +8538,7 @@
   </source>
   <kind>function</kind>
   <id>WxHie89cv3o9ybAEURwAW/nkF8c=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>niyoFejCRrpY1Aa9GHwGMnaDfsQ=</parent>
   <named>
@@ -8377,6 +8596,7 @@
   </source>
   <kind>record</kind>
   <id>mAjvoVYFGHUEtQCq4FWGGMMxH1s=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>c7NNZfjOZ8Ztuw0u26xL/h7UKvA=</parent>
   <key-kind>struct</key-kind>
@@ -8410,6 +8630,7 @@
   </source>
   <kind>record</kind>
   <id>96AKnFS/OwIoVISFMJoJhA0YXIU=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>mAjvoVYFGHUEtQCq4FWGGMMxH1s=</parent>
   <key-kind>struct</key-kind>
@@ -8461,6 +8682,7 @@
   </source>
   <kind>function</kind>
   <id>5O/Uisi+wk+iNU2d86KQ78VKmXs=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>mAjvoVYFGHUEtQCq4FWGGMMxH1s=</parent>
   <named>
@@ -8484,6 +8706,7 @@
   </source>
   <kind>record</kind>
   <id>ySgtQ6cLT4QxgOy9pXpcRhuRj3A=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>c7NNZfjOZ8Ztuw0u26xL/h7UKvA=</parent>
   <key-kind>struct</key-kind>
@@ -8534,6 +8757,7 @@
   </source>
   <kind>function</kind>
   <id>KwtZHhEOKc1Y7x9/3RaMuc0jSAQ=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>c7NNZfjOZ8Ztuw0u26xL/h7UKvA=</parent>
   <named>
@@ -8592,6 +8816,7 @@
   </source>
   <kind>record</kind>
   <id>oVLW+4nkn0j9ObUhnIa4DMKY/kE=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>FREf1tucqdONQ71W3hB/Sf/Fbw4=</parent>
   <key-kind>struct</key-kind>
@@ -8616,6 +8841,7 @@
   </source>
   <kind>record</kind>
   <id>fwkbAJn4bwLVQhZizPOq/sf5LQs=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>FREf1tucqdONQ71W3hB/Sf/Fbw4=</parent>
   <key-kind>struct</key-kind>
@@ -8666,6 +8892,7 @@
   </source>
   <kind>record</kind>
   <id>RFQpd+7V+unGQTgk13maA1YEoyY=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>FREf1tucqdONQ71W3hB/Sf/Fbw4=</parent>
   <key-kind>struct</key-kind>
@@ -8699,6 +8926,7 @@
   </source>
   <kind>record</kind>
   <id>oosblLoO9PeSiNyXVDJFFvMU0K4=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>RFQpd+7V+unGQTgk13maA1YEoyY=</parent>
   <key-kind>struct</key-kind>
@@ -8726,6 +8954,7 @@
   </source>
   <kind>record</kind>
   <id>w5EzxR7VXcWh8IwwCTwF2DmD6HY=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>oosblLoO9PeSiNyXVDJFFvMU0K4=</parent>
   <key-kind>struct</key-kind>
@@ -8776,6 +9005,7 @@
   </source>
   <kind>record</kind>
   <id>VxqDdgdkcw8E86ZiNolpXLlhyWs=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>oosblLoO9PeSiNyXVDJFFvMU0K4=</parent>
   <key-kind>struct</key-kind>
@@ -8808,6 +9038,7 @@
   </source>
   <kind>function</kind>
   <id>Ke2zPAmT+7re6NcSIx0HrVAWtbQ=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>oosblLoO9PeSiNyXVDJFFvMU0K4=</parent>
   <named>
@@ -8831,6 +9062,7 @@
   </source>
   <kind>function</kind>
   <id>eWIS1JspwXf4VFbeC250nOaW8DQ=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>RFQpd+7V+unGQTgk13maA1YEoyY=</parent>
   <named>
@@ -8854,6 +9086,7 @@
   </source>
   <kind>function</kind>
   <id>sVuDyryz5zU8wOhK3dlSYmZU5CE=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>FREf1tucqdONQ71W3hB/Sf/Fbw4=</parent>
   <named>
@@ -8912,6 +9145,7 @@
   </source>
   <kind>record</kind>
   <id>LG1bMk2cI8hV4lWJVykhw6PCrNc=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>nuqq8wSa/4T9E2xaPl/SzBPbekM=</parent>
   <key-kind>struct</key-kind>
@@ -8936,6 +9170,7 @@
   </source>
   <kind>record</kind>
   <id>tpjDVYdBSPTndP8VDazRf6/8meo=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>nuqq8wSa/4T9E2xaPl/SzBPbekM=</parent>
   <key-kind>struct</key-kind>
@@ -8986,6 +9221,7 @@
   </source>
   <kind>record</kind>
   <id>IhITMrVguwgsTFnxWSalhrn5lnw=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>nuqq8wSa/4T9E2xaPl/SzBPbekM=</parent>
   <key-kind>struct</key-kind>
@@ -9019,6 +9255,7 @@
   </source>
   <kind>record</kind>
   <id>Fw48V8nmSkOhCwPsm1XbxRqPDn0=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>IhITMrVguwgsTFnxWSalhrn5lnw=</parent>
   <key-kind>struct</key-kind>
@@ -9046,6 +9283,7 @@
   </source>
   <kind>record</kind>
   <id>lQaOnq1H6h180eqz6xbidShIrdA=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>Fw48V8nmSkOhCwPsm1XbxRqPDn0=</parent>
   <key-kind>struct</key-kind>
@@ -9096,6 +9334,7 @@
   </source>
   <kind>record</kind>
   <id>NkmHmT5oAR5xJObAVl4zdPrTJPk=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>Fw48V8nmSkOhCwPsm1XbxRqPDn0=</parent>
   <key-kind>struct</key-kind>
@@ -9136,6 +9375,7 @@
   </source>
   <kind>record</kind>
   <id>3sBLDynoSyGl1xzXtqGZlO/q6dA=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>NkmHmT5oAR5xJObAVl4zdPrTJPk=</parent>
   <key-kind>struct</key-kind>
@@ -9161,6 +9401,7 @@
   </source>
   <kind>record</kind>
   <id>i37LIAL4s3bszXAkCCOEqZEiWm8=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>NkmHmT5oAR5xJObAVl4zdPrTJPk=</parent>
   <key-kind>struct</key-kind>
@@ -9211,6 +9452,7 @@
   </source>
   <kind>function</kind>
   <id>FHki6wfLc2cVbKaSJZQ0J/kMrFo=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>NkmHmT5oAR5xJObAVl4zdPrTJPk=</parent>
   <named>
@@ -9234,6 +9476,7 @@
   </source>
   <kind>function</kind>
   <id>xKUVVd6fzFIwXuQJL2uv/je3C8U=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>Fw48V8nmSkOhCwPsm1XbxRqPDn0=</parent>
   <named>
@@ -9257,6 +9500,7 @@
   </source>
   <kind>function</kind>
   <id>Of4ksZ/82qBZ8faycsAMuRTZk/w=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>IhITMrVguwgsTFnxWSalhrn5lnw=</parent>
   <named>
@@ -9280,6 +9524,7 @@
   </source>
   <kind>function</kind>
   <id>vmcPpW2nEdzEJBR3lq8IYcZgp/A=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>nuqq8wSa/4T9E2xaPl/SzBPbekM=</parent>
   <named>
@@ -9338,6 +9583,7 @@
   </source>
   <kind>record</kind>
   <id>sfl4idQ3XqqjqsGVqx42d8FOaro=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>MyTy/GXkOXKOTiJVqHAVVvaU4es=</parent>
   <key-kind>struct</key-kind>
@@ -9362,6 +9608,7 @@
   </source>
   <kind>record</kind>
   <id>MTJJE+UTS9FHxIdoox7q++4JZsM=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>MyTy/GXkOXKOTiJVqHAVVvaU4es=</parent>
   <key-kind>struct</key-kind>
@@ -9412,6 +9659,7 @@
   </source>
   <kind>record</kind>
   <id>+J66oroZ92MSPf/1vk3672IXQRM=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>MyTy/GXkOXKOTiJVqHAVVvaU4es=</parent>
   <key-kind>struct</key-kind>
@@ -9445,6 +9693,7 @@
   </source>
   <kind>record</kind>
   <id>CWcmlxIs9QnjmES2Cgjlon6OI7w=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>+J66oroZ92MSPf/1vk3672IXQRM=</parent>
   <key-kind>struct</key-kind>
@@ -9472,6 +9721,7 @@
   </source>
   <kind>record</kind>
   <id>WLA6nHwh9KxFHIJwkS99a51Xyko=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>CWcmlxIs9QnjmES2Cgjlon6OI7w=</parent>
   <key-kind>struct</key-kind>
@@ -9522,6 +9772,7 @@
   </source>
   <kind>record</kind>
   <id>3jBuzbuFB0fvpQa1ETvIXevGH2w=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>CWcmlxIs9QnjmES2Cgjlon6OI7w=</parent>
   <key-kind>struct</key-kind>
@@ -9557,6 +9808,7 @@
   </source>
   <kind>record</kind>
   <id>7Jcjk4Lbfc4kwJznX3cZjXNHpWk=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>3jBuzbuFB0fvpQa1ETvIXevGH2w=</parent>
   <key-kind>struct</key-kind>
@@ -9587,6 +9839,7 @@
   </source>
   <kind>record</kind>
   <id>KChFuNDElPROHklvCtkJ+O4+io8=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>3jBuzbuFB0fvpQa1ETvIXevGH2w=</parent>
   <key-kind>struct</key-kind>
@@ -9638,6 +9891,7 @@
   </source>
   <kind>function</kind>
   <id>PRpDe6JxVNh4nb7miNLK+J4NyBs=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>3jBuzbuFB0fvpQa1ETvIXevGH2w=</parent>
   <named>
@@ -9661,6 +9915,7 @@
   </source>
   <kind>function</kind>
   <id>ERePVxBavpYklZW1095eFijAzyo=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>CWcmlxIs9QnjmES2Cgjlon6OI7w=</parent>
   <named>
@@ -9684,6 +9939,7 @@
   </source>
   <kind>function</kind>
   <id>IjwNsbTnmvUUOE6c1avVudG7BPo=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>+J66oroZ92MSPf/1vk3672IXQRM=</parent>
   <named>
@@ -9707,6 +9963,7 @@
   </source>
   <kind>function</kind>
   <id>0JoCfsJh02aIFVEgGdn5b6kIfBE=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>MyTy/GXkOXKOTiJVqHAVVvaU4es=</parent>
   <named>
@@ -9765,6 +10022,7 @@
   </source>
   <kind>record</kind>
   <id>jhii04LwtzP2xeX9VvJ1vkHi96E=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>a69mw641E3cHVf6ovpLtJxTpmps=</parent>
   <key-kind>struct</key-kind>
@@ -9789,6 +10047,7 @@
   </source>
   <kind>record</kind>
   <id>MbQ51g7F4DNybKeSijW6A6+Py8E=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>a69mw641E3cHVf6ovpLtJxTpmps=</parent>
   <key-kind>struct</key-kind>
@@ -9839,6 +10098,7 @@
   </source>
   <kind>record</kind>
   <id>fpqbvQR9NuaJY4fq9LHbiAsZKzw=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>a69mw641E3cHVf6ovpLtJxTpmps=</parent>
   <key-kind>struct</key-kind>
@@ -9872,6 +10132,7 @@
   </source>
   <kind>record</kind>
   <id>zcC98n6b6xzVSJI0qlmjgV7wC4o=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>fpqbvQR9NuaJY4fq9LHbiAsZKzw=</parent>
   <key-kind>struct</key-kind>
@@ -9899,6 +10160,7 @@
   </source>
   <kind>record</kind>
   <id>i5c0yET+iPN3LFNMF/gwxTd2pSk=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>zcC98n6b6xzVSJI0qlmjgV7wC4o=</parent>
   <key-kind>struct</key-kind>
@@ -9949,6 +10211,7 @@
   </source>
   <kind>record</kind>
   <id>r7aMtw1PqhcjWuGFP7pwiW2v0ks=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>zcC98n6b6xzVSJI0qlmjgV7wC4o=</parent>
   <key-kind>struct</key-kind>
@@ -9986,6 +10249,7 @@
   </source>
   <kind>record</kind>
   <id>CS/7AtaJ5KeKtA/s2xnAgctdhCE=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>r7aMtw1PqhcjWuGFP7pwiW2v0ks=</parent>
   <key-kind>struct</key-kind>
@@ -10010,6 +10274,7 @@
   </source>
   <kind>record</kind>
   <id>XZQjC+vy5ZHIMKQ5ib7EqS1pU24=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>r7aMtw1PqhcjWuGFP7pwiW2v0ks=</parent>
   <key-kind>struct</key-kind>
@@ -10061,6 +10326,7 @@
   </source>
   <kind>record</kind>
   <id>hwfbdkFRNunC/3V+s6HA5BwWiSQ=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>r7aMtw1PqhcjWuGFP7pwiW2v0ks=</parent>
   <key-kind>struct</key-kind>
@@ -10104,6 +10370,7 @@
   </source>
   <kind>record</kind>
   <id>CvFJnK9Xu7B2Fbh91NqM0+gKVEU=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>r7aMtw1PqhcjWuGFP7pwiW2v0ks=</parent>
   <key-kind>struct</key-kind>
@@ -10151,6 +10418,7 @@
   </source>
   <kind>function</kind>
   <id>KrK+9nkR4h4eiQEFo/GgzdFR0jE=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>r7aMtw1PqhcjWuGFP7pwiW2v0ks=</parent>
   <named>
@@ -10174,6 +10442,7 @@
   </source>
   <kind>function</kind>
   <id>n1dNaz9okSE0T7t4QZY0RXNA62A=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>zcC98n6b6xzVSJI0qlmjgV7wC4o=</parent>
   <named>
@@ -10197,6 +10466,7 @@
   </source>
   <kind>function</kind>
   <id>EdyFVm0ykK3NCJxIiQhOuJ51n0E=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>fpqbvQR9NuaJY4fq9LHbiAsZKzw=</parent>
   <named>
@@ -10220,6 +10490,7 @@
   </source>
   <kind>function</kind>
   <id>MM35lzfSA81vvD31+lhSPgusPVM=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>a69mw641E3cHVf6ovpLtJxTpmps=</parent>
   <named>
@@ -10277,6 +10548,7 @@
   </source>
   <kind>record</kind>
   <id>709lyZwEiIBHmnH6StkYFJ+CdtU=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>oXfsqUlMzPbEZZJ7K+iZYQj3wko=</parent>
   <key-kind>struct</key-kind>
@@ -10304,6 +10576,7 @@
   </source>
   <kind>record</kind>
   <id>Cc0mRYlhWpgycSGkK7WePuPT7hE=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>709lyZwEiIBHmnH6StkYFJ+CdtU=</parent>
   <key-kind>struct</key-kind>
@@ -10354,6 +10627,7 @@
   </source>
   <kind>record</kind>
   <id>8snJ9gp5ca88/AsWGEnFe6Ln6RQ=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>709lyZwEiIBHmnH6StkYFJ+CdtU=</parent>
   <key-kind>struct</key-kind>
@@ -10386,6 +10660,7 @@
   </source>
   <kind>function</kind>
   <id>+FNNWeksNjExb7Yll0auYGtEtL8=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>709lyZwEiIBHmnH6StkYFJ+CdtU=</parent>
   <named>
@@ -10409,6 +10684,7 @@
   </source>
   <kind>record</kind>
   <id>Qiu5RA/uiY+Qq/uITWh8gZDl09s=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>oXfsqUlMzPbEZZJ7K+iZYQj3wko=</parent>
   <key-kind>struct</key-kind>
@@ -10459,6 +10735,7 @@
   </source>
   <kind>function</kind>
   <id>WcxbiuS6xk05fAxP3nrYhfXXjOI=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>oXfsqUlMzPbEZZJ7K+iZYQj3wko=</parent>
   <named>
@@ -10517,6 +10794,7 @@
   </source>
   <kind>record</kind>
   <id>lTVuthrZypwbNFQmSwD5A+GPxkk=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>uoCdOuqB1v1s6rvl4wDWcLrD4LA=</parent>
   <key-kind>struct</key-kind>
@@ -10541,6 +10819,7 @@
   </source>
   <kind>record</kind>
   <id>/7HGQwWirqFWT+sfif66EM4XDWY=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>uoCdOuqB1v1s6rvl4wDWcLrD4LA=</parent>
   <key-kind>struct</key-kind>
@@ -10591,6 +10870,7 @@
   </source>
   <kind>record</kind>
   <id>j53XjxydcG+wI0iK3mM8/acK5rY=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>uoCdOuqB1v1s6rvl4wDWcLrD4LA=</parent>
   <key-kind>struct</key-kind>
@@ -10624,6 +10904,7 @@
   </source>
   <kind>record</kind>
   <id>c68+fcTp+SPAEXyf+mHRUULqSwU=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>j53XjxydcG+wI0iK3mM8/acK5rY=</parent>
   <key-kind>struct</key-kind>
@@ -10651,6 +10932,7 @@
   </source>
   <kind>record</kind>
   <id>SkuJEV5Urlw9+2JP4u2d89sySxc=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>c68+fcTp+SPAEXyf+mHRUULqSwU=</parent>
   <key-kind>struct</key-kind>
@@ -10701,6 +10983,7 @@
   </source>
   <kind>record</kind>
   <id>J7tgsUhd+qpsq/85qkEgF1l14uk=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>c68+fcTp+SPAEXyf+mHRUULqSwU=</parent>
   <key-kind>struct</key-kind>
@@ -10736,6 +11019,7 @@
   </source>
   <kind>record</kind>
   <id>sw7s/ZGAiU2YPilewUBphRtHzJE=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>J7tgsUhd+qpsq/85qkEgF1l14uk=</parent>
   <key-kind>struct</key-kind>
@@ -10760,6 +11044,7 @@
   </source>
   <kind>record</kind>
   <id>vh1pnm0rrDrR7KEDjTsvkyCZpmk=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>J7tgsUhd+qpsq/85qkEgF1l14uk=</parent>
   <key-kind>struct</key-kind>
@@ -10810,6 +11095,7 @@
   </source>
   <kind>record</kind>
   <id>8PQtbs9xGpu1L+b0VOqfLlE6TnY=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>J7tgsUhd+qpsq/85qkEgF1l14uk=</parent>
   <key-kind>struct</key-kind>
@@ -10842,6 +11128,7 @@
   </source>
   <kind>function</kind>
   <id>8BsWxDSWjQPObBD1lHi1PhOvSok=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>J7tgsUhd+qpsq/85qkEgF1l14uk=</parent>
   <named>
@@ -10865,6 +11152,7 @@
   </source>
   <kind>function</kind>
   <id>d35dZd0PoNHWeWKzMMqMNGyPJIk=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>c68+fcTp+SPAEXyf+mHRUULqSwU=</parent>
   <named>
@@ -10888,6 +11176,7 @@
   </source>
   <kind>function</kind>
   <id>2jXEaf0MU38HzvGajpp7MmuAZ6U=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>j53XjxydcG+wI0iK3mM8/acK5rY=</parent>
   <named>
@@ -10911,6 +11200,7 @@
   </source>
   <kind>function</kind>
   <id>E0QQHdN0Iau6v+NyL5rsEm2ikeE=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>uoCdOuqB1v1s6rvl4wDWcLrD4LA=</parent>
   <named>
@@ -10968,6 +11258,7 @@
   </source>
   <kind>record</kind>
   <id>OHtykpXPLoa0xO0Dw3P7uAImGWI=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>flxREiXFL5ObY0xUAxojj+jvR54=</parent>
   <key-kind>struct</key-kind>
@@ -10997,6 +11288,7 @@
   </source>
   <kind>record</kind>
   <id>TIdvQT1/SnDhh51ggGvABG3pR/A=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>OHtykpXPLoa0xO0Dw3P7uAImGWI=</parent>
   <key-kind>struct</key-kind>
@@ -11048,6 +11340,7 @@
   </source>
   <kind>record</kind>
   <id>eWg27/kfn86dUmPA26mcOo6kkfs=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>OHtykpXPLoa0xO0Dw3P7uAImGWI=</parent>
   <key-kind>struct</key-kind>
@@ -11091,6 +11384,7 @@
   </source>
   <kind>record</kind>
   <id>ZyL4aBHmvCmfq+HyxDSySKwRsdA=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>OHtykpXPLoa0xO0Dw3P7uAImGWI=</parent>
   <key-kind>struct</key-kind>
@@ -11138,6 +11432,7 @@
   </source>
   <kind>function</kind>
   <id>7KdBX5zEl2LQ4HyUjwS94i+QrTQ=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>OHtykpXPLoa0xO0Dw3P7uAImGWI=</parent>
   <named>
@@ -11161,6 +11456,7 @@
   </source>
   <kind>record</kind>
   <id>XIHF6Im4J5Yw0dYbehnXXQwDdjk=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>flxREiXFL5ObY0xUAxojj+jvR54=</parent>
   <key-kind>struct</key-kind>
@@ -11211,6 +11507,7 @@
   </source>
   <kind>function</kind>
   <id>Kg0p1xSLyLmWemst8ZeO3wFK56Y=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>flxREiXFL5ObY0xUAxojj+jvR54=</parent>
   <named>
@@ -11268,6 +11565,7 @@
   </source>
   <kind>record</kind>
   <id>uoWeOq9HHkUSZZj7t+ilmBmv3N8=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>o06yQpJHyCkZyFI44/nN8/tpgT8=</parent>
   <key-kind>struct</key-kind>
@@ -11295,6 +11593,7 @@
   </source>
   <kind>record</kind>
   <id>vycCuI8tFTO2XzFK982RELdJtik=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>uoWeOq9HHkUSZZj7t+ilmBmv3N8=</parent>
   <key-kind>struct</key-kind>
@@ -11345,6 +11644,7 @@
   </source>
   <kind>record</kind>
   <id>zpDyI51RjdguXF8/9KXFrICQwEc=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>uoWeOq9HHkUSZZj7t+ilmBmv3N8=</parent>
   <key-kind>struct</key-kind>
@@ -11385,6 +11685,7 @@
   </source>
   <kind>record</kind>
   <id>OuyCzwMT3B0xth9oee9dTlGkXVw=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>zpDyI51RjdguXF8/9KXFrICQwEc=</parent>
   <key-kind>struct</key-kind>
@@ -11410,6 +11711,7 @@
   </source>
   <kind>record</kind>
   <id>LWqz4rXaiDuM3Pahx88MykZZO9I=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>zpDyI51RjdguXF8/9KXFrICQwEc=</parent>
   <key-kind>struct</key-kind>
@@ -11460,6 +11762,7 @@
   </source>
   <kind>function</kind>
   <id>U3UO/3IhQR4/Q8lDNCFrbFAfiYc=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>zpDyI51RjdguXF8/9KXFrICQwEc=</parent>
   <named>
@@ -11483,6 +11786,7 @@
   </source>
   <kind>function</kind>
   <id>7vVh0IOJS0he8/krIfs50SAl0X4=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>uoWeOq9HHkUSZZj7t+ilmBmv3N8=</parent>
   <named>
@@ -11506,6 +11810,7 @@
   </source>
   <kind>record</kind>
   <id>dFsG0X1P6Tx3hNcuZ3zkjFvRAjg=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>o06yQpJHyCkZyFI44/nN8/tpgT8=</parent>
   <key-kind>struct</key-kind>
@@ -11556,6 +11861,7 @@
   </source>
   <kind>function</kind>
   <id>C2OfmMrOoj9kLOIz4Xl7/jX9SF0=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>o06yQpJHyCkZyFI44/nN8/tpgT8=</parent>
   <named>
@@ -11665,6 +11971,7 @@
   </source>
   <kind>record</kind>
   <id>gCtb2dXrFOJZr+D3olVozhWHsfk=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>Wu710hbNOx84LbfjQUEgqKkZ2dA=</parent>
   <key-kind>struct</key-kind>
@@ -11692,6 +11999,7 @@
   </source>
   <kind>record</kind>
   <id>cAbW+A71ZucFEdutIxvQsMrRZfo=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>gCtb2dXrFOJZr+D3olVozhWHsfk=</parent>
   <key-kind>struct</key-kind>
@@ -11742,6 +12050,7 @@
   </source>
   <kind>record</kind>
   <id>tcws+2wcXL0FEmvv7ZVXvxSkAaI=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>gCtb2dXrFOJZr+D3olVozhWHsfk=</parent>
   <key-kind>struct</key-kind>
@@ -11785,6 +12094,7 @@
   </source>
   <kind>record</kind>
   <id>p6fsvQWRFPREuEHQiwv+xc/06nE=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>tcws+2wcXL0FEmvv7ZVXvxSkAaI=</parent>
   <key-kind>struct</key-kind>
@@ -11809,6 +12119,7 @@
   </source>
   <kind>record</kind>
   <id>dgnsEZRrgKjkRc2mMZu4n+Thg5Q=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>tcws+2wcXL0FEmvv7ZVXvxSkAaI=</parent>
   <key-kind>struct</key-kind>
@@ -11860,6 +12171,7 @@
   </source>
   <kind>function</kind>
   <id>JK68a02L8lf5rdAoU2Fn1//XKPo=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>tcws+2wcXL0FEmvv7ZVXvxSkAaI=</parent>
   <named>
@@ -11883,6 +12195,7 @@
   </source>
   <kind>function</kind>
   <id>sM/INx8vioY0BEfKReMBuXm2HBY=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>gCtb2dXrFOJZr+D3olVozhWHsfk=</parent>
   <named>
@@ -11906,6 +12219,7 @@
   </source>
   <kind>record</kind>
   <id>2Rq4N3puoKp2QK24IubTKoiTfq8=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>Wu710hbNOx84LbfjQUEgqKkZ2dA=</parent>
   <key-kind>struct</key-kind>
@@ -11956,6 +12270,7 @@
   </source>
   <kind>function</kind>
   <id>9jg1NFcwLuCMIlOGSPvpf8kTo6I=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>Wu710hbNOx84LbfjQUEgqKkZ2dA=</parent>
   <named>
@@ -12022,6 +12337,7 @@
   </source>
   <kind>record</kind>
   <id>cGWeDtBrKQollzB0qm7B9OTac+M=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>zYIKjNzi/kYNKvtrTXu8BhQTFt8=</parent>
   <key-kind>struct</key-kind>
@@ -12049,6 +12365,7 @@
   </source>
   <kind>record</kind>
   <id>7ApgPzN0o+KiX+h1Nt7kpUam/fk=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>cGWeDtBrKQollzB0qm7B9OTac+M=</parent>
   <key-kind>struct</key-kind>
@@ -12099,6 +12416,7 @@
   </source>
   <kind>record</kind>
   <id>Xes4IqvFnQoGkxPlP4C4wtbjqxQ=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>cGWeDtBrKQollzB0qm7B9OTac+M=</parent>
   <key-kind>struct</key-kind>
@@ -12143,6 +12461,7 @@
   </source>
   <kind>record</kind>
   <id>KxH5DjtSj5DEteXEQKvnnGIKd1Q=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>Xes4IqvFnQoGkxPlP4C4wtbjqxQ=</parent>
   <key-kind>struct</key-kind>
@@ -12167,6 +12486,7 @@
   </source>
   <kind>record</kind>
   <id>CHRZtPEkA7kslbQF1GY7Gmxte3Y=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>Xes4IqvFnQoGkxPlP4C4wtbjqxQ=</parent>
   <key-kind>struct</key-kind>
@@ -12218,6 +12538,7 @@
   </source>
   <kind>function</kind>
   <id>v1PzqmCVJCqo5vQoiAwHdmaDors=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>Xes4IqvFnQoGkxPlP4C4wtbjqxQ=</parent>
   <named>
@@ -12241,6 +12562,7 @@
   </source>
   <kind>function</kind>
   <id>/F0xQ8CkYuPSsF+C7kU6Hq4vBoc=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>cGWeDtBrKQollzB0qm7B9OTac+M=</parent>
   <named>
@@ -12264,6 +12586,7 @@
   </source>
   <kind>record</kind>
   <id>Nojg2jsXai1iAFP9hsJPlC9tFI8=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>zYIKjNzi/kYNKvtrTXu8BhQTFt8=</parent>
   <key-kind>struct</key-kind>
@@ -12314,6 +12637,7 @@
   </source>
   <kind>function</kind>
   <id>ucTI0a5I6c+mUNdSQ9uEo8SHcC0=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>zYIKjNzi/kYNKvtrTXu8BhQTFt8=</parent>
   <named>
@@ -12380,6 +12704,7 @@
   </source>
   <kind>record</kind>
   <id>GznvBx9oA37GPuoz+kPaL75Zrjc=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>ANhUz0/2S6fRsXsZFhXPTPyPfAE=</parent>
   <key-kind>struct</key-kind>
@@ -12407,6 +12732,7 @@
   </source>
   <kind>record</kind>
   <id>gdFNVKv7I0ihKVjLeuz6GIMd5Q0=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>GznvBx9oA37GPuoz+kPaL75Zrjc=</parent>
   <key-kind>struct</key-kind>
@@ -12457,6 +12783,7 @@
   </source>
   <kind>record</kind>
   <id>OsUzyKi8NDCZFI1r1y4+Ki/4H0s=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>GznvBx9oA37GPuoz+kPaL75Zrjc=</parent>
   <key-kind>struct</key-kind>
@@ -12501,6 +12828,7 @@
   </source>
   <kind>record</kind>
   <id>UJmcVTa6Q9SnE8MBzVgHK8jLUHg=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>OsUzyKi8NDCZFI1r1y4+Ki/4H0s=</parent>
   <key-kind>struct</key-kind>
@@ -12525,6 +12853,7 @@
   </source>
   <kind>record</kind>
   <id>sTA4/H21kP6LPe77SqrI73H6zDA=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>OsUzyKi8NDCZFI1r1y4+Ki/4H0s=</parent>
   <key-kind>struct</key-kind>
@@ -12576,6 +12905,7 @@
   </source>
   <kind>function</kind>
   <id>j3/ONreNlLZw2kJhM+NP0uenvFM=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>OsUzyKi8NDCZFI1r1y4+Ki/4H0s=</parent>
   <named>
@@ -12599,6 +12929,7 @@
   </source>
   <kind>function</kind>
   <id>YQDcNZ1zulU+hPdNVZulbfgVCyw=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>GznvBx9oA37GPuoz+kPaL75Zrjc=</parent>
   <named>
@@ -12622,6 +12953,7 @@
   </source>
   <kind>record</kind>
   <id>GDPrCGIY2hnM7cbCaFUOmm2wshE=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>ANhUz0/2S6fRsXsZFhXPTPyPfAE=</parent>
   <key-kind>struct</key-kind>
@@ -12672,6 +13004,7 @@
   </source>
   <kind>function</kind>
   <id>0MKfZq7R9Aq9aiL1AC64igXi3CI=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>ANhUz0/2S6fRsXsZFhXPTPyPfAE=</parent>
   <named>
@@ -12738,6 +13071,7 @@
   </source>
   <kind>record</kind>
   <id>rWuMv5WTv4dyM17MMm+5Z+5mYms=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>UUBd87/k0jse5896L03eJ4N0l+c=</parent>
   <key-kind>struct</key-kind>
@@ -12762,6 +13096,7 @@
   </source>
   <kind>record</kind>
   <id>+mrn5TAPBw5Ly6qXobQ1L41PIgQ=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>UUBd87/k0jse5896L03eJ4N0l+c=</parent>
   <key-kind>struct</key-kind>
@@ -12813,6 +13148,7 @@
   </source>
   <kind>function</kind>
   <id>svewSfOd2nUBZzGQEKQl0cT2aPE=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>UUBd87/k0jse5896L03eJ4N0l+c=</parent>
   <named>
@@ -12880,6 +13216,7 @@
   </source>
   <kind>record</kind>
   <id>01kpyRVWFqRqOFsaZYkbMogWtPo=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>AhWlDEmWhkTeQuWWCaZwMGCG5HQ=</parent>
   <key-kind>struct</key-kind>
@@ -12904,6 +13241,7 @@
   </source>
   <kind>record</kind>
   <id>jsvmsDChIjbJL9NiOfViZSJnAjY=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>AhWlDEmWhkTeQuWWCaZwMGCG5HQ=</parent>
   <key-kind>struct</key-kind>
@@ -12955,6 +13293,7 @@
   </source>
   <kind>function</kind>
   <id>UbssWKiKA2XCn+KOXE4lp7iGdzQ=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>AhWlDEmWhkTeQuWWCaZwMGCG5HQ=</parent>
   <named>
@@ -13021,6 +13360,7 @@
   </source>
   <kind>record</kind>
   <id>yiTNiZbPnfj9SDdT8k1YKmjW68g=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>PA+4gdvi0ChhszyGuOL6zlYXHpk=</parent>
   <key-kind>struct</key-kind>
@@ -13048,6 +13388,7 @@
   </source>
   <kind>record</kind>
   <id>boLQk9sIyBQTBaPhSeSLjkGr51k=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>yiTNiZbPnfj9SDdT8k1YKmjW68g=</parent>
   <key-kind>struct</key-kind>
@@ -13098,6 +13439,7 @@
   </source>
   <kind>function</kind>
   <id>boc7yC4tWsGrT4a762yRiFkFe3E=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>yiTNiZbPnfj9SDdT8k1YKmjW68g=</parent>
   <named>
@@ -13121,6 +13463,7 @@
   </source>
   <kind>record</kind>
   <id>gL1/NnHh2HYS9OB5keD9fU12dSo=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>PA+4gdvi0ChhszyGuOL6zlYXHpk=</parent>
   <key-kind>struct</key-kind>
@@ -13171,6 +13514,7 @@
   </source>
   <kind>function</kind>
   <id>4/0nNUnS+aKTLkNic02JvmAYN8w=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>PA+4gdvi0ChhszyGuOL6zlYXHpk=</parent>
   <named>
@@ -13238,6 +13582,7 @@
   </source>
   <kind>record</kind>
   <id>fGVNLPQ3MMrnwX04ymPQlkujFTU=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>A9DWlv0rbuFs3A9eHqZTaJDN7Uk=</parent>
   <key-kind>struct</key-kind>
@@ -13262,6 +13607,7 @@
   </source>
   <kind>record</kind>
   <id>yoz58B5jOuyETge5TB/Gq0sww/s=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>A9DWlv0rbuFs3A9eHqZTaJDN7Uk=</parent>
   <key-kind>struct</key-kind>
@@ -13313,6 +13659,7 @@
   </source>
   <kind>function</kind>
   <id>SI6fCmHpjXt1eDUQcdjtWNvw+kI=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>A9DWlv0rbuFs3A9eHqZTaJDN7Uk=</parent>
   <named>
@@ -13380,6 +13727,7 @@
   </source>
   <kind>record</kind>
   <id>b/ObiarHd7/3VFD3w5j3+B1ESLU=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>x7MfNbWaSdnUCRBlHt+nSvOlEPw=</parent>
   <key-kind>struct</key-kind>
@@ -13404,6 +13752,7 @@
   </source>
   <kind>record</kind>
   <id>NCeRVwwum78r2U1ltYyxR8L2w1E=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>x7MfNbWaSdnUCRBlHt+nSvOlEPw=</parent>
   <key-kind>struct</key-kind>
@@ -13454,6 +13803,7 @@
   </source>
   <kind>record</kind>
   <id>+YuAVlOefcnfZIU1wckNM7lfNaA=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>x7MfNbWaSdnUCRBlHt+nSvOlEPw=</parent>
   <key-kind>struct</key-kind>
@@ -13496,6 +13846,7 @@
   </source>
   <kind>record</kind>
   <id>ESA+jWIqD6n9bgbcE+2k+r76ElE=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>+YuAVlOefcnfZIU1wckNM7lfNaA=</parent>
   <key-kind>struct</key-kind>
@@ -13523,6 +13874,7 @@
   </source>
   <kind>record</kind>
   <id>Qi1L025HS2xzUSVM/EdHO3S86T8=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>ESA+jWIqD6n9bgbcE+2k+r76ElE=</parent>
   <key-kind>struct</key-kind>
@@ -13573,6 +13925,7 @@
   </source>
   <kind>function</kind>
   <id>3sJu+IqldeGkloa8X4vNDJFmKEQ=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>ESA+jWIqD6n9bgbcE+2k+r76ElE=</parent>
   <named>
@@ -13596,6 +13949,7 @@
   </source>
   <kind>function</kind>
   <id>deCReqMCMZ5o+J9gqrHth9Wy1Es=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>+YuAVlOefcnfZIU1wckNM7lfNaA=</parent>
   <named>
@@ -13619,6 +13973,7 @@
   </source>
   <kind>function</kind>
   <id>bgKQbkZimRWN+9DAu9D4f7oEGV4=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>x7MfNbWaSdnUCRBlHt+nSvOlEPw=</parent>
   <named>
@@ -13686,6 +14041,7 @@
   </source>
   <kind>record</kind>
   <id>n4hlCG4vxyjaMc8kMpGE14UyogA=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>Up/SfnuYTQw+Y6klSO3f5z86DOY=</parent>
   <key-kind>struct</key-kind>
@@ -13710,6 +14066,7 @@
   </source>
   <kind>record</kind>
   <id>UQEIeTWOsCvViISUDQjHQsKXKEE=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>Up/SfnuYTQw+Y6klSO3f5z86DOY=</parent>
   <key-kind>struct</key-kind>
@@ -13760,6 +14117,7 @@
   </source>
   <kind>record</kind>
   <id>XLAZYk894KbFFFIzJpR6c2Fi870=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>Up/SfnuYTQw+Y6klSO3f5z86DOY=</parent>
   <key-kind>struct</key-kind>
@@ -13802,6 +14160,7 @@
   </source>
   <kind>record</kind>
   <id>ej1LvbYphHq2t9yaXo4D3iiKKN8=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>XLAZYk894KbFFFIzJpR6c2Fi870=</parent>
   <key-kind>struct</key-kind>
@@ -13828,6 +14187,7 @@
   </source>
   <kind>record</kind>
   <id>x+oMV86+KxeHkrtmDX4jZW+PwTk=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>ej1LvbYphHq2t9yaXo4D3iiKKN8=</parent>
   <key-kind>struct</key-kind>
@@ -13879,6 +14239,7 @@
   </source>
   <kind>function</kind>
   <id>pe+fNqI2/HCc7+9hx+x2SXNXUwA=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>ej1LvbYphHq2t9yaXo4D3iiKKN8=</parent>
   <named>
@@ -13902,6 +14263,7 @@
   </source>
   <kind>function</kind>
   <id>vv6Mh6UCpIt7vw3PdpXT2eOk7Tg=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>XLAZYk894KbFFFIzJpR6c2Fi870=</parent>
   <named>
@@ -13925,6 +14287,7 @@
   </source>
   <kind>function</kind>
   <id>iJXyVDuCFsVl1t+hV5SjCNCvaII=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>Up/SfnuYTQw+Y6klSO3f5z86DOY=</parent>
   <named>
@@ -13992,6 +14355,7 @@
   </source>
   <kind>record</kind>
   <id>zTfn5SIG1/BQB4Vz9PrFkzIqCmI=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>ByHV/GlyHOt9h6ZVKpsDi/DkBkM=</parent>
   <key-kind>struct</key-kind>
@@ -14016,6 +14380,7 @@
   </source>
   <kind>record</kind>
   <id>93+VLxr4uaKDABFrJr8DqishCnQ=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>ByHV/GlyHOt9h6ZVKpsDi/DkBkM=</parent>
   <key-kind>struct</key-kind>
@@ -14066,6 +14431,7 @@
   </source>
   <kind>record</kind>
   <id>1ro4Sv8wGUNxysGIgXgcl9hcP68=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>ByHV/GlyHOt9h6ZVKpsDi/DkBkM=</parent>
   <key-kind>struct</key-kind>
@@ -14108,6 +14474,7 @@
   </source>
   <kind>record</kind>
   <id>/Iw6bfcamLwq/8bygja2aJQXqVE=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>1ro4Sv8wGUNxysGIgXgcl9hcP68=</parent>
   <key-kind>struct</key-kind>
@@ -14135,6 +14502,7 @@
   </source>
   <kind>record</kind>
   <id>0eW+7m0STZ21+XZ3v4lkSVybZJ0=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>/Iw6bfcamLwq/8bygja2aJQXqVE=</parent>
   <key-kind>struct</key-kind>
@@ -14186,6 +14554,7 @@
   </source>
   <kind>function</kind>
   <id>Nl8m6GnygwbQGO3a+eqFjZylM/A=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>/Iw6bfcamLwq/8bygja2aJQXqVE=</parent>
   <named>
@@ -14209,6 +14578,7 @@
   </source>
   <kind>function</kind>
   <id>sQl4L7MS92M2vveFlkZvlOV/oPA=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>1ro4Sv8wGUNxysGIgXgcl9hcP68=</parent>
   <named>
@@ -14232,6 +14602,7 @@
   </source>
   <kind>function</kind>
   <id>z6YotJ9CmnzyqJ41yK7Ra+fopbM=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>ByHV/GlyHOt9h6ZVKpsDi/DkBkM=</parent>
   <named>
@@ -14298,6 +14669,7 @@
   </source>
   <kind>record</kind>
   <id>jUAs995uvzET3EsGSOVUwR/Ptzc=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>kn1OyT1FzAvXXJMp4nKleaEX+5c=</parent>
   <key-kind>struct</key-kind>
@@ -14324,6 +14696,7 @@
   </source>
   <kind>record</kind>
   <id>3Hz31SDA9BZgZc5teheYelVphp0=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>jUAs995uvzET3EsGSOVUwR/Ptzc=</parent>
   <key-kind>struct</key-kind>
@@ -14375,6 +14748,7 @@
   </source>
   <kind>function</kind>
   <id>NgX9CxLoQTLVac6OtBsbNcSNcME=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>jUAs995uvzET3EsGSOVUwR/Ptzc=</parent>
   <named>
@@ -14398,6 +14772,7 @@
   </source>
   <kind>record</kind>
   <id>r2RB8PwDCI61PfLPFsx2brM49Ac=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>kn1OyT1FzAvXXJMp4nKleaEX+5c=</parent>
   <key-kind>struct</key-kind>
@@ -14448,6 +14823,7 @@
   </source>
   <kind>function</kind>
   <id>AMQ/ByA794GAhRus8AOu07b33Tg=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>kn1OyT1FzAvXXJMp4nKleaEX+5c=</parent>
   <named>
@@ -14515,6 +14891,7 @@
   </source>
   <kind>record</kind>
   <id>6s/466DwNZ4E0YDtiYJqR03gjAg=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>IbslzK4eUJj1gUsgbS4h/0Axavg=</parent>
   <key-kind>struct</key-kind>
@@ -14539,6 +14916,7 @@
   </source>
   <kind>record</kind>
   <id>ZVrd+z+aj7kndV8zl/tQD4n2PpI=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>IbslzK4eUJj1gUsgbS4h/0Axavg=</parent>
   <key-kind>struct</key-kind>
@@ -14589,6 +14967,7 @@
   </source>
   <kind>record</kind>
   <id>s40Z8yfzcJnCZSeYYV5sYlFzOxs=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>IbslzK4eUJj1gUsgbS4h/0Axavg=</parent>
   <key-kind>struct</key-kind>
@@ -14631,6 +15010,7 @@
   </source>
   <kind>record</kind>
   <id>5i4Oz7fFAR9QRQ2ctfC9IaLMH8I=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>s40Z8yfzcJnCZSeYYV5sYlFzOxs=</parent>
   <key-kind>struct</key-kind>
@@ -14658,6 +15038,7 @@
   </source>
   <kind>record</kind>
   <id>/GAHgBYtFNuyluNz/U8S+0bmRSQ=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>5i4Oz7fFAR9QRQ2ctfC9IaLMH8I=</parent>
   <key-kind>struct</key-kind>
@@ -14709,6 +15090,7 @@
   </source>
   <kind>function</kind>
   <id>qSy8qMv7vuyeun0rwa2i7+4N/w0=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>5i4Oz7fFAR9QRQ2ctfC9IaLMH8I=</parent>
   <named>
@@ -14732,6 +15114,7 @@
   </source>
   <kind>function</kind>
   <id>stYI2mx3fdFM8h3v5Xyaklh+ErA=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>s40Z8yfzcJnCZSeYYV5sYlFzOxs=</parent>
   <named>
@@ -14755,6 +15138,7 @@
   </source>
   <kind>function</kind>
   <id>gyl1ik0AKbg8uSCDNeqNmWeweQE=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>IbslzK4eUJj1gUsgbS4h/0Axavg=</parent>
   <named>
@@ -14822,6 +15206,7 @@
   </source>
   <kind>record</kind>
   <id>oKYUjNx6J9ekTkwMm5ue92k5Au4=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>MYFk6ANWkex8j7vBuMpAqchgYIY=</parent>
   <key-kind>struct</key-kind>
@@ -14846,6 +15231,7 @@
   </source>
   <kind>record</kind>
   <id>8vEnMjkS28lfiCf8rbBriqxcO5Y=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>MYFk6ANWkex8j7vBuMpAqchgYIY=</parent>
   <key-kind>struct</key-kind>
@@ -14896,6 +15282,7 @@
   </source>
   <kind>record</kind>
   <id>uE1JLlP4kj18/7anYGDOOUyNK5M=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>MYFk6ANWkex8j7vBuMpAqchgYIY=</parent>
   <key-kind>struct</key-kind>
@@ -14938,6 +15325,7 @@
   </source>
   <kind>record</kind>
   <id>FOmk9y+Cw81IBREmsFKS2/xbZEw=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>uE1JLlP4kj18/7anYGDOOUyNK5M=</parent>
   <key-kind>struct</key-kind>
@@ -14965,6 +15353,7 @@
   </source>
   <kind>record</kind>
   <id>SL5VtD+e99bejq70N9+jOCWJkA0=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>FOmk9y+Cw81IBREmsFKS2/xbZEw=</parent>
   <key-kind>struct</key-kind>
@@ -15015,6 +15404,7 @@
   </source>
   <kind>record</kind>
   <id>V/H0waQNmYhkbcgX6kBFOODNK64=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>FOmk9y+Cw81IBREmsFKS2/xbZEw=</parent>
   <key-kind>struct</key-kind>
@@ -15058,6 +15448,7 @@
   </source>
   <kind>record</kind>
   <id>UTUtsfPLhT8t0PfqqpBYR2R6IeA=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>V/H0waQNmYhkbcgX6kBFOODNK64=</parent>
   <key-kind>struct</key-kind>
@@ -15084,6 +15475,7 @@
   </source>
   <kind>function</kind>
   <id>dLKTrZfdhQpgAK1S0l66Tj7if2o=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>UTUtsfPLhT8t0PfqqpBYR2R6IeA=</parent>
   <named>
@@ -15107,6 +15499,7 @@
   </source>
   <kind>record</kind>
   <id>C3y4XMVXMiPK3FyTTBIV1tLNz9M=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>V/H0waQNmYhkbcgX6kBFOODNK64=</parent>
   <key-kind>struct</key-kind>
@@ -15157,6 +15550,7 @@
   </source>
   <kind>function</kind>
   <id>6TcwPGKK+W3PE75/YLv55OzEi/A=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>V/H0waQNmYhkbcgX6kBFOODNK64=</parent>
   <named>
@@ -15180,6 +15574,7 @@
   </source>
   <kind>function</kind>
   <id>R/FKz/QxHGy4jxNh5iP4wsRDhoU=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>FOmk9y+Cw81IBREmsFKS2/xbZEw=</parent>
   <named>
@@ -15203,6 +15598,7 @@
   </source>
   <kind>function</kind>
   <id>9SbKKVmtvhC9upM/OzrfC2t8dV4=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>uE1JLlP4kj18/7anYGDOOUyNK5M=</parent>
   <named>
@@ -15226,6 +15622,7 @@
   </source>
   <kind>function</kind>
   <id>U/Fu8CN+iTfaiVuOFc26ahDBCBE=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>MYFk6ANWkex8j7vBuMpAqchgYIY=</parent>
   <named>
@@ -15293,6 +15690,7 @@
   </source>
   <kind>record</kind>
   <id>5FmKYRFMpfbAvqSrRPpQZHF1NuE=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>1gjCMmREpyWTXEFMqDWbHTY9s+Q=</parent>
   <key-kind>struct</key-kind>
@@ -15317,6 +15715,7 @@
   </source>
   <kind>record</kind>
   <id>l7G+8vz4XtvP9QMA2Pay6EiAAmc=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>1gjCMmREpyWTXEFMqDWbHTY9s+Q=</parent>
   <key-kind>struct</key-kind>
@@ -15367,6 +15766,7 @@
   </source>
   <kind>record</kind>
   <id>tZqwapq24sWOnWsHAcGXH/3yX3Y=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>1gjCMmREpyWTXEFMqDWbHTY9s+Q=</parent>
   <key-kind>struct</key-kind>
@@ -15409,6 +15809,7 @@
   </source>
   <kind>record</kind>
   <id>lOYR3RSOn6EXRgMVOdiUYeA1St0=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>tZqwapq24sWOnWsHAcGXH/3yX3Y=</parent>
   <key-kind>struct</key-kind>
@@ -15436,6 +15837,7 @@
   </source>
   <kind>record</kind>
   <id>gMX/HXKHuwdr3ZUv3Th0+z3Yn0s=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>lOYR3RSOn6EXRgMVOdiUYeA1St0=</parent>
   <key-kind>struct</key-kind>
@@ -15486,6 +15888,7 @@
   </source>
   <kind>record</kind>
   <id>1YtqF4WYT0uK7amUiCmJVk03Oog=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>lOYR3RSOn6EXRgMVOdiUYeA1St0=</parent>
   <key-kind>struct</key-kind>
@@ -15529,6 +15932,7 @@
   </source>
   <kind>record</kind>
   <id>k9AaqBo71BbsBfJvC8zagAfoRJ8=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>1YtqF4WYT0uK7amUiCmJVk03Oog=</parent>
   <key-kind>struct</key-kind>
@@ -15553,6 +15957,7 @@
   </source>
   <kind>record</kind>
   <id>Z3kwHhQ9TeFidONs1zwBzesA5Qk=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>1YtqF4WYT0uK7amUiCmJVk03Oog=</parent>
   <key-kind>struct</key-kind>
@@ -15604,6 +16009,7 @@
   </source>
   <kind>function</kind>
   <id>ZiN2GuZuzwIBJ2u7TMltuIbCH4k=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>1YtqF4WYT0uK7amUiCmJVk03Oog=</parent>
   <named>
@@ -15627,6 +16033,7 @@
   </source>
   <kind>function</kind>
   <id>btGWH8GuFbEAWESUiKiAeYkimlg=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>lOYR3RSOn6EXRgMVOdiUYeA1St0=</parent>
   <named>
@@ -15650,6 +16057,7 @@
   </source>
   <kind>function</kind>
   <id>Ui54+P4LXLXOsVwvvHvLzgj2TYM=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>tZqwapq24sWOnWsHAcGXH/3yX3Y=</parent>
   <named>
@@ -15673,6 +16081,7 @@
   </source>
   <kind>function</kind>
   <id>0ILOaAwePGv2L8GkSJc3XNfRjFs=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>1gjCMmREpyWTXEFMqDWbHTY9s+Q=</parent>
   <named>
@@ -15740,6 +16149,7 @@
   </source>
   <kind>record</kind>
   <id>NLQ1ldoPQ5U1FSx0Ab8ZF4V6wnI=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>IG7byGfx+stnhACpeGR2toLyv7U=</parent>
   <key-kind>struct</key-kind>
@@ -15764,6 +16174,7 @@
   </source>
   <kind>record</kind>
   <id>ZZH7BKff6J0lIPMbz4l4lG/x9Xw=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>IG7byGfx+stnhACpeGR2toLyv7U=</parent>
   <key-kind>struct</key-kind>
@@ -15814,6 +16225,7 @@
   </source>
   <kind>record</kind>
   <id>hpAmCOpzad0YvzIs/nrK1blINCo=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>IG7byGfx+stnhACpeGR2toLyv7U=</parent>
   <key-kind>struct</key-kind>
@@ -15856,6 +16268,7 @@
   </source>
   <kind>record</kind>
   <id>psFAepglqmkBtNBdTg6lzRdenHA=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>hpAmCOpzad0YvzIs/nrK1blINCo=</parent>
   <key-kind>struct</key-kind>
@@ -15883,6 +16296,7 @@
   </source>
   <kind>record</kind>
   <id>ZDCCpKbLnTUygKHcdXArtd9dGLM=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>psFAepglqmkBtNBdTg6lzRdenHA=</parent>
   <key-kind>struct</key-kind>
@@ -15933,6 +16347,7 @@
   </source>
   <kind>record</kind>
   <id>GJK8oH0tb+kOcrLsJD4KLPgW01k=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>psFAepglqmkBtNBdTg6lzRdenHA=</parent>
   <key-kind>struct</key-kind>
@@ -15977,6 +16392,7 @@
   </source>
   <kind>record</kind>
   <id>dD1k1XHEsya/0+XaDOV1rQpVjGc=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>GJK8oH0tb+kOcrLsJD4KLPgW01k=</parent>
   <key-kind>struct</key-kind>
@@ -16001,6 +16417,7 @@
   </source>
   <kind>record</kind>
   <id>/sbl0h6rv808/hLp3t8ImQj/xWI=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>GJK8oH0tb+kOcrLsJD4KLPgW01k=</parent>
   <key-kind>struct</key-kind>
@@ -16052,6 +16469,7 @@
   </source>
   <kind>function</kind>
   <id>I1peKpkItbyZJLRhSXWz9ZLv9XM=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>GJK8oH0tb+kOcrLsJD4KLPgW01k=</parent>
   <named>
@@ -16075,6 +16493,7 @@
   </source>
   <kind>function</kind>
   <id>J91kBbn5207CxEaYbUx30k2zkfk=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>psFAepglqmkBtNBdTg6lzRdenHA=</parent>
   <named>
@@ -16098,6 +16517,7 @@
   </source>
   <kind>function</kind>
   <id>GHQfYAax5Ac22tnBlatuH9UkDLo=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>hpAmCOpzad0YvzIs/nrK1blINCo=</parent>
   <named>
@@ -16121,6 +16541,7 @@
   </source>
   <kind>function</kind>
   <id>sEmDiLyFZrN489MsciDebnecEUg=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>IG7byGfx+stnhACpeGR2toLyv7U=</parent>
   <named>
@@ -16187,6 +16608,7 @@
   </source>
   <kind>record</kind>
   <id>AedlkzTQ3XMtklY5JQNTU9Q693U=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>tuaR3CreZXFWLNOiRe6vUMcdi/0=</parent>
   <key-kind>struct</key-kind>
@@ -16214,6 +16636,7 @@
   </source>
   <kind>record</kind>
   <id>ZVPQu+o+bOETjTeYbQPX3DpZHsI=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>AedlkzTQ3XMtklY5JQNTU9Q693U=</parent>
   <key-kind>struct</key-kind>
@@ -16265,6 +16688,7 @@
   </source>
   <kind>function</kind>
   <id>FCas52GV+t9i8WTg9zQMdKw3qy8=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>AedlkzTQ3XMtklY5JQNTU9Q693U=</parent>
   <named>
@@ -16288,6 +16712,7 @@
   </source>
   <kind>record</kind>
   <id>x4evHZHGuxDX33AZdmaDmPqEUBQ=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>tuaR3CreZXFWLNOiRe6vUMcdi/0=</parent>
   <key-kind>struct</key-kind>
@@ -16338,6 +16763,7 @@
   </source>
   <kind>function</kind>
   <id>UFIUrTz1AhNVnXp36I2CQg9ixr4=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>tuaR3CreZXFWLNOiRe6vUMcdi/0=</parent>
   <named>
@@ -16405,6 +16831,7 @@
   </source>
   <kind>record</kind>
   <id>U0z/ndEFBRPUsRocwKtkeFJARB4=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>UpHebkkBv0Q2s1ECAoKTf79hJ0Q=</parent>
   <key-kind>struct</key-kind>
@@ -16429,6 +16856,7 @@
   </source>
   <kind>record</kind>
   <id>IXEkzvLrMpSwXl5gP+lIgInnSP8=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>UpHebkkBv0Q2s1ECAoKTf79hJ0Q=</parent>
   <key-kind>struct</key-kind>
@@ -16479,6 +16907,7 @@
   </source>
   <kind>record</kind>
   <id>51FuSsXmA0w505ZBRVkx0q/lmUk=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>UpHebkkBv0Q2s1ECAoKTf79hJ0Q=</parent>
   <key-kind>struct</key-kind>
@@ -16521,6 +16950,7 @@
   </source>
   <kind>record</kind>
   <id>MeilWWlQPSeKS/ejqoeb8fMZVQU=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>51FuSsXmA0w505ZBRVkx0q/lmUk=</parent>
   <key-kind>struct</key-kind>
@@ -16548,6 +16978,7 @@
   </source>
   <kind>record</kind>
   <id>QT17UXq7NxbmhSdqWIqRBy1Qb/g=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>MeilWWlQPSeKS/ejqoeb8fMZVQU=</parent>
   <key-kind>struct</key-kind>
@@ -16598,6 +17029,7 @@
   </source>
   <kind>record</kind>
   <id>9PQcUNZCJePNJhT5t0prZNV/lHk=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>MeilWWlQPSeKS/ejqoeb8fMZVQU=</parent>
   <key-kind>struct</key-kind>
@@ -16642,6 +17074,7 @@
   </source>
   <kind>record</kind>
   <id>y8luMpuVeImIqogf4JhqQfKDkmw=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>9PQcUNZCJePNJhT5t0prZNV/lHk=</parent>
   <key-kind>struct</key-kind>
@@ -16666,6 +17099,7 @@
   </source>
   <kind>record</kind>
   <id>aoYmf5zFdrgPH9Wo0O/CQ5Gm7e8=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>9PQcUNZCJePNJhT5t0prZNV/lHk=</parent>
   <key-kind>struct</key-kind>
@@ -16717,6 +17151,7 @@
   </source>
   <kind>function</kind>
   <id>l03rKLGOW4AKcXYHLtxb2PpTzq0=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>9PQcUNZCJePNJhT5t0prZNV/lHk=</parent>
   <named>
@@ -16740,6 +17175,7 @@
   </source>
   <kind>function</kind>
   <id>odTALSD5XhrHnqB65Bl24mMbP3c=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>MeilWWlQPSeKS/ejqoeb8fMZVQU=</parent>
   <named>
@@ -16763,6 +17199,7 @@
   </source>
   <kind>function</kind>
   <id>SbCOlmHxM2JSOc4kKArR7lRcYTU=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>51FuSsXmA0w505ZBRVkx0q/lmUk=</parent>
   <named>
@@ -16786,6 +17223,7 @@
   </source>
   <kind>function</kind>
   <id>LHz/pAtXgUwDFkq91SaD+POSBrQ=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>UpHebkkBv0Q2s1ECAoKTf79hJ0Q=</parent>
   <named>
@@ -16852,6 +17290,7 @@
   </source>
   <kind>record</kind>
   <id>qbJT920zehI9gqkvbe0x/HrzT00=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>IxCiCl8tf7r2/CmQWZiWxFHf7+g=</parent>
   <key-kind>struct</key-kind>
@@ -16879,6 +17318,7 @@
   </source>
   <kind>record</kind>
   <id>9BOS99lqNCS5fAcBO02qQ0Z2st8=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>qbJT920zehI9gqkvbe0x/HrzT00=</parent>
   <key-kind>struct</key-kind>
@@ -16930,6 +17370,7 @@
   </source>
   <kind>function</kind>
   <id>fAm4hbV0Td9FyKgjfNXd5vBMN9Q=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>qbJT920zehI9gqkvbe0x/HrzT00=</parent>
   <named>
@@ -16953,6 +17394,7 @@
   </source>
   <kind>record</kind>
   <id>YmolZwhgz1SAGaOGoKIE4JAN0KM=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>IxCiCl8tf7r2/CmQWZiWxFHf7+g=</parent>
   <key-kind>struct</key-kind>
@@ -17003,6 +17445,7 @@
   </source>
   <kind>function</kind>
   <id>lsMH3dD3dKbeUC9Ps78rkbjfPs8=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>IxCiCl8tf7r2/CmQWZiWxFHf7+g=</parent>
   <named>
@@ -17069,6 +17512,7 @@
   </source>
   <kind>record</kind>
   <id>ICgSeUPCz86m25XZTXmGxzgkbhY=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>Rh5ZoB5qF98iwmDPqUPnsyKkTcs=</parent>
   <key-kind>struct</key-kind>
@@ -17096,6 +17540,7 @@
   </source>
   <kind>record</kind>
   <id>5nVb5siuVRlsyau36E3FYJlBgdA=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>ICgSeUPCz86m25XZTXmGxzgkbhY=</parent>
   <key-kind>struct</key-kind>
@@ -17146,6 +17591,7 @@
   </source>
   <kind>record</kind>
   <id>p3PhPnVydwdupHBMAXlcrNQuiFo=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>ICgSeUPCz86m25XZTXmGxzgkbhY=</parent>
   <key-kind>struct</key-kind>
@@ -17189,6 +17635,7 @@
   </source>
   <kind>record</kind>
   <id>aOsVfXK2YXy8YzpChV4neMCBUNE=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>p3PhPnVydwdupHBMAXlcrNQuiFo=</parent>
   <key-kind>struct</key-kind>
@@ -17215,6 +17662,7 @@
   </source>
   <kind>function</kind>
   <id>bLNBUo4KpSS0BZPlsnEoRwbgQU0=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>aOsVfXK2YXy8YzpChV4neMCBUNE=</parent>
   <named>
@@ -17238,6 +17686,7 @@
   </source>
   <kind>record</kind>
   <id>Vfp4UI1q/WKw9xkfiS/VJGS128A=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>p3PhPnVydwdupHBMAXlcrNQuiFo=</parent>
   <key-kind>struct</key-kind>
@@ -17288,6 +17737,7 @@
   </source>
   <kind>function</kind>
   <id>MALiKbm+kvgFLsUl6NAFGk8/mbk=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>p3PhPnVydwdupHBMAXlcrNQuiFo=</parent>
   <named>
@@ -17311,6 +17761,7 @@
   </source>
   <kind>function</kind>
   <id>wPErD4kGY0RQwZPJCHE5l7qe7BU=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>ICgSeUPCz86m25XZTXmGxzgkbhY=</parent>
   <named>
@@ -17334,6 +17785,7 @@
   </source>
   <kind>record</kind>
   <id>UArBfH6vZIOYsAbmmAKjRN+1EuM=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>Rh5ZoB5qF98iwmDPqUPnsyKkTcs=</parent>
   <key-kind>struct</key-kind>
@@ -17384,6 +17836,7 @@
   </source>
   <kind>function</kind>
   <id>3MkimKMLv1YlKrDKDOy2h9rv8dc=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>Rh5ZoB5qF98iwmDPqUPnsyKkTcs=</parent>
   <named>
diff --git a/test-files/golden-tests/symbols/record/class-template-specializations-2.xml b/test-files/golden-tests/symbols/record/class-template-specializations-2.xml
index 2fac92c30d..c9a1bc28fc 100644
--- a/test-files/golden-tests/symbols/record/class-template-specializations-2.xml
+++ b/test-files/golden-tests/symbols/record/class-template-specializations-2.xml
@@ -96,6 +96,7 @@
   </source>
   <kind>record</kind>
   <id>t1k8CaeFknlnAWQfa52he803Mcw=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>bcCFiKKGBMnWrAf/IBu1R/sC07s=</parent>
   <key-kind>struct</key-kind>
@@ -129,6 +130,7 @@
   </source>
   <kind>record</kind>
   <id>GhbkOB/0KLVvGJAl1Q3aM43ZocQ=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>t1k8CaeFknlnAWQfa52he803Mcw=</parent>
   <key-kind>struct</key-kind>
@@ -160,6 +162,7 @@
   </source>
   <kind>record</kind>
   <id>TpBRSCUm33PjLoWxW50FZsR1GSM=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>t1k8CaeFknlnAWQfa52he803Mcw=</parent>
   <key-kind>struct</key-kind>
@@ -204,6 +207,7 @@
   </source>
   <kind>record</kind>
   <id>lKNoRiq1oi0XgdyuRlHKmVsSkus=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>TpBRSCUm33PjLoWxW50FZsR1GSM=</parent>
   <key-kind>struct</key-kind>
@@ -228,6 +232,7 @@
   </source>
   <kind>record</kind>
   <id>RdjbfZA0y514GFSR1pCAjUyfq24=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>bcCFiKKGBMnWrAf/IBu1R/sC07s=</parent>
   <key-kind>struct</key-kind>
@@ -266,6 +271,7 @@
   </source>
   <kind>record</kind>
   <id>ZbjwxkmALgjx71k6/JAk0jbwrlo=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>RdjbfZA0y514GFSR1pCAjUyfq24=</parent>
   <key-kind>struct</key-kind>
@@ -297,6 +303,7 @@
   </source>
   <kind>record</kind>
   <id>zPgrcrIOrcVWP7Qpw8x3Zl2fIpI=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>RdjbfZA0y514GFSR1pCAjUyfq24=</parent>
   <key-kind>struct</key-kind>
@@ -340,6 +347,7 @@
   </source>
   <kind>record</kind>
   <id>flW1A8++hJYAIoinZHMJ/EargvI=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>bcCFiKKGBMnWrAf/IBu1R/sC07s=</parent>
   <key-kind>struct</key-kind>
@@ -378,6 +386,7 @@
   </source>
   <kind>record</kind>
   <id>dJDN8VcF38oFGTOC/XblQpYtzWU=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>flW1A8++hJYAIoinZHMJ/EargvI=</parent>
   <key-kind>struct</key-kind>
@@ -409,6 +418,7 @@
   </source>
   <kind>record</kind>
   <id>HzSR9lAhcaSZke6x6ggUIqnawQw=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>flW1A8++hJYAIoinZHMJ/EargvI=</parent>
   <key-kind>struct</key-kind>
@@ -454,6 +464,7 @@
   </source>
   <kind>record</kind>
   <id>UkRYUyzSKKaCbVo7DS8mUuPk5Qs=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>HzSR9lAhcaSZke6x6ggUIqnawQw=</parent>
   <key-kind>struct</key-kind>
@@ -519,6 +530,7 @@
   </source>
   <kind>record</kind>
   <id>aLeAk47i8rqZcwQtgQM7NQUE9Oo=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>K6BawvzqAtXZLU2Hm0qPq6aGiS8=</parent>
   <key-kind>struct</key-kind>
@@ -550,6 +562,7 @@
   </source>
   <kind>record</kind>
   <id>3isZeaf80hT1/O3yko6EPBPmq8s=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>K6BawvzqAtXZLU2Hm0qPq6aGiS8=</parent>
   <key-kind>struct</key-kind>
@@ -586,6 +599,7 @@
   </source>
   <kind>record</kind>
   <id>WeO5ITJRmNS4Q90O2A5hmw/KZc8=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>K6BawvzqAtXZLU2Hm0qPq6aGiS8=</parent>
   <key-kind>struct</key-kind>
@@ -631,6 +645,7 @@
   </source>
   <kind>record</kind>
   <id>W4yrcTF+RN1qGXUi97b5Tcm2v60=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>WeO5ITJRmNS4Q90O2A5hmw/KZc8=</parent>
   <key-kind>struct</key-kind>
@@ -701,6 +716,7 @@
   </source>
   <kind>record</kind>
   <id>XTiSWRMM5OD8mjz+RJ6oZpKYgCQ=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>Nkvb8FA0/0YIpaybicEkWLwFOPo=</parent>
   <key-kind>struct</key-kind>
@@ -732,6 +748,7 @@
   </source>
   <kind>record</kind>
   <id>vuv6bo9spUYsHZ3uwTm6i6UxSNI=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>Nkvb8FA0/0YIpaybicEkWLwFOPo=</parent>
   <key-kind>struct</key-kind>
@@ -768,6 +785,7 @@
   </source>
   <kind>record</kind>
   <id>HP4W/UatJ6BMg+LZKC5cQM4kCzw=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>Nkvb8FA0/0YIpaybicEkWLwFOPo=</parent>
   <key-kind>struct</key-kind>
@@ -812,6 +830,7 @@
   </source>
   <kind>record</kind>
   <id>qgS1WVyttKFsoadDE/OO4QyodlM=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>HP4W/UatJ6BMg+LZKC5cQM4kCzw=</parent>
   <key-kind>struct</key-kind>
diff --git a/test-files/golden-tests/symbols/record/class-template-specializations-3.xml b/test-files/golden-tests/symbols/record/class-template-specializations-3.xml
index 47ad39dfb3..42952dbfdd 100644
--- a/test-files/golden-tests/symbols/record/class-template-specializations-3.xml
+++ b/test-files/golden-tests/symbols/record/class-template-specializations-3.xml
@@ -61,6 +61,7 @@
   </source>
   <kind>record</kind>
   <id>dKDSVrZun8skBV/NUCmJyCUOvJA=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>5tUSuMtQqtYE49jBjSYSWp0DJAM=</parent>
   <key-kind>struct</key-kind>
@@ -95,6 +96,7 @@
   </source>
   <kind>record</kind>
   <id>bmgK1R0ByNI2o0uDX/xUzqUPaB0=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>dKDSVrZun8skBV/NUCmJyCUOvJA=</parent>
   <key-kind>struct</key-kind>
@@ -119,6 +121,7 @@
   </source>
   <kind>record</kind>
   <id>mavB0Yf/srdYpaA0qL6bxBdfPlk=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>dKDSVrZun8skBV/NUCmJyCUOvJA=</parent>
   <key-kind>struct</key-kind>
@@ -150,6 +153,7 @@
   </source>
   <kind>record</kind>
   <id>8gtdVs8Zc/2hE1ugmc5SJaowDrk=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>dKDSVrZun8skBV/NUCmJyCUOvJA=</parent>
   <key-kind>struct</key-kind>
@@ -186,6 +190,7 @@
   </source>
   <kind>record</kind>
   <id>Ax52oDYNHKdb/kayrTPXtP7EnLo=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>5tUSuMtQqtYE49jBjSYSWp0DJAM=</parent>
   <key-kind>struct</key-kind>
@@ -225,6 +230,7 @@
   </source>
   <kind>record</kind>
   <id>AwZsTwyQp9xqkJ5YDcGgbnNSg3Q=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>Ax52oDYNHKdb/kayrTPXtP7EnLo=</parent>
   <key-kind>struct</key-kind>
@@ -249,6 +255,7 @@
   </source>
   <kind>record</kind>
   <id>mlI5CyZeYMi0hLKKprnY2lkWYuI=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>Ax52oDYNHKdb/kayrTPXtP7EnLo=</parent>
   <key-kind>struct</key-kind>
@@ -280,6 +287,7 @@
   </source>
   <kind>record</kind>
   <id>2n2EC+ZzX4R61vVgqMqWD1h4Fqc=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>Ax52oDYNHKdb/kayrTPXtP7EnLo=</parent>
   <key-kind>struct</key-kind>
@@ -354,6 +362,7 @@
   </source>
   <kind>record</kind>
   <id>eAzY1gFXtaCsmFJ7gW8gRwXcMpI=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>GFV3P/JtfrnQwjOLVfI9VbJpd9U=</parent>
   <key-kind>struct</key-kind>
@@ -385,6 +394,7 @@
   </source>
   <kind>record</kind>
   <id>gNJJgsCrBHI+de6/WxRWfc6QUSQ=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>GFV3P/JtfrnQwjOLVfI9VbJpd9U=</parent>
   <key-kind>struct</key-kind>
@@ -424,6 +434,7 @@
   </source>
   <kind>record</kind>
   <id>B/thZ5I0G7tgrSCTq/QPdxvZ7mk=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>gNJJgsCrBHI+de6/WxRWfc6QUSQ=</parent>
   <key-kind>struct</key-kind>
@@ -448,6 +459,7 @@
   </source>
   <kind>record</kind>
   <id>rofuVJc3n2uMiYUFG+jEprNPhfk=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>gNJJgsCrBHI+de6/WxRWfc6QUSQ=</parent>
   <key-kind>struct</key-kind>
@@ -479,6 +491,7 @@
   </source>
   <kind>record</kind>
   <id>rzmzIDLemEwnRqvVCiQsLO9rHE4=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>gNJJgsCrBHI+de6/WxRWfc6QUSQ=</parent>
   <key-kind>struct</key-kind>
@@ -560,6 +573,7 @@
   </source>
   <kind>record</kind>
   <id>sJKQ/XsqBeYlnpwi1s54+RRv5NA=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>y/8TvVlacBAIG2ds2aYgZE+zGUU=</parent>
   <key-kind>struct</key-kind>
@@ -594,6 +608,7 @@
   </source>
   <kind>record</kind>
   <id>Dpv+NzmwhV+wRSY65GFxl+38zQM=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>sJKQ/XsqBeYlnpwi1s54+RRv5NA=</parent>
   <key-kind>struct</key-kind>
@@ -618,6 +633,7 @@
   </source>
   <kind>record</kind>
   <id>AzqBWCSJNi1p7gzPriIyLxFdnrY=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>sJKQ/XsqBeYlnpwi1s54+RRv5NA=</parent>
   <key-kind>struct</key-kind>
@@ -649,6 +665,7 @@
   </source>
   <kind>record</kind>
   <id>vu+upAyFdAr9NpomAT9maDrr5VU=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>sJKQ/XsqBeYlnpwi1s54+RRv5NA=</parent>
   <key-kind>struct</key-kind>
@@ -685,6 +702,7 @@
   </source>
   <kind>record</kind>
   <id>3fOXhba/en8Im2gUSThzllitRc0=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>y/8TvVlacBAIG2ds2aYgZE+zGUU=</parent>
   <key-kind>struct</key-kind>
@@ -724,6 +742,7 @@
   </source>
   <kind>record</kind>
   <id>y0bAB1lqim3CuNevLIQcyhSRoF0=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>3fOXhba/en8Im2gUSThzllitRc0=</parent>
   <key-kind>struct</key-kind>
@@ -748,6 +767,7 @@
   </source>
   <kind>record</kind>
   <id>yLNKrbXJxOfwo1+MCru26q+JH3c=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>3fOXhba/en8Im2gUSThzllitRc0=</parent>
   <key-kind>struct</key-kind>
@@ -779,6 +799,7 @@
   </source>
   <kind>record</kind>
   <id>P+rxL5vI4ct+gzn9YkO97Pt7Ras=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>3fOXhba/en8Im2gUSThzllitRc0=</parent>
   <key-kind>struct</key-kind>
@@ -815,6 +836,7 @@
   </source>
   <kind>record</kind>
   <id>jvnZWmA3eB78JX83nJawhD8NGhw=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>y/8TvVlacBAIG2ds2aYgZE+zGUU=</parent>
   <key-kind>struct</key-kind>
@@ -854,6 +876,7 @@
   </source>
   <kind>record</kind>
   <id>ctaWbbvndczuSnONWd9XeHYCB9w=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>jvnZWmA3eB78JX83nJawhD8NGhw=</parent>
   <key-kind>struct</key-kind>
@@ -878,6 +901,7 @@
   </source>
   <kind>record</kind>
   <id>hJww7bbg+EMQbb4Z6K/mcREdNrI=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>jvnZWmA3eB78JX83nJawhD8NGhw=</parent>
   <key-kind>struct</key-kind>
@@ -909,6 +933,7 @@
   </source>
   <kind>record</kind>
   <id>NNxnP63PrqW2AkyLFpJx0uaNuTk=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>jvnZWmA3eB78JX83nJawhD8NGhw=</parent>
   <key-kind>struct</key-kind>
@@ -984,6 +1009,7 @@
   </source>
   <kind>record</kind>
   <id>7YGPyrC+yNaV349G+Ofic+lrQQ0=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>C6fFmGgpPJ7jgwKJA98mfx5cxts=</parent>
   <key-kind>struct</key-kind>
@@ -1015,6 +1041,7 @@
   </source>
   <kind>record</kind>
   <id>fSC2izK+T4vA4Kndw3xNjCTDpoQ=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>C6fFmGgpPJ7jgwKJA98mfx5cxts=</parent>
   <key-kind>struct</key-kind>
@@ -1054,6 +1081,7 @@
   </source>
   <kind>record</kind>
   <id>7Z6H18MmJp6db1Qe2eaOiN597z0=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>fSC2izK+T4vA4Kndw3xNjCTDpoQ=</parent>
   <key-kind>struct</key-kind>
@@ -1078,6 +1106,7 @@
   </source>
   <kind>record</kind>
   <id>FbDKEGMJtBcKX13TWrKFGTDcIfc=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>fSC2izK+T4vA4Kndw3xNjCTDpoQ=</parent>
   <key-kind>struct</key-kind>
@@ -1109,6 +1138,7 @@
   </source>
   <kind>record</kind>
   <id>FQCRWOnd4VbpVowmyiWSRR2l2cA=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>fSC2izK+T4vA4Kndw3xNjCTDpoQ=</parent>
   <key-kind>struct</key-kind>
@@ -1145,6 +1175,7 @@
   </source>
   <kind>record</kind>
   <id>AmrHzqMyGcAD714oirSEx/XCTwk=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>C6fFmGgpPJ7jgwKJA98mfx5cxts=</parent>
   <key-kind>struct</key-kind>
@@ -1184,6 +1215,7 @@
   </source>
   <kind>record</kind>
   <id>uGKF2n5ovA4i95uQxRmzyMq2uqY=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>AmrHzqMyGcAD714oirSEx/XCTwk=</parent>
   <key-kind>struct</key-kind>
@@ -1208,6 +1240,7 @@
   </source>
   <kind>record</kind>
   <id>NXKMuGv+ES2JssXCxPAKpwv8kek=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>AmrHzqMyGcAD714oirSEx/XCTwk=</parent>
   <key-kind>struct</key-kind>
@@ -1239,6 +1272,7 @@
   </source>
   <kind>record</kind>
   <id>eYdoT3vlHlbkG+t3+ckhZAqrnlY=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>AmrHzqMyGcAD714oirSEx/XCTwk=</parent>
   <key-kind>struct</key-kind>
@@ -1314,6 +1348,7 @@
   </source>
   <kind>record</kind>
   <id>OqH2nTulqZzSwHPpqaqq/8Aw1rA=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>eeh34/7lF7rCmE7zXKBrUC7mz3A=</parent>
   <key-kind>struct</key-kind>
@@ -1345,6 +1380,7 @@
   </source>
   <kind>record</kind>
   <id>Pna+OT/o27zekcoRTFxKtb5m+BQ=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>eeh34/7lF7rCmE7zXKBrUC7mz3A=</parent>
   <key-kind>struct</key-kind>
@@ -1384,6 +1420,7 @@
   </source>
   <kind>record</kind>
   <id>Gv8ovSPi4vbvyLsPbAfOvhMp5+o=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>Pna+OT/o27zekcoRTFxKtb5m+BQ=</parent>
   <key-kind>struct</key-kind>
@@ -1408,6 +1445,7 @@
   </source>
   <kind>record</kind>
   <id>Hx+JG1wcGiKbsf3sdpq4N3s6yPg=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>Pna+OT/o27zekcoRTFxKtb5m+BQ=</parent>
   <key-kind>struct</key-kind>
@@ -1439,6 +1477,7 @@
   </source>
   <kind>record</kind>
   <id>9bJvdwRZpk2+HRV+Az3lOybs1Wc=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>Pna+OT/o27zekcoRTFxKtb5m+BQ=</parent>
   <key-kind>struct</key-kind>
@@ -1475,6 +1514,7 @@
   </source>
   <kind>record</kind>
   <id>X9RyjucPb3aRFUq3aZCNE4g/ZVE=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>eeh34/7lF7rCmE7zXKBrUC7mz3A=</parent>
   <key-kind>struct</key-kind>
@@ -1514,6 +1554,7 @@
   </source>
   <kind>record</kind>
   <id>eXPfVkdfVF382Q5KqAEfOcjpVmo=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>X9RyjucPb3aRFUq3aZCNE4g/ZVE=</parent>
   <key-kind>struct</key-kind>
@@ -1538,6 +1579,7 @@
   </source>
   <kind>record</kind>
   <id>7BP9bS6v3+IVgLRg4/sPKlbVgwc=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>X9RyjucPb3aRFUq3aZCNE4g/ZVE=</parent>
   <key-kind>struct</key-kind>
@@ -1569,6 +1611,7 @@
   </source>
   <kind>record</kind>
   <id>E3rBDckOC8QkP+2YLNtbMxg69mc=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>X9RyjucPb3aRFUq3aZCNE4g/ZVE=</parent>
   <key-kind>struct</key-kind>
@@ -1644,6 +1687,7 @@
   </source>
   <kind>variable</kind>
   <id>oHfKrPnHC+B6Hx/yJYk5Fyxe+CI=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>KJWEqOD/QXinlGIqVHqmIlA5Z6E=</parent>
   <named>
@@ -1672,6 +1716,7 @@
   </source>
   <kind>variable</kind>
   <id>EvoFLEsY/zIQw+ATCcszcUXQX1U=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>KJWEqOD/QXinlGIqVHqmIlA5Z6E=</parent>
   <named>
@@ -1700,6 +1745,7 @@
   </source>
   <kind>variable</kind>
   <id>M37GfnOSLu7LdwyWNUKiLSwQU8E=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>KJWEqOD/QXinlGIqVHqmIlA5Z6E=</parent>
   <named>
@@ -1733,6 +1779,7 @@
   </source>
   <kind>variable</kind>
   <id>zs4yFWypzJvC9fBTuqRIWShHXDI=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>KJWEqOD/QXinlGIqVHqmIlA5Z6E=</parent>
   <named>
@@ -1766,6 +1813,7 @@
   </source>
   <kind>variable</kind>
   <id>npnYjIFI4UqRV4lM1m0vGdOXafw=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>KJWEqOD/QXinlGIqVHqmIlA5Z6E=</parent>
   <named>
@@ -1799,6 +1847,7 @@
   </source>
   <kind>variable</kind>
   <id>m3ZkUTvg5FF0YzKrQCCIMDL4Gjk=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>KJWEqOD/QXinlGIqVHqmIlA5Z6E=</parent>
   <named>
@@ -1832,6 +1881,7 @@
   </source>
   <kind>variable</kind>
   <id>lvoZQmyEhLRRqpEiNgzPQH1SOJ0=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>KJWEqOD/QXinlGIqVHqmIlA5Z6E=</parent>
   <named>
@@ -1865,6 +1915,7 @@
   </source>
   <kind>variable</kind>
   <id>QerDxfhCX/VklfvPy6KMWR5/grA=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>KJWEqOD/QXinlGIqVHqmIlA5Z6E=</parent>
   <named>
@@ -1893,6 +1944,7 @@
   </source>
   <kind>variable</kind>
   <id>jkZFwdFnuuwOAnc9RU1Pi4xsuZQ=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>KJWEqOD/QXinlGIqVHqmIlA5Z6E=</parent>
   <named>
@@ -1921,6 +1973,7 @@
   </source>
   <kind>variable</kind>
   <id>Jz1/8DLujy3S44Nw3O0+j7/ib/E=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>KJWEqOD/QXinlGIqVHqmIlA5Z6E=</parent>
   <named>
@@ -1949,6 +2002,7 @@
   </source>
   <kind>variable</kind>
   <id>caJb3xi3hSrcOYpFTjaGGYy2Lwo=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>KJWEqOD/QXinlGIqVHqmIlA5Z6E=</parent>
   <named>
@@ -1982,6 +2036,7 @@
   </source>
   <kind>variable</kind>
   <id>I9XmCN/8GnrjYZlx8qXp383uWq0=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>KJWEqOD/QXinlGIqVHqmIlA5Z6E=</parent>
   <named>
@@ -2015,6 +2070,7 @@
   </source>
   <kind>variable</kind>
   <id>1q9S+RfN6FdeN1hVj4px4bBGHps=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>KJWEqOD/QXinlGIqVHqmIlA5Z6E=</parent>
   <named>
@@ -2048,6 +2104,7 @@
   </source>
   <kind>variable</kind>
   <id>lV8Cih1vnhktZoDmSG/54XfsVMY=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>KJWEqOD/QXinlGIqVHqmIlA5Z6E=</parent>
   <named>
@@ -2081,6 +2138,7 @@
   </source>
   <kind>variable</kind>
   <id>HXroC5e+xF7qrqN/j/TCTfZsqRM=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>KJWEqOD/QXinlGIqVHqmIlA5Z6E=</parent>
   <named>
diff --git a/test-files/golden-tests/symbols/record/class-template.xml b/test-files/golden-tests/symbols/record/class-template.xml
index 8b3acc250d..fca4c2dcf5 100644
--- a/test-files/golden-tests/symbols/record/class-template.xml
+++ b/test-files/golden-tests/symbols/record/class-template.xml
@@ -62,6 +62,7 @@
   </source>
   <kind>record</kind>
   <id>gx6LdMT9nBMQKB26lZXGWbB7N6c=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>sv7ww7qclY8KsvAbFHXaKZnSO80=</parent>
   <key-kind>struct</key-kind>
@@ -87,6 +88,7 @@
   </source>
   <kind>variable</kind>
   <id>sdv932bFyf1dJzPblqxQGqsy8G4=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>gx6LdMT9nBMQKB26lZXGWbB7N6c=</parent>
   <named>
@@ -109,6 +111,7 @@
   </source>
   <kind>variable</kind>
   <id>ySFHEWJe6/b1dbtjDC2IAvT2vmU=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>sv7ww7qclY8KsvAbFHXaKZnSO80=</parent>
   <named>
@@ -131,6 +134,7 @@
   </source>
   <kind>variable</kind>
   <id>81imwKxfuTfd7lfVGnF+fKx46lY=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>sv7ww7qclY8KsvAbFHXaKZnSO80=</parent>
   <named>
@@ -154,6 +158,7 @@
   </source>
   <kind>variable</kind>
   <id>UKBRhwzQ0PeL6ZwfxmreRBoDQSY=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>sv7ww7qclY8KsvAbFHXaKZnSO80=</parent>
   <named>
@@ -202,6 +207,7 @@
   </source>
   <kind>record</kind>
   <id>F1Cyqn/faLYbjTU4RfGsepUiiZw=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>tm2khHa6qZM0lj1f7IwBdxVxDgE=</parent>
   <key-kind>struct</key-kind>
@@ -236,6 +242,7 @@
   </source>
   <kind>variable</kind>
   <id>bQCgblScrSKOxQMVJxT7vFw9W4I=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>F1Cyqn/faLYbjTU4RfGsepUiiZw=</parent>
   <named>
@@ -259,6 +266,7 @@
   </source>
   <kind>variable</kind>
   <id>phg6+zMhjV0SJ7vav871OGqoPPQ=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>F1Cyqn/faLYbjTU4RfGsepUiiZw=</parent>
   <named>
@@ -281,6 +289,7 @@
   </source>
   <kind>variable</kind>
   <id>53ijFg2EUlLuOP8qvufgjwZDNoI=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>F1Cyqn/faLYbjTU4RfGsepUiiZw=</parent>
   <named>
@@ -303,6 +312,7 @@
   </source>
   <kind>variable</kind>
   <id>Q0itZUB0O9hts+pFPk9DO415Lo8=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>tm2khHa6qZM0lj1f7IwBdxVxDgE=</parent>
   <named>
@@ -358,6 +368,7 @@
   </source>
   <kind>record</kind>
   <id>xljI5oOqNOhyyR4QzmKvFB3nEfw=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>IIPz8Fm6nqKoYQpeJ/kvZaWvtI8=</parent>
   <key-kind>struct</key-kind>
@@ -393,6 +404,7 @@
   </source>
   <kind>variable</kind>
   <id>bLX5mthqXMHAtLNEc87RKLQSUyU=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>xljI5oOqNOhyyR4QzmKvFB3nEfw=</parent>
   <named>
@@ -416,6 +428,7 @@
   </source>
   <kind>variable</kind>
   <id>qSNOAAxaet7aBxvD7WvFqJOpm3A=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>xljI5oOqNOhyyR4QzmKvFB3nEfw=</parent>
   <named>
@@ -438,6 +451,7 @@
   </source>
   <kind>variable</kind>
   <id>P9x8qHxDv7huDL0MyNORJ/enU0Q=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>xljI5oOqNOhyyR4QzmKvFB3nEfw=</parent>
   <named>
@@ -460,6 +474,7 @@
   </source>
   <kind>variable</kind>
   <id>pRO2j7I5aEQI+ktDwT1fLJPqy28=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>xljI5oOqNOhyyR4QzmKvFB3nEfw=</parent>
   <named>
@@ -482,6 +497,7 @@
   </source>
   <kind>variable</kind>
   <id>rvAO5HvzEvS8z9PgbRoqkyTi+1c=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>IIPz8Fm6nqKoYQpeJ/kvZaWvtI8=</parent>
   <named>
@@ -542,6 +558,7 @@
   </source>
   <kind>variable</kind>
   <id>28J+g16kE2M7qwnrP4yzW4hHlIg=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>x60FzYL65XgZZRrxrZuC5jemrwQ=</parent>
   <named>
diff --git a/test-files/golden-tests/symbols/record/conditional-explicit.xml b/test-files/golden-tests/symbols/record/conditional-explicit.xml
index a74cffd24a..a7615cb61e 100644
--- a/test-files/golden-tests/symbols/record/conditional-explicit.xml
+++ b/test-files/golden-tests/symbols/record/conditional-explicit.xml
@@ -81,6 +81,7 @@
   </source>
   <kind>overloads</kind>
   <id>90LmpTUv2mRF4c7fOK5KY82aqfg=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>5tUSuMtQqtYE49jBjSYSWp0DJAM=</parent>
   <doc-comment>
@@ -117,6 +118,7 @@
   </source>
   <kind>function</kind>
   <id>tu1aWR2dJXMP1qCjx0wfqGbHUrU=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>5tUSuMtQqtYE49jBjSYSWp0DJAM=</parent>
   <doc-comment>
@@ -167,6 +169,7 @@
   </source>
   <kind>function</kind>
   <id>AXLv33SreHARdqogAHAgfhC3lFA=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>5tUSuMtQqtYE49jBjSYSWp0DJAM=</parent>
   <doc-comment>
@@ -217,6 +220,7 @@
   </source>
   <kind>function</kind>
   <id>F4U5PyaDoe8VKg41ubwK8aze9QE=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>5tUSuMtQqtYE49jBjSYSWp0DJAM=</parent>
   <doc-comment>
@@ -267,6 +271,7 @@
   </source>
   <kind>function</kind>
   <id>Lh5IpjK5DH9VZV67YWZB6MBX3eg=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>5tUSuMtQqtYE49jBjSYSWp0DJAM=</parent>
   <doc-comment>
@@ -324,6 +329,7 @@
   </source>
   <kind>function</kind>
   <id>8QQvac4UAEj232hkdEvLmrs4iXo=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>5tUSuMtQqtYE49jBjSYSWp0DJAM=</parent>
   <doc-comment>
@@ -379,6 +385,7 @@
   </source>
   <kind>function</kind>
   <id>BQIWwUrUqUCA8gEZNkinmhykZiw=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>5tUSuMtQqtYE49jBjSYSWp0DJAM=</parent>
   <doc-comment>
@@ -427,6 +434,7 @@
   </source>
   <kind>function</kind>
   <id>RoN1eWo04RrcRuREabBhJcBRP9g=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>5tUSuMtQqtYE49jBjSYSWp0DJAM=</parent>
   <doc-comment>
@@ -475,6 +483,7 @@
   </source>
   <kind>function</kind>
   <id>G/Kyu+7RZ7YjYMEcMH57nQNmUeQ=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>5tUSuMtQqtYE49jBjSYSWp0DJAM=</parent>
   <doc-comment>
diff --git a/test-files/golden-tests/symbols/record/dtor-overloads.xml b/test-files/golden-tests/symbols/record/dtor-overloads.xml
index 017f166557..f3bd6d570c 100644
--- a/test-files/golden-tests/symbols/record/dtor-overloads.xml
+++ b/test-files/golden-tests/symbols/record/dtor-overloads.xml
@@ -61,6 +61,7 @@
   </source>
   <kind>overloads</kind>
   <id>LEZJddSqCEXJZ++1t8aAiluL0/E=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>5tUSuMtQqtYE49jBjSYSWp0DJAM=</parent>
   <doc-comment>
@@ -94,6 +95,7 @@
   </source>
   <kind>function</kind>
   <id>x5T8zVxBVmg1ModTwgEAXcXWKDg=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>5tUSuMtQqtYE49jBjSYSWp0DJAM=</parent>
   <doc-comment>
@@ -127,6 +129,7 @@
   </source>
   <kind>function</kind>
   <id>uiH+ZSS+bYC5efGHgbdzlzXaV/o=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>5tUSuMtQqtYE49jBjSYSWp0DJAM=</parent>
   <doc-comment>
diff --git a/test-files/golden-tests/symbols/record/final-class.xml b/test-files/golden-tests/symbols/record/final-class.xml
index 69144317ca..98a4da953d 100644
--- a/test-files/golden-tests/symbols/record/final-class.xml
+++ b/test-files/golden-tests/symbols/record/final-class.xml
@@ -96,6 +96,7 @@
         <identifier>B1</identifier>
       </name>
     </named>
+    <access>public</access>
   </base>
   <base>
     <named>
@@ -105,6 +106,7 @@
         <identifier>B2</identifier>
       </name>
     </named>
+    <access>public</access>
   </base>
   <record-interface>
     <record-tranche>
diff --git a/test-files/golden-tests/symbols/record/forward-declared-member.xml b/test-files/golden-tests/symbols/record/forward-declared-member.xml
index b70089cdbd..b86b2b85cb 100644
--- a/test-files/golden-tests/symbols/record/forward-declared-member.xml
+++ b/test-files/golden-tests/symbols/record/forward-declared-member.xml
@@ -58,6 +58,7 @@
         </name>
       </name>
     </named>
+    <access>public</access>
   </base>
   <record-interface>
     <record-tranche>
diff --git a/test-files/golden-tests/symbols/record/friend-duplicate.xml b/test-files/golden-tests/symbols/record/friend-duplicate.xml
index a2a47369ad..3e2c7b4ceb 100644
--- a/test-files/golden-tests/symbols/record/friend-duplicate.xml
+++ b/test-files/golden-tests/symbols/record/friend-duplicate.xml
@@ -92,6 +92,7 @@
   </source>
   <kind>function</kind>
   <id>s6nsa+zVhpzzrN+yUVPP5rvdXqs=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>//////////////////////////8=</parent>
   <named>
diff --git a/test-files/golden-tests/symbols/record/friend-fn-has-docs.xml b/test-files/golden-tests/symbols/record/friend-fn-has-docs.xml
index fa41dd7257..44213552f5 100644
--- a/test-files/golden-tests/symbols/record/friend-fn-has-docs.xml
+++ b/test-files/golden-tests/symbols/record/friend-fn-has-docs.xml
@@ -58,6 +58,7 @@
   </source>
   <kind>function</kind>
   <id>s6nsa+zVhpzzrN+yUVPP5rvdXqs=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>//////////////////////////8=</parent>
   <doc-comment>
diff --git a/test-files/golden-tests/symbols/record/friend-fn-member.xml b/test-files/golden-tests/symbols/record/friend-fn-member.xml
index ebca7dcb04..f323847d47 100644
--- a/test-files/golden-tests/symbols/record/friend-fn-member.xml
+++ b/test-files/golden-tests/symbols/record/friend-fn-member.xml
@@ -84,6 +84,7 @@
   </source>
   <kind>function</kind>
   <id>6Jx2eK9l4C46QIRucTvox+6PH2k=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>ynx5NXMLXqzSXwgOnIP6CHzNx14=</parent>
   <doc-comment>
@@ -116,6 +117,7 @@
   </source>
   <kind>function</kind>
   <id>HK6hbp0kJrHWxbYoHddN1v/GCWc=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>ynx5NXMLXqzSXwgOnIP6CHzNx14=</parent>
   <doc-comment>
@@ -149,6 +151,7 @@
   </source>
   <kind>function</kind>
   <id>wZtQh+QR5vgNZmk34MnRmnKO5MI=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>ynx5NXMLXqzSXwgOnIP6CHzNx14=</parent>
   <doc-comment>
diff --git a/test-files/golden-tests/symbols/record/friend-fn-multi-2nd.xml b/test-files/golden-tests/symbols/record/friend-fn-multi-2nd.xml
index 6f9027c3b8..9c3c16d535 100644
--- a/test-files/golden-tests/symbols/record/friend-fn-multi-2nd.xml
+++ b/test-files/golden-tests/symbols/record/friend-fn-multi-2nd.xml
@@ -85,6 +85,7 @@
   </source>
   <kind>function</kind>
   <id>s6nsa+zVhpzzrN+yUVPP5rvdXqs=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>//////////////////////////8=</parent>
   <doc-comment>
diff --git a/test-files/golden-tests/symbols/record/friend-fn-multi-free.xml b/test-files/golden-tests/symbols/record/friend-fn-multi-free.xml
index 0e02686f9e..0109b13ef3 100644
--- a/test-files/golden-tests/symbols/record/friend-fn-multi-free.xml
+++ b/test-files/golden-tests/symbols/record/friend-fn-multi-free.xml
@@ -86,6 +86,7 @@
   </source>
   <kind>function</kind>
   <id>s6nsa+zVhpzzrN+yUVPP5rvdXqs=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>//////////////////////////8=</parent>
   <doc-comment>
diff --git a/test-files/golden-tests/symbols/record/friend-fn-multi.xml b/test-files/golden-tests/symbols/record/friend-fn-multi.xml
index f7176b33cc..f431e440e0 100644
--- a/test-files/golden-tests/symbols/record/friend-fn-multi.xml
+++ b/test-files/golden-tests/symbols/record/friend-fn-multi.xml
@@ -86,6 +86,7 @@
   </source>
   <kind>function</kind>
   <id>s6nsa+zVhpzzrN+yUVPP5rvdXqs=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>//////////////////////////8=</parent>
   <doc-comment>
diff --git a/test-files/golden-tests/symbols/record/friend-fn.xml b/test-files/golden-tests/symbols/record/friend-fn.xml
index c60d6273c2..8867e060eb 100644
--- a/test-files/golden-tests/symbols/record/friend-fn.xml
+++ b/test-files/golden-tests/symbols/record/friend-fn.xml
@@ -52,6 +52,7 @@
   </source>
   <kind>function</kind>
   <id>s6nsa+zVhpzzrN+yUVPP5rvdXqs=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>//////////////////////////8=</parent>
   <doc-comment>
diff --git a/test-files/golden-tests/symbols/record/local-class.xml b/test-files/golden-tests/symbols/record/local-class.xml
index 3028a464df..bd606cd3fc 100644
--- a/test-files/golden-tests/symbols/record/local-class.xml
+++ b/test-files/golden-tests/symbols/record/local-class.xml
@@ -50,6 +50,7 @@
   </source>
   <kind>function</kind>
   <id>jCCBBuUPAMKbCDHSsikdFgCuMPQ=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>iyPnRqvK5CeWtYJ+M257FJexgOs=</parent>
   <named>
@@ -80,6 +81,7 @@
     <decltype>
       <operand>f()</operand>
     </decltype>
+    <access>public</access>
   </base>
   <record-interface>
     <record-tranche>
diff --git a/test-files/golden-tests/symbols/record/record-1.xml b/test-files/golden-tests/symbols/record/record-1.xml
index a9d9a7a337..a1ee84b505 100644
--- a/test-files/golden-tests/symbols/record/record-1.xml
+++ b/test-files/golden-tests/symbols/record/record-1.xml
@@ -55,6 +55,7 @@
   </source>
   <kind>typedef</kind>
   <id>6UtddyCJy89K/bZpTmDb5jVXwAY=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>CgGNdHpW5mG/i5741WPYQDw28OQ=</parent>
   <named>
@@ -77,6 +78,7 @@
   </source>
   <kind>typedef</kind>
   <id>wwp4SQjMPktMmsnvq1thxjxFHFs=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>CgGNdHpW5mG/i5741WPYQDw28OQ=</parent>
   <named>
@@ -98,6 +100,7 @@
   </source>
   <kind>function</kind>
   <id>9sznTZ3/SXQNZpCsoMG8KWGLuEc=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>CgGNdHpW5mG/i5741WPYQDw28OQ=</parent>
   <named>
@@ -121,6 +124,7 @@
   </source>
   <kind>function</kind>
   <id>w0ONazxXaWlB0RQLjfDqDWICUwo=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>CgGNdHpW5mG/i5741WPYQDw28OQ=</parent>
   <named>
@@ -144,6 +148,7 @@
   </source>
   <kind>function</kind>
   <id>TkBjWwqMDycyUbq+TJZ9qfUhSn0=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>CgGNdHpW5mG/i5741WPYQDw28OQ=</parent>
   <named>
@@ -168,6 +173,7 @@
   </source>
   <kind>function</kind>
   <id>/xzUDYrXtCl2xCoyCvXqIZ4fKfA=</id>
+  <access>protected</access>
   <extraction>regular</extraction>
   <parent>CgGNdHpW5mG/i5741WPYQDw28OQ=</parent>
   <doc-comment>
@@ -208,6 +214,7 @@
   </source>
   <kind>function</kind>
   <id>flHl59B/bdRwuiNeh3sHqCycic0=</id>
+  <access>protected</access>
   <extraction>regular</extraction>
   <parent>CgGNdHpW5mG/i5741WPYQDw28OQ=</parent>
   <doc-comment>
@@ -248,6 +255,7 @@
   </source>
   <kind>function</kind>
   <id>DKxv4h+rP37b0u6O1qbB+u416ZY=</id>
+  <access>protected</access>
   <extraction>regular</extraction>
   <parent>CgGNdHpW5mG/i5741WPYQDw28OQ=</parent>
   <doc-comment>
diff --git a/test-files/golden-tests/symbols/record/record-access.xml b/test-files/golden-tests/symbols/record/record-access.xml
index 2e45a06910..15cd6b39ff 100644
--- a/test-files/golden-tests/symbols/record/record-access.xml
+++ b/test-files/golden-tests/symbols/record/record-access.xml
@@ -52,6 +52,7 @@
   </source>
   <kind>function</kind>
   <id>ZOAAp99eH9zKUZqx0JzW6AuhRTQ=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>sTaqkoFcVbtntbfpe777v5/pWL0=</parent>
   <named>
@@ -75,6 +76,7 @@
   </source>
   <kind>function</kind>
   <id>EyRDT2mXtRNmcISD2rsC6/mLusw=</id>
+  <access>protected</access>
   <extraction>regular</extraction>
   <parent>sTaqkoFcVbtntbfpe777v5/pWL0=</parent>
   <named>
@@ -98,6 +100,7 @@
   </source>
   <kind>function</kind>
   <id>IdInRLjINkaIuyTqWyEUhoM1DZM=</id>
+  <access>private</access>
   <extraction>regular</extraction>
   <parent>sTaqkoFcVbtntbfpe777v5/pWL0=</parent>
   <named>
@@ -148,6 +151,7 @@
   </source>
   <kind>function</kind>
   <id>STTnU4grbgOl2xPE6okWC57zruc=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>u38+snleg17KL7EQuD9FV1Z8b9E=</parent>
   <named>
@@ -171,6 +175,7 @@
   </source>
   <kind>function</kind>
   <id>IaPeEIwn9q94M3MuwxsB3qhBOSE=</id>
+  <access>protected</access>
   <extraction>regular</extraction>
   <parent>u38+snleg17KL7EQuD9FV1Z8b9E=</parent>
   <named>
@@ -194,6 +199,7 @@
   </source>
   <kind>function</kind>
   <id>QicvGhxlL09TrpXiFYAS+pz8/9g=</id>
+  <access>private</access>
   <extraction>regular</extraction>
   <parent>u38+snleg17KL7EQuD9FV1Z8b9E=</parent>
   <named>
@@ -244,6 +250,7 @@
   </source>
   <kind>function</kind>
   <id>eY4R9etszWK2H42p4kWNm5XfpnE=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>SHIJWZPzfYtLVfe/rzFAmeVpANk=</parent>
   <named>
@@ -267,6 +274,7 @@
   </source>
   <kind>function</kind>
   <id>KjiG7Uufpmd65dhiSV+Jv2RjgHA=</id>
+  <access>protected</access>
   <extraction>regular</extraction>
   <parent>SHIJWZPzfYtLVfe/rzFAmeVpANk=</parent>
   <named>
@@ -290,6 +298,7 @@
   </source>
   <kind>function</kind>
   <id>KXASSTkImsSKBg6l0hOSkbt1K7M=</id>
+  <access>private</access>
   <extraction>regular</extraction>
   <parent>SHIJWZPzfYtLVfe/rzFAmeVpANk=</parent>
   <named>
diff --git a/test-files/golden-tests/symbols/record/record-data.xml b/test-files/golden-tests/symbols/record/record-data.xml
index 03e09f178e..f2c3b0c776 100644
--- a/test-files/golden-tests/symbols/record/record-data.xml
+++ b/test-files/golden-tests/symbols/record/record-data.xml
@@ -56,6 +56,7 @@
   </source>
   <kind>variable</kind>
   <id>91xV6rCFObgi6i1/U2uZ/GnD3WM=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>CgGNdHpW5mG/i5741WPYQDw28OQ=</parent>
   <named>
@@ -78,6 +79,7 @@
   </source>
   <kind>variable</kind>
   <id>g7xcHrg43mq7PlaOEmNvMHlU+Hk=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>CgGNdHpW5mG/i5741WPYQDw28OQ=</parent>
   <named>
@@ -100,6 +102,7 @@
   </source>
   <kind>variable</kind>
   <id>DDn/yzxAAKSmBASeK+/IuU+FvzM=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>CgGNdHpW5mG/i5741WPYQDw28OQ=</parent>
   <named>
@@ -123,6 +126,7 @@
   </source>
   <kind>variable</kind>
   <id>wmuk99bazNMSdS8W8oD/7vIsIhQ=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>CgGNdHpW5mG/i5741WPYQDw28OQ=</parent>
   <named>
@@ -147,6 +151,7 @@
   </source>
   <kind>variable</kind>
   <id>8Olj7aMWgTqR7bHtl+C3EZ5wILI=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>CgGNdHpW5mG/i5741WPYQDw28OQ=</parent>
   <named>
@@ -196,6 +201,7 @@
   </source>
   <kind>variable</kind>
   <id>LvEIBVXJYQQL4yraOaQv7ijMDng=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>FLgkhM3m0U3Lo2o3XLPUizWPH00=</parent>
   <named>
@@ -246,6 +252,7 @@
   </source>
   <kind>variable</kind>
   <id>VKvx+Pci4bUmtjCsXJqKb7SNYqw=</id>
+  <access>protected</access>
   <extraction>regular</extraction>
   <parent>9kzYwt0WPztMEDUaFxul1Jvqqs8=</parent>
   <named>
@@ -268,6 +275,7 @@
   </source>
   <kind>variable</kind>
   <id>EWXCzRl9erjnMQFZ8VmHC5cVkLM=</id>
+  <access>private</access>
   <extraction>regular</extraction>
   <parent>9kzYwt0WPztMEDUaFxul1Jvqqs8=</parent>
   <named>
@@ -290,6 +298,7 @@
   </source>
   <kind>variable</kind>
   <id>iKr1oLycejUWY6AnSgoQnbmaCEE=</id>
+  <access>private</access>
   <extraction>regular</extraction>
   <parent>9kzYwt0WPztMEDUaFxul1Jvqqs8=</parent>
   <named>
@@ -337,6 +346,7 @@
   </source>
   <kind>variable</kind>
   <id>2akJUSKKPN7IylZjqGMRlhXupds=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>6OhcFM3BV6KlrvmfpsljaMHxpdA=</parent>
   <array>
@@ -408,6 +418,7 @@
   </source>
   <kind>typedef</kind>
   <id>nkW23Ykh9wywIjUzLqEQlHf8R5k=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>XSI9u4gB6ZYb6pWxN29K8+iKza4=</parent>
   <named>
@@ -430,6 +441,7 @@
   </source>
   <kind>variable</kind>
   <id>WMA7IrW+2LvVbOV8OxRgz1lZtgs=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>XSI9u4gB6ZYb6pWxN29K8+iKza4=</parent>
   <named>
@@ -453,6 +465,7 @@
   </source>
   <kind>variable</kind>
   <id>9mHoUUHldwcRXKA3lf94KNCXALA=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>XSI9u4gB6ZYb6pWxN29K8+iKza4=</parent>
   <named>
@@ -475,6 +488,7 @@
   </source>
   <kind>variable</kind>
   <id>BBtkYfP6w9XgHxk01Va2e1WZHo0=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>XSI9u4gB6ZYb6pWxN29K8+iKza4=</parent>
   <array>
@@ -500,6 +514,7 @@
   </source>
   <kind>variable</kind>
   <id>nnQtR7SV1kLSZgMv0quXSh0M8/A=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>XSI9u4gB6ZYb6pWxN29K8+iKza4=</parent>
   <named>
@@ -523,6 +538,7 @@
   </source>
   <kind>variable</kind>
   <id>iixsM8X5M740uqb1jSRUfUuvNo0=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>XSI9u4gB6ZYb6pWxN29K8+iKza4=</parent>
   <named>
diff --git a/test-files/golden-tests/symbols/record/record-inheritance.xml b/test-files/golden-tests/symbols/record/record-inheritance.xml
index 84175e1582..1bea4301b1 100644
--- a/test-files/golden-tests/symbols/record/record-inheritance.xml
+++ b/test-files/golden-tests/symbols/record/record-inheritance.xml
@@ -74,6 +74,7 @@
         <identifier>C0</identifier>
       </name>
     </named>
+    <access>private</access>
   </base>
   <record-interface>
     <record-tranche>
@@ -107,6 +108,7 @@
         <identifier>C0</identifier>
       </name>
     </named>
+    <access>public</access>
   </base>
   <record-interface>
     <record-tranche>
@@ -140,6 +142,7 @@
         <identifier>C0</identifier>
       </name>
     </named>
+    <access>protected</access>
   </base>
   <record-interface>
     <record-tranche>
@@ -173,6 +176,7 @@
         <identifier>C0</identifier>
       </name>
     </named>
+    <access>private</access>
   </base>
   <record-interface>
     <record-tranche>
@@ -206,6 +210,7 @@
         <identifier>C0</identifier>
       </name>
     </named>
+    <access>private</access>
     <is-virtual>1</is-virtual>
   </base>
   <derived>RoJyFLcF4tn+I7Xvlv0H+vBkIE4=</derived>
@@ -241,6 +246,7 @@
         <identifier>C1</identifier>
       </name>
     </named>
+    <access>private</access>
     <is-virtual>1</is-virtual>
   </base>
   <derived>RoJyFLcF4tn+I7Xvlv0H+vBkIE4=</derived>
@@ -276,6 +282,7 @@
         <identifier>C5</identifier>
       </name>
     </named>
+    <access>public</access>
   </base>
   <base>
     <named>
@@ -285,6 +292,7 @@
         <identifier>C6</identifier>
       </name>
     </named>
+    <access>public</access>
   </base>
   <record-interface>
     <record-tranche>
@@ -374,6 +382,7 @@
         <identifier>S0</identifier>
       </name>
     </named>
+    <access>public</access>
   </base>
   <derived>OkKbIK8En3Y5FbOBQVeHnAsZ0aY=</derived>
   <record-interface>
@@ -408,6 +417,7 @@
         <identifier>S1</identifier>
       </name>
     </named>
+    <access>public</access>
   </base>
   <derived>OkKbIK8En3Y5FbOBQVeHnAsZ0aY=</derived>
   <record-interface>
@@ -442,6 +452,7 @@
         <identifier>S2</identifier>
       </name>
     </named>
+    <access>public</access>
   </base>
   <base>
     <named>
@@ -451,6 +462,7 @@
         <identifier>S3</identifier>
       </name>
     </named>
+    <access>public</access>
   </base>
   <record-interface>
     <record-tranche>
@@ -484,6 +496,7 @@
         <identifier>S0</identifier>
       </name>
     </named>
+    <access>private</access>
   </base>
   <base>
     <named>
@@ -493,6 +506,7 @@
         <identifier>S1</identifier>
       </name>
     </named>
+    <access>protected</access>
   </base>
   <record-interface>
     <record-tranche>
@@ -534,6 +548,7 @@
         <identifier>Ts</identifier>
       </name>
     </named>
+    <access>public</access>
   </base>
   <record-interface>
     <record-tranche>
diff --git a/test-files/golden-tests/symbols/record/template-specialization-inheritance.xml b/test-files/golden-tests/symbols/record/template-specialization-inheritance.xml
index b30ebd31a6..ac2b03badc 100644
--- a/test-files/golden-tests/symbols/record/template-specialization-inheritance.xml
+++ b/test-files/golden-tests/symbols/record/template-specialization-inheritance.xml
@@ -119,6 +119,7 @@
         <identifier>S0</identifier>
       </name>
     </named>
+    <access>public</access>
   </base>
   <record-interface>
     <record-tranche>
@@ -142,6 +143,7 @@
   </source>
   <kind>record</kind>
   <id>2CQyWIWOAM25oQ1AdJcdT6hFqAE=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>z/QEAP16LEoD3NlABxA6BOFpYpA=</parent>
   <key-kind>struct</key-kind>
@@ -182,6 +184,7 @@
         </name>
       </name>
     </named>
+    <access>public</access>
   </base>
   <record-interface>
     <record-tranche>
@@ -215,6 +218,7 @@
         <identifier>S0</identifier>
       </name>
     </named>
+    <access>public</access>
   </base>
   <record-interface>
     <record-tranche>
@@ -289,6 +293,7 @@
   </source>
   <kind>record</kind>
   <id>2CQyWIWOAM25oQ1AdJcdT6hFqAE=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>z/QEAP16LEoD3NlABxA6BOFpYpA=</parent>
   <key-kind>struct</key-kind>
@@ -345,6 +350,7 @@
   </source>
   <kind>record</kind>
   <id>yY+X2/Fqu8ENz37/HFEJCBOSfVg=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>nJGs54s6oYf7fHzIpo0tyaCSH9M=</parent>
   <key-kind>struct</key-kind>
@@ -434,6 +440,7 @@
   </source>
   <kind>record</kind>
   <id>fzQKX2ygXfWjrcDi23o2CnGMkaY=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>6Syw3aWFS3pfPUbWU7C8uCE7Jjc=</parent>
   <key-kind>struct</key-kind>
diff --git a/test-files/golden-tests/symbols/record/union.xml b/test-files/golden-tests/symbols/record/union.xml
index db9e446050..7095e0aba0 100644
--- a/test-files/golden-tests/symbols/record/union.xml
+++ b/test-files/golden-tests/symbols/record/union.xml
@@ -50,6 +50,7 @@
   </source>
   <kind>variable</kind>
   <id>Be23kXXQRAQHfKNTp2HOM2jouJo=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>rOga+mYntM7ytFb7bhJSklZ0r34=</parent>
   <named>
@@ -73,6 +74,7 @@
   </source>
   <kind>variable</kind>
   <id>HqUCV+CnE+akUirdwlf8maZxw40=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>rOga+mYntM7ytFb7bhJSklZ0r34=</parent>
   <named>
@@ -123,6 +125,7 @@
   </source>
   <kind>variable</kind>
   <id>QtOrWpj/+5ytPBCEoNlbW+uW/oA=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>3JsK1DO0O+wZhv+0meptQrbs3fY=</parent>
   <named>
@@ -146,6 +149,7 @@
   </source>
   <kind>variable</kind>
   <id>8o+2/UVx4hIiDLQRYohp688sXmI=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>3JsK1DO0O+wZhv+0meptQrbs3fY=</parent>
   <named>
@@ -169,6 +173,7 @@
   </source>
   <kind>variable</kind>
   <id>zTVqdWL2ShJziu85kaeOk2wfYFs=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>3JsK1DO0O+wZhv+0meptQrbs3fY=</parent>
   <named>
diff --git a/test-files/golden-tests/symbols/record/unnamed.xml b/test-files/golden-tests/symbols/record/unnamed.xml
index 3add224bc7..cb6953d5fb 100644
--- a/test-files/golden-tests/symbols/record/unnamed.xml
+++ b/test-files/golden-tests/symbols/record/unnamed.xml
@@ -51,6 +51,7 @@
   </source>
   <kind>function</kind>
   <id>yiR+Q9T0kIzuR5+cO8MjyUGxhD4=</id>
+  <access>public</access>
   <extraction>implementation-defined</extraction>
   <parent>F1Jq7+g4G9C/ONGL1uiGY4NNso4=</parent>
   <named>
@@ -110,6 +111,7 @@
   </source>
   <kind>variable</kind>
   <id>4Sy+GbRmqI4igByqQo0hAnRUahY=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>8AwuUPjsLEReggyF5UohZMvrh8k=</parent>
   <doc-comment>
@@ -182,6 +184,7 @@
       <id>8AwuUPjsLEReggyF5UohZMvrh8k=</id>
     </name>
   </named>
+  <storage-class>extern</storage-class>
 </variable>
 <variable>
   <name>y</name>
@@ -213,5 +216,6 @@
       <id>8AwuUPjsLEReggyF5UohZMvrh8k=</id>
     </name>
   </named>
+  <storage-class>extern</storage-class>
 </variable>
 </mrdocs>
diff --git a/test-files/golden-tests/symbols/typedef/alias-template.xml b/test-files/golden-tests/symbols/typedef/alias-template.xml
index 43c137c9d8..4acbb2a3fd 100644
--- a/test-files/golden-tests/symbols/typedef/alias-template.xml
+++ b/test-files/golden-tests/symbols/typedef/alias-template.xml
@@ -155,6 +155,7 @@
   </source>
   <kind>typedef</kind>
   <id>STM3CgeaOEakPrQJdlRWWM4MMFo=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>i5oK/nki0o3BH2ZAgkGyaGib07g=</parent>
   <named>
diff --git a/test-files/golden-tests/symbols/typedef/decay-to-primary.xml b/test-files/golden-tests/symbols/typedef/decay-to-primary.xml
index ecf53d917c..eb356eebfe 100644
--- a/test-files/golden-tests/symbols/typedef/decay-to-primary.xml
+++ b/test-files/golden-tests/symbols/typedef/decay-to-primary.xml
@@ -116,6 +116,7 @@
   </source>
   <kind>typedef</kind>
   <id>aBQMz/OqX2QEHy4Cqfjgby4lSi4=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>P9+etXi0Ae+VNs1u8rYrHIbi6qE=</parent>
   <named>
@@ -138,6 +139,7 @@
   </source>
   <kind>typedef</kind>
   <id>14SKPuw/wwAUmFZKoonB8Uu8gaY=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>P9+etXi0Ae+VNs1u8rYrHIbi6qE=</parent>
   <named>
@@ -206,6 +208,7 @@
   </source>
   <kind>typedef</kind>
   <id>rd0VksPlzUP2z9uBlAh7QCSvXlc=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>nM49pHyBLj9V6pphxxYAxi4tXXc=</parent>
   <named>
@@ -228,6 +231,7 @@
   </source>
   <kind>typedef</kind>
   <id>55w2+SxFbPDR4zxtZen23YT6oyY=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>nM49pHyBLj9V6pphxxYAxi4tXXc=</parent>
   <named>
@@ -296,6 +300,7 @@
   </source>
   <kind>typedef</kind>
   <id>xwZQjxyx34OE1PjRX/paK2bdWb0=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>BWgkCsMw6w/Tkzj0tkQJ8/AWTUo=</parent>
   <named>
@@ -318,6 +323,7 @@
   </source>
   <kind>typedef</kind>
   <id>59lOx3WiBtHW8lORAEbx2R0bEwM=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>BWgkCsMw6w/Tkzj0tkQJ8/AWTUo=</parent>
   <named>
diff --git a/test-files/golden-tests/symbols/typedef/dependency-propagation.xml b/test-files/golden-tests/symbols/typedef/dependency-propagation.xml
index 0f77ffc660..c5e5f3361b 100644
--- a/test-files/golden-tests/symbols/typedef/dependency-propagation.xml
+++ b/test-files/golden-tests/symbols/typedef/dependency-propagation.xml
@@ -177,6 +177,7 @@
         </name>
       </name>
     </named>
+    <access>public</access>
   </base>
   <record-interface>
     <record-tranche>
diff --git a/test-files/golden-tests/symbols/typedef/implicit-instantiation-member-ref.xml b/test-files/golden-tests/symbols/typedef/implicit-instantiation-member-ref.xml
index 748be35ed8..e27132d2e1 100644
--- a/test-files/golden-tests/symbols/typedef/implicit-instantiation-member-ref.xml
+++ b/test-files/golden-tests/symbols/typedef/implicit-instantiation-member-ref.xml
@@ -124,6 +124,7 @@
   </source>
   <kind>record</kind>
   <id>gxI8lOzHEX5mX3u/0hCHnvUY1OM=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>P9+etXi0Ae+VNs1u8rYrHIbi6qE=</parent>
   <key-kind>struct</key-kind>
@@ -157,6 +158,7 @@
   </source>
   <kind>typedef</kind>
   <id>NnkA706kKqg/azveB/lExZwRfFI=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>gxI8lOzHEX5mX3u/0hCHnvUY1OM=</parent>
   <named>
@@ -179,6 +181,7 @@
   </source>
   <kind>typedef</kind>
   <id>TBl15ml95lYP4APzAuH1VpGgjgs=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>gxI8lOzHEX5mX3u/0hCHnvUY1OM=</parent>
   <named>
@@ -247,6 +250,7 @@
   </source>
   <kind>record</kind>
   <id>3bDJlUJg+Wg63OKbCChN7xs/THg=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>BWgkCsMw6w/Tkzj0tkQJ8/AWTUo=</parent>
   <key-kind>struct</key-kind>
@@ -278,6 +282,7 @@
   </source>
   <kind>record</kind>
   <id>LQDMND21bNwDyy/hE3qQoQzFLXY=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>BWgkCsMw6w/Tkzj0tkQJ8/AWTUo=</parent>
   <key-kind>struct</key-kind>
@@ -316,6 +321,7 @@
   </source>
   <kind>typedef</kind>
   <id>KI+cz9NSHQSZN2PnUoAaBtILqNQ=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>LQDMND21bNwDyy/hE3qQoQzFLXY=</parent>
   <named>
@@ -338,6 +344,7 @@
   </source>
   <kind>typedef</kind>
   <id>xu84aTnEsoVB4EugJR5m2weQzUE=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>LQDMND21bNwDyy/hE3qQoQzFLXY=</parent>
   <named>
diff --git a/test-files/golden-tests/symbols/using/using-alias-template-dependent.xml b/test-files/golden-tests/symbols/using/using-alias-template-dependent.xml
index f66d9f2772..a0d907682b 100644
--- a/test-files/golden-tests/symbols/using/using-alias-template-dependent.xml
+++ b/test-files/golden-tests/symbols/using/using-alias-template-dependent.xml
@@ -143,6 +143,7 @@
   </source>
   <kind>typedef</kind>
   <id>SrZbYkahcv/tBYSnQf6ndFySgTg=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>MBGPS/84tvNdD37cvMMFLX91CIs=</parent>
   <named>
@@ -241,6 +242,7 @@
   </source>
   <kind>enum</kind>
   <id>ojy2H3a1lmqWgs1IHVc6fgGwKO0=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>qA3Nv3MdXjhVzIuwWZK2uT6FskY=</parent>
   <constants>5+HaEEsX//OaezDumbrpRhUuOp0=</constants>
@@ -257,6 +259,7 @@
   </source>
   <kind>enum-constant</kind>
   <id>5+HaEEsX//OaezDumbrpRhUuOp0=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>ojy2H3a1lmqWgs1IHVc6fgGwKO0=</parent>
   <initializer>false</initializer>
diff --git a/test-files/golden-tests/symbols/using/using-function-after.adoc b/test-files/golden-tests/symbols/using/using-function-after.adoc
index 06386e1a4e..7db2bc760d 100644
--- a/test-files/golden-tests/symbols/using/using-function-after.adoc
+++ b/test-files/golden-tests/symbols/using/using-function-after.adoc
@@ -29,11 +29,11 @@
 [cols="1,4"]
 |===
 | Name| Description
-| link:#A-f-08[`f`] 
+| link:#A-f-03[`f`] 
 | `f` overloads
 |===
 
-[#A-f-08]
+[#A-f-03]
 == link:#A[A]::f
 
 `f` overloads
diff --git a/test-files/golden-tests/symbols/using/using-function-after.html b/test-files/golden-tests/symbols/using/using-function-after.html
index a338be183e..f96178a10a 100644
--- a/test-files/golden-tests/symbols/using/using-function-after.html
+++ b/test-files/golden-tests/symbols/using/using-function-after.html
@@ -55,14 +55,14 @@ <h2>
 </thead>
 <tbody>
 <tr>
-<td><a href="#A-f-08"><code>f</code></a> </td><td><code>f</code> overloads</td></tr>
+<td><a href="#A-f-03"><code>f</code></a> </td><td><code>f</code> overloads</td></tr>
 </tbody>
 </table>
 
 </div>
 <div>
 <div>
-<h2 id="A-f-08">
+<h2 id="A-f-03">
 A::f</h2>
 <div>
 <p><code>f</code> overloads</p>
diff --git a/test-files/golden-tests/symbols/using/using-function-after.xml b/test-files/golden-tests/symbols/using/using-function-after.xml
index a2324318bd..82a5b864a5 100644
--- a/test-files/golden-tests/symbols/using/using-function-after.xml
+++ b/test-files/golden-tests/symbols/using/using-function-after.xml
@@ -33,7 +33,7 @@
   <extraction>regular</extraction>
   <parent>//////////////////////////8=</parent>
   <namespace-tranche>
-    <functions>gAFZ/q+ghQPrWK8SOl+US+U0jTU=</functions>
+    <functions>MWV4pZAIXJFn1I+74ARAr+ZOmkw=</functions>
   </namespace-tranche>
 </namespace>
 <overloads>
@@ -55,7 +55,7 @@
     </location>
   </source>
   <kind>overloads</kind>
-  <id>gAFZ/q+ghQPrWK8SOl+US+U0jTU=</id>
+  <id>MWV4pZAIXJFn1I+74ARAr+ZOmkw=</id>
   <extraction>regular</extraction>
   <parent>jQQu/8mLNzRQvGtbkKMwwloVDpw=</parent>
   <doc-comment>
diff --git a/test-files/golden-tests/symbols/using/using-function-local-overloads.adoc b/test-files/golden-tests/symbols/using/using-function-local-overloads.adoc
index 68550d3580..08eff82553 100644
--- a/test-files/golden-tests/symbols/using/using-function-local-overloads.adoc
+++ b/test-files/golden-tests/symbols/using/using-function-local-overloads.adoc
@@ -37,11 +37,11 @@
 [cols="1,4"]
 |===
 | Name| Description
-| link:#A-f-08[`f`] 
+| link:#A-f-031[`f`] 
 | `f` overloads
 |===
 
-[#A-f-08]
+[#A-f-031]
 == link:#A[A]::f
 
 `f` overloads
@@ -165,7 +165,7 @@ using A::f;
 |===
 |Name|Description
 
-| link:#A-f-08[A::f]
+| link:#A-f-031[A::f]
 | `f` overloads
 |===
 
diff --git a/test-files/golden-tests/symbols/using/using-function-local-overloads.html b/test-files/golden-tests/symbols/using/using-function-local-overloads.html
index 6d76da1b80..154e92743d 100644
--- a/test-files/golden-tests/symbols/using/using-function-local-overloads.html
+++ b/test-files/golden-tests/symbols/using/using-function-local-overloads.html
@@ -69,14 +69,14 @@ <h2>
 </thead>
 <tbody>
 <tr>
-<td><a href="#A-f-08"><code>f</code></a> </td><td><code>f</code> overloads</td></tr>
+<td><a href="#A-f-031"><code>f</code></a> </td><td><code>f</code> overloads</td></tr>
 </tbody>
 </table>
 
 </div>
 <div>
 <div>
-<h2 id="A-f-08">
+<h2 id="A-f-031">
 A::f</h2>
 <div>
 <p><code>f</code> overloads</p>
@@ -200,7 +200,7 @@ <h3>
 </thead>
 <tbody>
 <tr>
-<td><a href="#A-f-08">A::f</a></td>
+<td><a href="#A-f-031">A::f</a></td>
 <td><code>f</code> overloads</td>
 </tr>
 </tbody>
diff --git a/test-files/golden-tests/symbols/using/using-function-local-overloads.xml b/test-files/golden-tests/symbols/using/using-function-local-overloads.xml
index 4e8bc5a5b3..d777482e0c 100644
--- a/test-files/golden-tests/symbols/using/using-function-local-overloads.xml
+++ b/test-files/golden-tests/symbols/using/using-function-local-overloads.xml
@@ -28,7 +28,7 @@
   <extraction>regular</extraction>
   <parent>//////////////////////////8=</parent>
   <namespace-tranche>
-    <functions>gAFZ/q+ghQPrWK8SOl+US+U0jTU=</functions>
+    <functions>MWV4pZAIXJFn1I+74ARAr+ZOmkw=</functions>
   </namespace-tranche>
 </namespace>
 <overloads>
@@ -57,7 +57,7 @@
     </location>
   </source>
   <kind>overloads</kind>
-  <id>gAFZ/q+ghQPrWK8SOl+US+U0jTU=</id>
+  <id>MWV4pZAIXJFn1I+74ARAr+ZOmkw=</id>
   <extraction>regular</extraction>
   <parent>jQQu/8mLNzRQvGtbkKMwwloVDpw=</parent>
   <doc-comment>
@@ -271,7 +271,7 @@
       <identifier>A</identifier>
     </name>
   </name>
-  <shadow-declarations>gAFZ/q+ghQPrWK8SOl+US+U0jTU=</shadow-declarations>
+  <shadow-declarations>MWV4pZAIXJFn1I+74ARAr+ZOmkw=</shadow-declarations>
 </using>
 <overloads>
   <name>f</name>
@@ -299,7 +299,7 @@
     </location>
   </source>
   <kind>overloads</kind>
-  <id>gAFZ/q+ghQPrWK8SOl+US+U0jTU=</id>
+  <id>MWV4pZAIXJFn1I+74ARAr+ZOmkw=</id>
   <extraction>regular</extraction>
   <parent>jQQu/8mLNzRQvGtbkKMwwloVDpw=</parent>
   <doc-comment>
diff --git a/test-files/golden-tests/symbols/using/using-function-overloads.adoc b/test-files/golden-tests/symbols/using/using-function-overloads.adoc
index 4eb48f957c..b13911075b 100644
--- a/test-files/golden-tests/symbols/using/using-function-overloads.adoc
+++ b/test-files/golden-tests/symbols/using/using-function-overloads.adoc
@@ -29,11 +29,11 @@
 [cols="1,4"]
 |===
 | Name| Description
-| link:#A-f-08[`f`] 
+| link:#A-f-031[`f`] 
 | `f` overloads
 |===
 
-[#A-f-08]
+[#A-f-031]
 == link:#A[A]::f
 
 `f` overloads
@@ -144,7 +144,7 @@ using A::f;
 |===
 |Name|Description
 
-| link:#A-f-08[A::f]
+| link:#A-f-031[A::f]
 | `f` overloads
 |===
 
diff --git a/test-files/golden-tests/symbols/using/using-function-overloads.html b/test-files/golden-tests/symbols/using/using-function-overloads.html
index 8e6fc74a46..a2d5416c82 100644
--- a/test-files/golden-tests/symbols/using/using-function-overloads.html
+++ b/test-files/golden-tests/symbols/using/using-function-overloads.html
@@ -55,14 +55,14 @@ <h2>
 </thead>
 <tbody>
 <tr>
-<td><a href="#A-f-08"><code>f</code></a> </td><td><code>f</code> overloads</td></tr>
+<td><a href="#A-f-031"><code>f</code></a> </td><td><code>f</code> overloads</td></tr>
 </tbody>
 </table>
 
 </div>
 <div>
 <div>
-<h2 id="A-f-08">
+<h2 id="A-f-031">
 A::f</h2>
 <div>
 <p><code>f</code> overloads</p>
@@ -172,7 +172,7 @@ <h3>
 </thead>
 <tbody>
 <tr>
-<td><a href="#A-f-08">A::f</a></td>
+<td><a href="#A-f-031">A::f</a></td>
 <td><code>f</code> overloads</td>
 </tr>
 </tbody>
diff --git a/test-files/golden-tests/symbols/using/using-function-overloads.xml b/test-files/golden-tests/symbols/using/using-function-overloads.xml
index 8f18ed647e..05ab70a2b3 100644
--- a/test-files/golden-tests/symbols/using/using-function-overloads.xml
+++ b/test-files/golden-tests/symbols/using/using-function-overloads.xml
@@ -27,7 +27,7 @@
   <extraction>regular</extraction>
   <parent>//////////////////////////8=</parent>
   <namespace-tranche>
-    <functions>gAFZ/q+ghQPrWK8SOl+US+U0jTU=</functions>
+    <functions>MWV4pZAIXJFn1I+74ARAr+ZOmkw=</functions>
   </namespace-tranche>
 </namespace>
 <overloads>
@@ -56,7 +56,7 @@
     </location>
   </source>
   <kind>overloads</kind>
-  <id>gAFZ/q+ghQPrWK8SOl+US+U0jTU=</id>
+  <id>MWV4pZAIXJFn1I+74ARAr+ZOmkw=</id>
   <extraction>regular</extraction>
   <parent>jQQu/8mLNzRQvGtbkKMwwloVDpw=</parent>
   <doc-comment>
@@ -240,7 +240,7 @@
       <identifier>A</identifier>
     </name>
   </name>
-  <shadow-declarations>gAFZ/q+ghQPrWK8SOl+US+U0jTU=</shadow-declarations>
+  <shadow-declarations>MWV4pZAIXJFn1I+74ARAr+ZOmkw=</shadow-declarations>
 </using>
 <overloads>
   <name>f</name>
@@ -268,7 +268,7 @@
     </location>
   </source>
   <kind>overloads</kind>
-  <id>gAFZ/q+ghQPrWK8SOl+US+U0jTU=</id>
+  <id>MWV4pZAIXJFn1I+74ARAr+ZOmkw=</id>
   <extraction>regular</extraction>
   <parent>jQQu/8mLNzRQvGtbkKMwwloVDpw=</parent>
   <doc-comment>
diff --git a/test-files/golden-tests/symbols/using/using-member-conversion.xml b/test-files/golden-tests/symbols/using/using-member-conversion.xml
index 397cd8e640..591cc697da 100644
--- a/test-files/golden-tests/symbols/using/using-member-conversion.xml
+++ b/test-files/golden-tests/symbols/using/using-member-conversion.xml
@@ -98,6 +98,7 @@
   </source>
   <kind>function</kind>
   <id>Yyyb35deIA+gpVYakhwVjtGJBkQ=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>ynx5NXMLXqzSXwgOnIP6CHzNx14=</parent>
   <doc-comment>
@@ -160,6 +161,7 @@
         <identifier>X</identifier>
       </name>
     </named>
+    <access>public</access>
   </base>
   <record-interface>
     <record-tranche>
@@ -185,6 +187,7 @@
   </source>
   <kind>function</kind>
   <id>Yyyb35deIA+gpVYakhwVjtGJBkQ=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>ynx5NXMLXqzSXwgOnIP6CHzNx14=</parent>
   <doc-comment>
@@ -227,6 +230,7 @@
   </source>
   <kind>using</kind>
   <id>EFiZJ7JGhYhYwHH32s8HA+C+gns=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>yi1fc3tRK4IAsSp9WUPwfU6MSc8=</parent>
   <doc-comment>
@@ -263,6 +267,7 @@
   </source>
   <kind>function</kind>
   <id>Yyyb35deIA+gpVYakhwVjtGJBkQ=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>ynx5NXMLXqzSXwgOnIP6CHzNx14=</parent>
   <doc-comment>
diff --git a/test-files/golden-tests/symbols/using/using-member-function.xml b/test-files/golden-tests/symbols/using/using-member-function.xml
index 2aad594114..3f8e5f5b27 100644
--- a/test-files/golden-tests/symbols/using/using-member-function.xml
+++ b/test-files/golden-tests/symbols/using/using-member-function.xml
@@ -68,6 +68,7 @@
   </source>
   <kind>function</kind>
   <id>nGMtjL9NQBvDG5i6/RUEWr+GrRg=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>YrPSaKAbmXgzCAX5WByx4eVoqBM=</parent>
   <doc-comment>
@@ -154,6 +155,7 @@
   </source>
   <kind>function</kind>
   <id>xY3rr0vMQ99dtCUUyDbfqsakgww=</id>
+  <access>protected</access>
   <extraction>regular</extraction>
   <parent>3JsK1DO0O+wZhv+0meptQrbs3fY=</parent>
   <doc-comment>
@@ -232,6 +234,7 @@
   </source>
   <kind>function</kind>
   <id>PvNGaaAeF9VeSz8kIOeaPmy37BQ=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>BrX2oZup9qgy4SfJloKCuUYZshA=</parent>
   <doc-comment>
@@ -310,6 +313,7 @@
   </source>
   <kind>function</kind>
   <id>mEbr7lEslKhZ3jpVBYzcTiHp/oA=</id>
+  <access>protected</access>
   <extraction>regular</extraction>
   <parent>CSFzdUEgi4+pu0K2D3isHXeaoFQ=</parent>
   <doc-comment>
@@ -388,6 +392,7 @@
   </source>
   <kind>function</kind>
   <id>CEIniuKR4So6PAYFUcT6B+Nx+H8=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>KJWEqOD/QXinlGIqVHqmIlA5Z6E=</parent>
   <doc-comment>
@@ -466,6 +471,7 @@
   </source>
   <kind>function</kind>
   <id>5FJgzIcro5VIoeXTsaIxTaVD91s=</id>
+  <access>protected</access>
   <extraction>regular</extraction>
   <parent>47VHAvq/9ANwJboZT8J8RwBjMLU=</parent>
   <doc-comment>
@@ -581,6 +587,7 @@
         <identifier>A</identifier>
       </name>
     </named>
+    <access>public</access>
   </base>
   <base>
     <named>
@@ -590,6 +597,7 @@
         <identifier>B</identifier>
       </name>
     </named>
+    <access>public</access>
   </base>
   <base>
     <named>
@@ -599,6 +607,7 @@
         <identifier>C</identifier>
       </name>
     </named>
+    <access>protected</access>
   </base>
   <base>
     <named>
@@ -608,6 +617,7 @@
         <identifier>D</identifier>
       </name>
     </named>
+    <access>protected</access>
   </base>
   <record-interface>
     <record-tranche>
@@ -645,6 +655,7 @@
   </source>
   <kind>function</kind>
   <id>nGMtjL9NQBvDG5i6/RUEWr+GrRg=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>YrPSaKAbmXgzCAX5WByx4eVoqBM=</parent>
   <doc-comment>
@@ -694,6 +705,7 @@
   </source>
   <kind>using</kind>
   <id>rmQLRfXW6vtP8GPIdyNNwtpI+fw=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>FLgkhM3m0U3Lo2o3XLPUizWPH00=</parent>
   <doc-comment>
@@ -729,6 +741,7 @@
   </source>
   <kind>using</kind>
   <id>G3OvpIVH5hy5WK887jqrPTyl37g=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>FLgkhM3m0U3Lo2o3XLPUizWPH00=</parent>
   <doc-comment>
@@ -764,6 +777,7 @@
   </source>
   <kind>using</kind>
   <id>HTq6bF0wwPrK9aYY2w2AP0w7n4M=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>FLgkhM3m0U3Lo2o3XLPUizWPH00=</parent>
   <doc-comment>
@@ -799,6 +813,7 @@
   </source>
   <kind>using</kind>
   <id>zZluhP9Ym1VXLys/h+I2mnz4A6E=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>FLgkhM3m0U3Lo2o3XLPUizWPH00=</parent>
   <doc-comment>
@@ -834,6 +849,7 @@
   </source>
   <kind>using</kind>
   <id>T+dE7rV3VUFcNGkSQ5sS+TE3ovE=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>FLgkhM3m0U3Lo2o3XLPUizWPH00=</parent>
   <doc-comment>
@@ -869,6 +885,7 @@
   </source>
   <kind>using</kind>
   <id>YoyYEMZ0BckFWg9oBMs6hEGFY1o=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>FLgkhM3m0U3Lo2o3XLPUizWPH00=</parent>
   <doc-comment>
@@ -904,6 +921,7 @@
   </source>
   <kind>using</kind>
   <id>DND4SGqk7GU/0r60b5NpJlihpCI=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>FLgkhM3m0U3Lo2o3XLPUizWPH00=</parent>
   <doc-comment>
@@ -940,6 +958,7 @@
   </source>
   <kind>function</kind>
   <id>nGMtjL9NQBvDG5i6/RUEWr+GrRg=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>YrPSaKAbmXgzCAX5WByx4eVoqBM=</parent>
   <doc-comment>
@@ -989,6 +1008,7 @@
   </source>
   <kind>using</kind>
   <id>vu1xdQQ6LH5sjZHsW8XwytWstO8=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>FLgkhM3m0U3Lo2o3XLPUizWPH00=</parent>
   <doc-comment>
@@ -1025,6 +1045,7 @@
   </source>
   <kind>function</kind>
   <id>xY3rr0vMQ99dtCUUyDbfqsakgww=</id>
+  <access>protected</access>
   <extraction>regular</extraction>
   <parent>3JsK1DO0O+wZhv+0meptQrbs3fY=</parent>
   <doc-comment>
@@ -1067,6 +1088,7 @@
   </source>
   <kind>using</kind>
   <id>91+ZMOvfXn2lxSqWzq2TgM9xueo=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>FLgkhM3m0U3Lo2o3XLPUizWPH00=</parent>
   <doc-comment>
@@ -1103,6 +1125,7 @@
   </source>
   <kind>function</kind>
   <id>PvNGaaAeF9VeSz8kIOeaPmy37BQ=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>BrX2oZup9qgy4SfJloKCuUYZshA=</parent>
   <doc-comment>
@@ -1145,6 +1168,7 @@
   </source>
   <kind>using</kind>
   <id>CQN3Y3phH+3gaj82D6tq5au3JMQ=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>FLgkhM3m0U3Lo2o3XLPUizWPH00=</parent>
   <doc-comment>
@@ -1181,6 +1205,7 @@
   </source>
   <kind>function</kind>
   <id>mEbr7lEslKhZ3jpVBYzcTiHp/oA=</id>
+  <access>protected</access>
   <extraction>regular</extraction>
   <parent>CSFzdUEgi4+pu0K2D3isHXeaoFQ=</parent>
   <doc-comment>
@@ -1223,6 +1248,7 @@
   </source>
   <kind>using</kind>
   <id>vYTRrgx7/KOCWsM9RR5gIdgaRsw=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>FLgkhM3m0U3Lo2o3XLPUizWPH00=</parent>
   <doc-comment>
@@ -1259,6 +1285,7 @@
   </source>
   <kind>function</kind>
   <id>CEIniuKR4So6PAYFUcT6B+Nx+H8=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>KJWEqOD/QXinlGIqVHqmIlA5Z6E=</parent>
   <doc-comment>
@@ -1301,6 +1328,7 @@
   </source>
   <kind>using</kind>
   <id>IrXefx1M56k6Iagrba7mfDBpg80=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>FLgkhM3m0U3Lo2o3XLPUizWPH00=</parent>
   <doc-comment>
@@ -1337,6 +1365,7 @@
   </source>
   <kind>function</kind>
   <id>5FJgzIcro5VIoeXTsaIxTaVD91s=</id>
+  <access>protected</access>
   <extraction>regular</extraction>
   <parent>47VHAvq/9ANwJboZT8J8RwBjMLU=</parent>
   <doc-comment>
@@ -1393,6 +1422,7 @@
   </source>
   <kind>overloads</kind>
   <id>fRZCjYpQKv6bmUv7+MW+i+lpbAc=</id>
+  <access>protected</access>
   <extraction>regular</extraction>
   <parent>FLgkhM3m0U3Lo2o3XLPUizWPH00=</parent>
   <doc-comment>
@@ -1435,6 +1465,7 @@
   </source>
   <kind>function</kind>
   <id>xY3rr0vMQ99dtCUUyDbfqsakgww=</id>
+  <access>protected</access>
   <extraction>regular</extraction>
   <parent>3JsK1DO0O+wZhv+0meptQrbs3fY=</parent>
   <doc-comment>
@@ -1477,6 +1508,7 @@
   </source>
   <kind>function</kind>
   <id>PvNGaaAeF9VeSz8kIOeaPmy37BQ=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>BrX2oZup9qgy4SfJloKCuUYZshA=</parent>
   <doc-comment>
@@ -1519,6 +1551,7 @@
   </source>
   <kind>function</kind>
   <id>mEbr7lEslKhZ3jpVBYzcTiHp/oA=</id>
+  <access>protected</access>
   <extraction>regular</extraction>
   <parent>CSFzdUEgi4+pu0K2D3isHXeaoFQ=</parent>
   <doc-comment>
diff --git a/test-files/golden-tests/symbols/using/using-typename.xml b/test-files/golden-tests/symbols/using/using-typename.xml
index 3b34a688dc..5598010103 100644
--- a/test-files/golden-tests/symbols/using/using-typename.xml
+++ b/test-files/golden-tests/symbols/using/using-typename.xml
@@ -56,6 +56,7 @@
   </source>
   <kind>typedef</kind>
   <id>GJwWDf/H5L0HhOr2GLrume6MtVg=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>pOlR4JvM07kjg0dk5WSjWZiChpc=</parent>
   <named>
diff --git a/test-files/golden-tests/symbols/variable/function-objects.adoc b/test-files/golden-tests/symbols/variable/function-objects.adoc
index 29585b7855..2224a06420 100644
--- a/test-files/golden-tests/symbols/variable/function-objects.adoc
+++ b/test-files/golden-tests/symbols/variable/function-objects.adoc
@@ -75,7 +75,7 @@
 | Overload from type&hyphen;marked function object&period;
 | link:#example-mixed[`mixed`] 
 | The call operator&period;
-| link:#example-multi_overload-06[`multi&lowbar;overload`] 
+| link:#example-multi_overload-0c[`multi&lowbar;overload`] 
 | `multi&lowbar;overload` overloads
 | link:#example-nested_record_fo[`nested&lowbar;record&lowbar;fo`] 
 | Nested&hyphen;record overload&period;
@@ -809,7 +809,7 @@ The result&period;
 | The input&period;
 |===
 
-[#example-multi_overload-06]
+[#example-multi_overload-0c]
 == link:#example[example]::multi&lowbar;overload
 
 `multi&lowbar;overload` overloads
diff --git a/test-files/golden-tests/symbols/variable/function-objects.html b/test-files/golden-tests/symbols/variable/function-objects.html
index e195699f6f..41ddc687ab 100644
--- a/test-files/golden-tests/symbols/variable/function-objects.html
+++ b/test-files/golden-tests/symbols/variable/function-objects.html
@@ -89,7 +89,7 @@ <h2>
 <td><a href="#example-explicit_fo"><code>explicit_fo</code></a> </td><td>Explicit overload.</td></tr><tr>
 <td><a href="#example-marked_on_type"><code>marked_on_type</code></a> </td><td>Overload from type-marked function object.</td></tr><tr>
 <td><a href="#example-mixed"><code>mixed</code></a> </td><td>The call operator.</td></tr><tr>
-<td><a href="#example-multi_overload-06"><code>multi_overload</code></a> </td><td><code>multi_overload</code> overloads</td></tr><tr>
+<td><a href="#example-multi_overload-0c"><code>multi_overload</code></a> </td><td><code>multi_overload</code> overloads</td></tr><tr>
 <td><a href="#example-nested_record_fo"><code>nested_record_fo</code></a> </td><td>Nested-record overload.</td></tr><tr>
 <td><a href="#example-ordinary_function"><code>ordinary_function</code></a> </td><td>An ordinary function for comparison.</td></tr><tr>
 <td><a href="#example-single_overload"><code>single_overload</code></a> </td><td>The single overload.</td></tr><tr>
@@ -999,7 +999,7 @@ <h3>
 </div>
 <div>
 <div>
-<h2 id="example-multi_overload-06">
+<h2 id="example-multi_overload-0c">
 example::multi_overload</h2>
 <div>
 <p><code>multi_overload</code> overloads</p>
diff --git a/test-files/golden-tests/symbols/variable/function-objects.xml b/test-files/golden-tests/symbols/variable/function-objects.xml
index a7bacedfb2..7c137e63aa 100644
--- a/test-files/golden-tests/symbols/variable/function-objects.xml
+++ b/test-files/golden-tests/symbols/variable/function-objects.xml
@@ -64,7 +64,7 @@
     <functions>jheJbElDtz8sRPC5LnSDQq8lZxk=</functions>
     <functions>Q7TeXaooeWBCT9SU99nyB5CtK+s=</functions>
     <functions>U4zTCtzSQV8IWSGvNJ9yVS05DrI=</functions>
-    <functions>aH5Pl0fbmu90J23OrryO2sgW4nQ=</functions>
+    <functions>xR65goSvHe3iHYZOSCxa3obFJxU=</functions>
     <functions>CKAGfUg3xu9aj/61O8lvzoUtJ1Y=</functions>
     <functions>oZ3I+KHvN54JGuKNFFjwQbrpV/s=</functions>
     <functions>gqHyzWPULraMQqYE5Z7KRclfhlU=</functions>
@@ -160,6 +160,7 @@
   </source>
   <kind>function</kind>
   <id>ncXmIInH4q8y85ElLYqPtp4Sh7k=</id>
+  <access>public</access>
   <extraction>implementation-defined</extraction>
   <parent>2LfkQhwiuDwFsKFjyyY80x+aQlo=</parent>
   <doc-comment>
@@ -261,6 +262,7 @@
   </source>
   <kind>function</kind>
   <id>z4MsJNxheGTP8zz11tDKbex/Zmg=</id>
+  <access>public</access>
   <extraction>implementation-defined</extraction>
   <parent>dz4ofw8qgvj3+fcNASP+amk1UNM=</parent>
   <doc-comment>
@@ -336,6 +338,7 @@
   </source>
   <kind>function</kind>
   <id>b/HysfrapANFiwuzDbaP4vFpQ60=</id>
+  <access>public</access>
   <extraction>implementation-defined</extraction>
   <parent>V3WwbBFpxCbUh0q1EW7VPy75Jz0=</parent>
   <doc-comment>
@@ -421,6 +424,7 @@
   </source>
   <kind>overloads</kind>
   <id>NUvxcQ9Cgz6qTi0dPJwX33aEujc=</id>
+  <access>public</access>
   <extraction>implementation-defined</extraction>
   <parent>mZtv21AdBSGdGVNkTV5gNP0Hn/s=</parent>
   <doc-comment>
@@ -455,6 +459,7 @@
   </source>
   <kind>function</kind>
   <id>5SxFoaISsZsYzIp9HRw7tVX/TBY=</id>
+  <access>public</access>
   <extraction>implementation-defined</extraction>
   <parent>mZtv21AdBSGdGVNkTV5gNP0Hn/s=</parent>
   <doc-comment>
@@ -475,6 +480,7 @@
   <func-class>constructor</func-class>
   <is-defaulted>1</is-defaulted>
   <is-explicitly-defaulted>1</is-explicitly-defaulted>
+  <constexpr>constexpr</constexpr>
   <is-record-method>1</is-record-method>
 </function>
 <function>
@@ -489,6 +495,7 @@
   </source>
   <kind>function</kind>
   <id>LYHk7iBgu2JeT2lpllNkJBcGHLQ=</id>
+  <access>public</access>
   <extraction>implementation-defined</extraction>
   <parent>mZtv21AdBSGdGVNkTV5gNP0Hn/s=</parent>
   <doc-comment>
@@ -530,6 +537,7 @@
   <func-class>constructor</func-class>
   <is-defaulted>1</is-defaulted>
   <is-explicitly-defaulted>1</is-explicitly-defaulted>
+  <constexpr>constexpr</constexpr>
   <is-record-method>1</is-record-method>
 </function>
 <function>
@@ -544,6 +552,7 @@
   </source>
   <kind>function</kind>
   <id>lRw3HhK40/l+C3AHJ9IXZ0YiR/U=</id>
+  <access>public</access>
   <extraction>implementation-defined</extraction>
   <parent>mZtv21AdBSGdGVNkTV5gNP0Hn/s=</parent>
   <doc-comment>
@@ -584,6 +593,7 @@
   <func-class>constructor</func-class>
   <is-defaulted>1</is-defaulted>
   <is-explicitly-defaulted>1</is-explicitly-defaulted>
+  <constexpr>constexpr</constexpr>
   <is-record-method>1</is-record-method>
 </function>
 <function>
@@ -598,6 +608,7 @@
   </source>
   <kind>function</kind>
   <id>njwFVAfRvQKdhOoe3xOPwxaPATY=</id>
+  <access>public</access>
   <extraction>implementation-defined</extraction>
   <parent>mZtv21AdBSGdGVNkTV5gNP0Hn/s=</parent>
   <doc-comment>
@@ -618,6 +629,7 @@
   <func-class>destructor</func-class>
   <is-defaulted>1</is-defaulted>
   <is-explicitly-defaulted>1</is-explicitly-defaulted>
+  <constexpr>constexpr</constexpr>
   <is-record-method>1</is-record-method>
 </function>
 <overloads>
@@ -632,6 +644,7 @@
   </source>
   <kind>overloads</kind>
   <id>4fr25Ymu72J1jfBMI4M7C2nWJBM=</id>
+  <access>public</access>
   <extraction>implementation-defined</extraction>
   <parent>mZtv21AdBSGdGVNkTV5gNP0Hn/s=</parent>
   <doc-comment>
@@ -668,6 +681,7 @@
   </source>
   <kind>function</kind>
   <id>6VFxN0vFHQ1ltsX6WvDNzolS25o=</id>
+  <access>public</access>
   <extraction>implementation-defined</extraction>
   <parent>mZtv21AdBSGdGVNkTV5gNP0Hn/s=</parent>
   <doc-comment>
@@ -719,6 +733,7 @@
   <func-class>normal</func-class>
   <is-defaulted>1</is-defaulted>
   <is-explicitly-defaulted>1</is-explicitly-defaulted>
+  <constexpr>constexpr</constexpr>
   <is-record-method>1</is-record-method>
 </function>
 <function>
@@ -733,6 +748,7 @@
   </source>
   <kind>function</kind>
   <id>UqbIsgY8DwZ8/6gwpjlHbkxC2bM=</id>
+  <access>public</access>
   <extraction>implementation-defined</extraction>
   <parent>mZtv21AdBSGdGVNkTV5gNP0Hn/s=</parent>
   <doc-comment>
@@ -783,6 +799,7 @@
   <func-class>normal</func-class>
   <is-defaulted>1</is-defaulted>
   <is-explicitly-defaulted>1</is-explicitly-defaulted>
+  <constexpr>constexpr</constexpr>
   <is-record-method>1</is-record-method>
 </function>
 <function>
@@ -798,6 +815,7 @@
   </source>
   <kind>function</kind>
   <id>9N/DoqP9RHp9oKIyjd88SuxV/rY=</id>
+  <access>public</access>
   <extraction>implementation-defined</extraction>
   <parent>mZtv21AdBSGdGVNkTV5gNP0Hn/s=</parent>
   <doc-comment>
@@ -881,6 +899,7 @@
   </source>
   <kind>function</kind>
   <id>Lfqm/zhq8Q8oS9Q0D2bS6UyswPY=</id>
+  <access>public</access>
   <extraction>implementation-defined</extraction>
   <parent>D8IWM+7P/nyQQB/NcuOZMF8WDCo=</parent>
   <doc-comment>
@@ -942,6 +961,7 @@
   </source>
   <kind>function</kind>
   <id>sx7jOM1J8Bx2DQECVEuJjtUWYMQ=</id>
+  <access>public</access>
   <extraction>implementation-defined</extraction>
   <parent>D8IWM+7P/nyQQB/NcuOZMF8WDCo=</parent>
   <doc-comment>
@@ -1032,6 +1052,7 @@
   </source>
   <kind>function</kind>
   <id>J6kTsHT7fNdgA7bSU4ZOMKLM04w=</id>
+  <access>public</access>
   <extraction>implementation-defined</extraction>
   <parent>KzRcRDf1l+SCwO6jl7+0aO9JJIQ=</parent>
   <doc-comment>
@@ -1148,6 +1169,7 @@
   </source>
   <kind>function</kind>
   <id>646BAjJD4AjEZDXn0F7WmTCVnJA=</id>
+  <access>public</access>
   <extraction>implementation-defined</extraction>
   <parent>+MYTjwT3NRZ4i0BUpsmhZ1YaAOs=</parent>
   <doc-comment>
@@ -1184,6 +1206,7 @@
     <default>0</default>
   </param>
   <func-class>constructor</func-class>
+  <constexpr>constexpr</constexpr>
   <is-record-method>1</is-record-method>
 </function>
 <function>
@@ -1199,6 +1222,7 @@
   </source>
   <kind>function</kind>
   <id>SBSUA5qD7n1g5kE4lOaTinh2gvg=</id>
+  <access>public</access>
   <extraction>implementation-defined</extraction>
   <parent>+MYTjwT3NRZ4i0BUpsmhZ1YaAOs=</parent>
   <doc-comment>
@@ -1282,6 +1306,7 @@
   </source>
   <kind>function</kind>
   <id>kBLhEu0L9QFIGvGeOITcw2renN0=</id>
+  <access>public</access>
   <extraction>implementation-defined</extraction>
   <parent>Az+6QP9SgQCZ4pUqFjmL9Ycbg0c=</parent>
   <doc-comment>
@@ -1366,6 +1391,7 @@
   </source>
   <kind>function</kind>
   <id>Dor3XY0DNbRqrq6o3VxmPSzwEPw=</id>
+  <access>public</access>
   <extraction>implementation-defined</extraction>
   <parent>8GvlDu9dAD8UG/F0pZ8sAX1YesQ=</parent>
   <doc-comment>
@@ -1403,6 +1429,7 @@
   </source>
   <kind>function</kind>
   <id>7NEMEfqJ2qq9ya8mcW1t7V5K0DA=</id>
+  <access>public</access>
   <extraction>implementation-defined</extraction>
   <parent>8GvlDu9dAD8UG/F0pZ8sAX1YesQ=</parent>
   <doc-comment>
@@ -1479,6 +1506,7 @@
   </source>
   <kind>record</kind>
   <id>/wWRZ47l3RGQk0A5qVxlYjTR7sA=</id>
+  <access>public</access>
   <extraction>implementation-defined</extraction>
   <parent>ZbHWoM9CoNiYVmufn0FnQWFE1ZQ=</parent>
   <key-kind>struct</key-kind>
@@ -1505,6 +1533,7 @@
   </source>
   <kind>function</kind>
   <id>nKjbGVj5I947gr5VfJysn6vnTe8=</id>
+  <access>public</access>
   <extraction>implementation-defined</extraction>
   <parent>/wWRZ47l3RGQk0A5qVxlYjTR7sA=</parent>
   <doc-comment>
@@ -1546,6 +1575,7 @@
   </source>
   <kind>function</kind>
   <id>rKnLJR7lcC0C6lxW9+MhJd/snzI=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>ZbHWoM9CoNiYVmufn0FnQWFE1ZQ=</parent>
   <doc-comment>
@@ -1620,6 +1650,7 @@
   </source>
   <kind>record</kind>
   <id>HAgVk74XB+nAkzBERa0oYoigmBY=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>3kuCvqZIS5FgwyOIBUEhgYmqu0E=</parent>
   <key-kind>struct</key-kind>
@@ -1646,6 +1677,7 @@
   </source>
   <kind>function</kind>
   <id>/hS1hRoPxuWySkopC1x6FD0nDZs=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>HAgVk74XB+nAkzBERa0oYoigmBY=</parent>
   <doc-comment>
@@ -1722,6 +1754,7 @@
   </source>
   <kind>record</kind>
   <id>Giq2nqOt5SEaT5yKq9j2bejuWvs=</id>
+  <access>public</access>
   <extraction>implementation-defined</extraction>
   <parent>uwDbzoOh24VM871hbgoix965hvM=</parent>
   <key-kind>struct</key-kind>
@@ -1748,6 +1781,7 @@
   </source>
   <kind>function</kind>
   <id>LjkioF0I8g9FaNmeTIt55ASSryw=</id>
+  <access>public</access>
   <extraction>implementation-defined</extraction>
   <parent>Giq2nqOt5SEaT5yKq9j2bejuWvs=</parent>
   <doc-comment>
@@ -1789,6 +1823,7 @@
   </source>
   <kind>function</kind>
   <id>4grFl9KUVcmgR4SaG47T6S4hBcg=</id>
+  <access>protected</access>
   <extraction>regular</extraction>
   <parent>uwDbzoOh24VM871hbgoix965hvM=</parent>
   <doc-comment>
@@ -1865,6 +1900,7 @@
   </source>
   <kind>function</kind>
   <id>o734JPIfZePYuyAyua3N+JYwItg=</id>
+  <access>public</access>
   <extraction>implementation-defined</extraction>
   <parent>XFQrzDfbt/aT3nLEC8SIREJ5+7E=</parent>
   <doc-comment>
@@ -1898,6 +1934,7 @@
   </source>
   <kind>function</kind>
   <id>spf/dXaQav7IqxEsfSwHdsLfHWA=</id>
+  <access>public</access>
   <extraction>implementation-defined</extraction>
   <parent>XFQrzDfbt/aT3nLEC8SIREJ5+7E=</parent>
   <doc-comment>
@@ -1990,6 +2027,7 @@
   </source>
   <kind>function</kind>
   <id>sqKzgkIg6wchew4YY2o9aHpXB5k=</id>
+  <access>public</access>
   <extraction>implementation-defined</extraction>
   <parent>Q9BKcT6i3Nm4PivgU7CqtfQE0Ac=</parent>
   <doc-comment>
@@ -2048,6 +2086,7 @@
   </source>
   <kind>function</kind>
   <id>StQp0Y2/XG9TgxxTnrLdK5J14tc=</id>
+  <access>public</access>
   <extraction>implementation-defined</extraction>
   <parent>Q9BKcT6i3Nm4PivgU7CqtfQE0Ac=</parent>
   <doc-comment>
@@ -2081,6 +2120,7 @@
   </source>
   <kind>variable</kind>
   <id>IXlACVGYZDttXUeLMB8kTaDmKxI=</id>
+  <access>public</access>
   <extraction>implementation-defined</extraction>
   <parent>Q9BKcT6i3Nm4PivgU7CqtfQE0Ac=</parent>
   <doc-comment>
@@ -2155,6 +2195,7 @@
   </source>
   <kind>overloads</kind>
   <id>4yMh7Vr6W8B4tNabZDXG8+DRxCk=</id>
+  <access>public</access>
   <extraction>implementation-defined</extraction>
   <parent>WqZB1D86sSU2lzC30xcTY6pwqHk=</parent>
   <doc-comment>
@@ -2212,6 +2253,7 @@
   </source>
   <kind>function</kind>
   <id>3pFm3c1ouZFHVz2VuYyh06UPI8k=</id>
+  <access>public</access>
   <extraction>implementation-defined</extraction>
   <parent>WqZB1D86sSU2lzC30xcTY6pwqHk=</parent>
   <doc-comment>
@@ -2253,6 +2295,7 @@
   </source>
   <kind>function</kind>
   <id>QnmIVR1Ls62IV8fNUQH/87RT+rw=</id>
+  <access>public</access>
   <extraction>implementation-defined</extraction>
   <parent>WqZB1D86sSU2lzC30xcTY6pwqHk=</parent>
   <doc-comment>
@@ -2369,6 +2412,7 @@
   </source>
   <kind>function</kind>
   <id>ObkoK/8a36a2cpcglnOZeQ0CK6c=</id>
+  <access>public</access>
   <extraction>implementation-defined</extraction>
   <parent>wR6zAGIhJWV1xy/X/ML6Op9S+u0=</parent>
   <doc-comment>
@@ -2444,6 +2488,7 @@
   </source>
   <kind>function</kind>
   <id>SzUbNth6+mFqhSkU3FRUROTwn8I=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>E/A/OzFlfSba7YOnb9pdx6Kzl6g=</parent>
   <named>
@@ -2504,6 +2549,7 @@
   </source>
   <kind>function</kind>
   <id>VP74GFLyNdozTrTey2tdfoaKjUY=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>/CKyuk1DFM5gAFSwM3GfxffLRNY=</parent>
   <named>
@@ -2528,6 +2574,7 @@
   </source>
   <kind>function</kind>
   <id>Bm5H0TkZTEkMu+OEU9dcfKqFe20=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>/CKyuk1DFM5gAFSwM3GfxffLRNY=</parent>
   <named>
@@ -2622,6 +2669,7 @@
   </source>
   <kind>function</kind>
   <id>BinZVJt4PqUyP1CO2JwuP1ErFQ8=</id>
+  <access>public</access>
   <extraction>implementation-defined</extraction>
   <parent>s8nEdmju6kIl769Zvq7LJHs8AKk=</parent>
   <doc-comment>
@@ -2705,6 +2753,7 @@
   </source>
   <kind>function</kind>
   <id>NZU9vrif2JKVBHco3BSjU081qx0=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>yVsgdCQ8HsNP7QyqPoq5iBc9f0M=</parent>
   <doc-comment>
@@ -2772,6 +2821,7 @@
   </source>
   <kind>function</kind>
   <id>s6JXEmJmgs/H6a+GJMvxyFG2e4w=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>yVsgdCQ8HsNP7QyqPoq5iBc9f0M=</parent>
   <doc-comment>
@@ -2855,6 +2905,7 @@
   </source>
   <kind>function</kind>
   <id>s5A+2w1YzMHk0ociR6NK5lJqCfY=</id>
+  <access>public</access>
   <extraction>implementation-defined</extraction>
   <parent>GRVLpM4dLol3Ue3NbyG8bey66g0=</parent>
   <doc-comment>
@@ -2978,6 +3029,7 @@
   </source>
   <kind>overloads</kind>
   <id>e+cfJyIox6lE1iWy1zo7AAzH+gk=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>DRkO3nVEpuQnXYIVWnNBGj2hiaU=</parent>
   <doc-comment>
@@ -3011,6 +3063,7 @@
   </source>
   <kind>function</kind>
   <id>WIOS77QIsEF9HDdKTHvR3vrhYFM=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>DRkO3nVEpuQnXYIVWnNBGj2hiaU=</parent>
   <doc-comment>
@@ -3031,6 +3084,7 @@
   <func-class>constructor</func-class>
   <is-defaulted>1</is-defaulted>
   <is-explicitly-defaulted>1</is-explicitly-defaulted>
+  <constexpr>constexpr</constexpr>
   <is-record-method>1</is-record-method>
 </function>
 <function>
@@ -3045,6 +3099,7 @@
   </source>
   <kind>function</kind>
   <id>Vymw5R4e5hNHeWpujcciD/MqyDA=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>DRkO3nVEpuQnXYIVWnNBGj2hiaU=</parent>
   <doc-comment>
@@ -3109,6 +3164,7 @@
   </source>
   <kind>function</kind>
   <id>HKwRMG1TCcdL9/dO4RHiRSkYj+4=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>DRkO3nVEpuQnXYIVWnNBGj2hiaU=</parent>
   <doc-comment>
@@ -3199,6 +3255,7 @@
   </source>
   <kind>function</kind>
   <id>dSYqwa5823mxb9MxBFg2LyhF9Es=</id>
+  <access>public</access>
   <extraction>implementation-defined</extraction>
   <parent>Cs8nEj6ZkCT7h1GP1HjjcVxOUlI=</parent>
   <doc-comment>
@@ -3284,6 +3341,7 @@
   </source>
   <kind>function</kind>
   <id>huKuawyv71bSszEI0u56adA4Lwo=</id>
+  <access>public</access>
   <extraction>implementation-defined</extraction>
   <parent>h5HKx53sOtPBzVoVIKOnPpebeA4=</parent>
   <named>
@@ -3334,6 +3392,7 @@
   </source>
   <kind>function</kind>
   <id>kqTsWjHssMexPe9Mf2RuIb8S1s4=</id>
+  <access>public</access>
   <extraction>implementation-defined</extraction>
   <parent>xK7ya2AjlmpquvBT9IAYtgjz4J0=</parent>
   <doc-comment>
@@ -3925,7 +3984,7 @@
     </location>
   </source>
   <kind>overloads</kind>
-  <id>aH5Pl0fbmu90J23OrryO2sgW4nQ=</id>
+  <id>xR65goSvHe3iHYZOSCxa3obFJxU=</id>
   <extraction>regular</extraction>
   <parent>aq/rzLqHv/iV3WBl6G2uDMW2aTo=</parent>
   <doc-comment>
@@ -4660,6 +4719,7 @@
   </source>
   <kind>function</kind>
   <id>/29KnLYPswG8mop699YNDxPe6/w=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>wNm1kb23AfA8iHR4axtiYb0LV1g=</parent>
   <named>
diff --git a/test-files/golden-tests/symbols/variable/member-pointer.xml b/test-files/golden-tests/symbols/variable/member-pointer.xml
index 4f9c1d5eea..a79241a5e3 100644
--- a/test-files/golden-tests/symbols/variable/member-pointer.xml
+++ b/test-files/golden-tests/symbols/variable/member-pointer.xml
@@ -61,6 +61,7 @@
   </source>
   <kind>variable</kind>
   <id>DXJlc6wJoMqdyInhGyTWrnqPjXQ=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>pOYGF6pLJlICuiGO0Xj0daDb/to=</parent>
   <named>
@@ -83,6 +84,7 @@
   </source>
   <kind>variable</kind>
   <id>Nf9nw1tdylSujfxB7RZlc/qmkeM=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>pOYGF6pLJlICuiGO0Xj0daDb/to=</parent>
   <named>
diff --git a/test-files/golden-tests/symbols/variable/no_unique_address.xml b/test-files/golden-tests/symbols/variable/no_unique_address.xml
index 2cc5a9fc5d..444a1bd435 100644
--- a/test-files/golden-tests/symbols/variable/no_unique_address.xml
+++ b/test-files/golden-tests/symbols/variable/no_unique_address.xml
@@ -74,6 +74,7 @@
   </source>
   <kind>variable</kind>
   <id>h2j8f921HD+Fyaokcs4ndGM/yNk=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>CgGNdHpW5mG/i5741WPYQDw28OQ=</parent>
   <named>
@@ -102,6 +103,7 @@
   </source>
   <kind>variable</kind>
   <id>91xV6rCFObgi6i1/U2uZ/GnD3WM=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>CgGNdHpW5mG/i5741WPYQDw28OQ=</parent>
   <named>
diff --git a/test-files/golden-tests/symbols/variable/ns-variables.xml b/test-files/golden-tests/symbols/variable/ns-variables.xml
index a04a26898d..36c0ce4d5e 100644
--- a/test-files/golden-tests/symbols/variable/ns-variables.xml
+++ b/test-files/golden-tests/symbols/variable/ns-variables.xml
@@ -117,6 +117,7 @@
     </name>
   </named>
   <initializer>1</initializer>
+  <storage-class>extern</storage-class>
   <is-constexpr>1</is-constexpr>
 </variable>
 <variable>
@@ -146,6 +147,7 @@
     </name>
   </named>
   <initializer>1</initializer>
+  <storage-class>extern</storage-class>
   <is-constinit>1</is-constinit>
 </variable>
 <variable>
@@ -191,6 +193,7 @@
       <identifier>T</identifier>
     </name>
   </named>
+  <storage-class>extern</storage-class>
 </variable>
 <variable>
   <name>x0</name>
@@ -236,6 +239,7 @@
     </name>
   </named>
   <initializer>0</initializer>
+  <storage-class>static</storage-class>
   <is-thread-local>1</is-thread-local>
 </variable>
 <variable>
@@ -259,6 +263,7 @@
     </name>
   </named>
   <initializer>0</initializer>
+  <storage-class>static</storage-class>
   <is-constexpr>1</is-constexpr>
   <is-thread-local>1</is-thread-local>
 </variable>
diff --git a/test-files/golden-tests/symbols/variable/static-data-def-constexpr.xml b/test-files/golden-tests/symbols/variable/static-data-def-constexpr.xml
index fee36e32d5..2525d19ab1 100644
--- a/test-files/golden-tests/symbols/variable/static-data-def-constexpr.xml
+++ b/test-files/golden-tests/symbols/variable/static-data-def-constexpr.xml
@@ -55,6 +55,7 @@
   </source>
   <kind>variable</kind>
   <id>Sugb8cWjf0PRq2dN0pOEbkKY9C4=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>pOYGF6pLJlICuiGO0Xj0daDb/to=</parent>
   <named>
@@ -65,6 +66,7 @@
     </name>
   </named>
   <initializer>S{}</initializer>
+  <storage-class>static</storage-class>
   <is-inline>1</is-inline>
   <is-constexpr>1</is-constexpr>
 </variable>
@@ -111,6 +113,7 @@
   </source>
   <kind>variable</kind>
   <id>+nDx93NmBRbrBZ8RlBwzPk8rp8I=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>CgGNdHpW5mG/i5741WPYQDw28OQ=</parent>
   <named>
@@ -120,6 +123,7 @@
     </name>
   </named>
   <initializer>0</initializer>
+  <storage-class>static</storage-class>
   <is-inline>1</is-inline>
   <is-constexpr>1</is-constexpr>
   <is-constinit>1</is-constinit>
diff --git a/test-files/golden-tests/symbols/variable/static-data-def.xml b/test-files/golden-tests/symbols/variable/static-data-def.xml
index 31412bd5e5..6faee51828 100644
--- a/test-files/golden-tests/symbols/variable/static-data-def.xml
+++ b/test-files/golden-tests/symbols/variable/static-data-def.xml
@@ -70,6 +70,7 @@
   </source>
   <kind>variable</kind>
   <id>rW6h+mCfZLROHlYzwXFIUPN6oSE=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>5tUSuMtQqtYE49jBjSYSWp0DJAM=</parent>
   <named>
@@ -79,6 +80,7 @@
     </name>
   </named>
   <initializer>0</initializer>
+  <storage-class>static</storage-class>
 </variable>
 <variable>
   <name>v1</name>
@@ -98,6 +100,7 @@
   </source>
   <kind>variable</kind>
   <id>nkB0lMmDvMsu9GDrKr3Mzwi5g6I=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>5tUSuMtQqtYE49jBjSYSWp0DJAM=</parent>
   <named>
@@ -107,6 +110,7 @@
     </name>
   </named>
   <initializer>1</initializer>
+  <storage-class>static</storage-class>
   <is-inline>1</is-inline>
 </variable>
 <variable>
@@ -127,6 +131,7 @@
   </source>
   <kind>variable</kind>
   <id>e48c97dC3AIWJHWE5T0yWVxezgg=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>5tUSuMtQqtYE49jBjSYSWp0DJAM=</parent>
   <named>
@@ -136,6 +141,7 @@
     </name>
   </named>
   <initializer>2</initializer>
+  <storage-class>static</storage-class>
   <is-inline>1</is-inline>
   <is-constexpr>1</is-constexpr>
 </variable>
@@ -157,6 +163,7 @@
   </source>
   <kind>variable</kind>
   <id>Wx5S5oWv5o4nV7I+zFEKTvWl40g=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>5tUSuMtQqtYE49jBjSYSWp0DJAM=</parent>
   <named>
@@ -167,6 +174,7 @@
     </name>
   </named>
   <initializer>3</initializer>
+  <storage-class>static</storage-class>
   <is-inline>1</is-inline>
 </variable>
 <variable>
@@ -187,6 +195,7 @@
   </source>
   <kind>variable</kind>
   <id>6a2wBN4mHiuAAqV0gYgYQeqFNVM=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>5tUSuMtQqtYE49jBjSYSWp0DJAM=</parent>
   <named>
@@ -197,6 +206,7 @@
     </name>
   </named>
   <initializer>4</initializer>
+  <storage-class>static</storage-class>
 </variable>
 <variable>
   <name>v5</name>
@@ -210,6 +220,7 @@
   </source>
   <kind>variable</kind>
   <id>Q96okKllwtE2Tg+t7HAkms6flbk=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>5tUSuMtQqtYE49jBjSYSWp0DJAM=</parent>
   <named>
@@ -219,6 +230,7 @@
     </name>
   </named>
   <initializer>5</initializer>
+  <storage-class>static</storage-class>
   <is-inline>1</is-inline>
 </variable>
 <variable>
@@ -233,6 +245,7 @@
   </source>
   <kind>variable</kind>
   <id>0Xh4ypD2+Eipbqc5Z8n4fEkXZ8c=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>5tUSuMtQqtYE49jBjSYSWp0DJAM=</parent>
   <named>
@@ -243,6 +256,7 @@
     </name>
   </named>
   <initializer>6</initializer>
+  <storage-class>static</storage-class>
   <is-inline>1</is-inline>
 </variable>
 <variable>
@@ -257,6 +271,7 @@
   </source>
   <kind>variable</kind>
   <id>VCnmz8Cp9RtJzQQQ7yw57uzbQAY=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>5tUSuMtQqtYE49jBjSYSWp0DJAM=</parent>
   <named>
@@ -266,6 +281,7 @@
     </name>
   </named>
   <initializer>7</initializer>
+  <storage-class>static</storage-class>
   <is-inline>1</is-inline>
   <is-constexpr>1</is-constexpr>
 </variable>
@@ -313,6 +329,7 @@
   </source>
   <kind>variable</kind>
   <id>+yhNlGuTVY4spCfBXSTBkEDzi30=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>3JsK1DO0O+wZhv+0meptQrbs3fY=</parent>
   <named>
@@ -323,6 +340,7 @@
     </name>
   </named>
   <initializer>0</initializer>
+  <storage-class>static</storage-class>
   <is-thread-local>1</is-thread-local>
 </variable>
 <variable>
@@ -337,6 +355,7 @@
   </source>
   <kind>variable</kind>
   <id>vNYWHh2ovZiBP3uVEeJhMkaiF3w=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>3JsK1DO0O+wZhv+0meptQrbs3fY=</parent>
   <named>
@@ -346,6 +365,7 @@
     </name>
   </named>
   <initializer>0</initializer>
+  <storage-class>static</storage-class>
   <is-inline>1</is-inline>
   <is-constexpr>1</is-constexpr>
   <is-thread-local>1</is-thread-local>
diff --git a/test-files/golden-tests/symbols/variable/static-data-template.xml b/test-files/golden-tests/symbols/variable/static-data-template.xml
index 19b8e7410b..64256d4fb5 100644
--- a/test-files/golden-tests/symbols/variable/static-data-template.xml
+++ b/test-files/golden-tests/symbols/variable/static-data-template.xml
@@ -57,6 +57,7 @@
   </source>
   <kind>variable</kind>
   <id>XzfcXqh7M7tQVHWKvlB891KIC/0=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>5tUSuMtQqtYE49jBjSYSWp0DJAM=</parent>
   <named>
@@ -78,6 +79,7 @@
     </type-tparam>
   </template>
   <initializer>0</initializer>
+  <storage-class>static</storage-class>
   <is-inline>1</is-inline>
   <is-constexpr>1</is-constexpr>
 </variable>
@@ -93,6 +95,7 @@
   </source>
   <kind>variable</kind>
   <id>eKdgKT44WwfN7UkQXGEqVJssIPM=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>5tUSuMtQqtYE49jBjSYSWp0DJAM=</parent>
   <named>
@@ -122,6 +125,7 @@
     </type-targ>
   </template>
   <initializer>2</initializer>
+  <storage-class>static</storage-class>
   <is-inline>1</is-inline>
   <is-constexpr>1</is-constexpr>
 </variable>
@@ -137,6 +141,7 @@
   </source>
   <kind>variable</kind>
   <id>odTOUblgmooUozrBqW3qKzPWSO4=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>5tUSuMtQqtYE49jBjSYSWp0DJAM=</parent>
   <named>
@@ -173,6 +178,7 @@
     </type-targ>
   </template>
   <initializer>1</initializer>
+  <storage-class>static</storage-class>
   <is-inline>1</is-inline>
   <is-constexpr>1</is-constexpr>
 </variable>
diff --git a/test-files/golden-tests/symbols/variable/var-template.xml b/test-files/golden-tests/symbols/variable/var-template.xml
index e6cc18cd84..214f29b144 100644
--- a/test-files/golden-tests/symbols/variable/var-template.xml
+++ b/test-files/golden-tests/symbols/variable/var-template.xml
@@ -53,6 +53,7 @@
   </source>
   <kind>variable</kind>
   <id>kMNXdSEDYBD+T4RYbkq3ekR+jUU=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>3JsK1DO0O+wZhv+0meptQrbs3fY=</parent>
   <named>
@@ -69,6 +70,7 @@
     </type-tparam>
   </template>
   <initializer>0</initializer>
+  <storage-class>static</storage-class>
   <is-inline>1</is-inline>
 </variable>
 <variable>
@@ -83,6 +85,7 @@
   </source>
   <kind>variable</kind>
   <id>Wtlw7VEK38lEEBeqNoDOjTkJE+U=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>3JsK1DO0O+wZhv+0meptQrbs3fY=</parent>
   <named>
@@ -103,6 +106,7 @@
     </type-targ>
   </template>
   <initializer>-1</initializer>
+  <storage-class>static</storage-class>
   <is-inline>1</is-inline>
 </variable>
 <variable>
@@ -117,6 +121,7 @@
   </source>
   <kind>variable</kind>
   <id>wvoZkG3eTMaiFAf971AFdvmHCDE=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>3JsK1DO0O+wZhv+0meptQrbs3fY=</parent>
   <named>
@@ -144,6 +149,7 @@
     </type-targ>
   </template>
   <initializer>sizeof(T)</initializer>
+  <storage-class>static</storage-class>
   <is-inline>1</is-inline>
 </variable>
 <variable>
diff --git a/test-files/golden-tests/templates/c_mct_expl_inline.xml b/test-files/golden-tests/templates/c_mct_expl_inline.xml
index 2a92b6692d..07a29b53fb 100644
--- a/test-files/golden-tests/templates/c_mct_expl_inline.xml
+++ b/test-files/golden-tests/templates/c_mct_expl_inline.xml
@@ -49,6 +49,7 @@
   </source>
   <kind>record</kind>
   <id>TqGFMDXDQ6ddt946aVDeyhY9Ij8=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>YrPSaKAbmXgzCAX5WByx4eVoqBM=</parent>
   <key-kind>struct</key-kind>
@@ -81,6 +82,7 @@
   </source>
   <kind>function</kind>
   <id>GOVvMTuIkLp/PqUkD5z7Bvf4+FQ=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>TqGFMDXDQ6ddt946aVDeyhY9Ij8=</parent>
   <named>
@@ -104,6 +106,7 @@
   </source>
   <kind>record</kind>
   <id>FxMFFVpoV2/LOOndnkQ2gu3w69U=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>YrPSaKAbmXgzCAX5WByx4eVoqBM=</parent>
   <key-kind>struct</key-kind>
@@ -141,6 +144,7 @@
   </source>
   <kind>function</kind>
   <id>nxkAf/oNulEWX8A/IPUHkew79Y4=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>FxMFFVpoV2/LOOndnkQ2gu3w69U=</parent>
   <named>
diff --git a/test-files/golden-tests/templates/c_mct_expl_outside.xml b/test-files/golden-tests/templates/c_mct_expl_outside.xml
index 69e21fb2f9..54468f51ba 100644
--- a/test-files/golden-tests/templates/c_mct_expl_outside.xml
+++ b/test-files/golden-tests/templates/c_mct_expl_outside.xml
@@ -49,6 +49,7 @@
   </source>
   <kind>record</kind>
   <id>TqGFMDXDQ6ddt946aVDeyhY9Ij8=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>YrPSaKAbmXgzCAX5WByx4eVoqBM=</parent>
   <key-kind>struct</key-kind>
@@ -81,6 +82,7 @@
   </source>
   <kind>function</kind>
   <id>GOVvMTuIkLp/PqUkD5z7Bvf4+FQ=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>TqGFMDXDQ6ddt946aVDeyhY9Ij8=</parent>
   <named>
@@ -104,6 +106,7 @@
   </source>
   <kind>record</kind>
   <id>FxMFFVpoV2/LOOndnkQ2gu3w69U=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>YrPSaKAbmXgzCAX5WByx4eVoqBM=</parent>
   <key-kind>struct</key-kind>
@@ -141,6 +144,7 @@
   </source>
   <kind>function</kind>
   <id>nxkAf/oNulEWX8A/IPUHkew79Y4=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>FxMFFVpoV2/LOOndnkQ2gu3w69U=</parent>
   <named>
diff --git a/test-files/golden-tests/templates/c_mft_expl_inline.xml b/test-files/golden-tests/templates/c_mft_expl_inline.xml
index 76b185d1e1..2d8636ea99 100644
--- a/test-files/golden-tests/templates/c_mft_expl_inline.xml
+++ b/test-files/golden-tests/templates/c_mft_expl_inline.xml
@@ -48,6 +48,7 @@
   </source>
   <kind>overloads</kind>
   <id>ct3b2BagsWFMKFtMRx/UVwhsQmo=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>YrPSaKAbmXgzCAX5WByx4eVoqBM=</parent>
   <func-class>normal</func-class>
@@ -72,6 +73,7 @@
   </source>
   <kind>function</kind>
   <id>6UIt6/hx1mqXnkk0IbjFZNnVJ2Y=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>YrPSaKAbmXgzCAX5WByx4eVoqBM=</parent>
   <named>
@@ -102,6 +104,7 @@
   </source>
   <kind>function</kind>
   <id>veV2posfyuimiNezTTVnomiz6tY=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>YrPSaKAbmXgzCAX5WByx4eVoqBM=</parent>
   <named>
diff --git a/test-files/golden-tests/templates/c_mft_expl_outside.xml b/test-files/golden-tests/templates/c_mft_expl_outside.xml
index 4181a47e63..d4a45ebf52 100644
--- a/test-files/golden-tests/templates/c_mft_expl_outside.xml
+++ b/test-files/golden-tests/templates/c_mft_expl_outside.xml
@@ -48,6 +48,7 @@
   </source>
   <kind>overloads</kind>
   <id>ct3b2BagsWFMKFtMRx/UVwhsQmo=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>YrPSaKAbmXgzCAX5WByx4eVoqBM=</parent>
   <func-class>normal</func-class>
@@ -72,6 +73,7 @@
   </source>
   <kind>function</kind>
   <id>6UIt6/hx1mqXnkk0IbjFZNnVJ2Y=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>YrPSaKAbmXgzCAX5WByx4eVoqBM=</parent>
   <named>
@@ -102,6 +104,7 @@
   </source>
   <kind>function</kind>
   <id>veV2posfyuimiNezTTVnomiz6tY=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>YrPSaKAbmXgzCAX5WByx4eVoqBM=</parent>
   <named>
diff --git a/test-files/golden-tests/templates/ct_expl.xml b/test-files/golden-tests/templates/ct_expl.xml
index e7b8a06820..71e43adbc2 100644
--- a/test-files/golden-tests/templates/ct_expl.xml
+++ b/test-files/golden-tests/templates/ct_expl.xml
@@ -56,6 +56,7 @@
   </source>
   <kind>function</kind>
   <id>c4jAAYDw9qnOxUCpXquNT7fALUY=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>5tUSuMtQqtYE49jBjSYSWp0DJAM=</parent>
   <named>
@@ -116,6 +117,7 @@
   </source>
   <kind>function</kind>
   <id>NCn1LYKSU8X/x/ejZTTGKsJQLug=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>AKwlChAOi+0ttIAPsD7uitS+gk0=</parent>
   <named>
diff --git a/test-files/golden-tests/templates/ct_expl_dependency.xml b/test-files/golden-tests/templates/ct_expl_dependency.xml
index 1d21184ee7..f8b0eef6a6 100644
--- a/test-files/golden-tests/templates/ct_expl_dependency.xml
+++ b/test-files/golden-tests/templates/ct_expl_dependency.xml
@@ -59,6 +59,7 @@
   </source>
   <kind>function</kind>
   <id>NCn1LYKSU8X/x/ejZTTGKsJQLug=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>AKwlChAOi+0ttIAPsD7uitS+gk0=</parent>
   <named>
diff --git a/test-files/golden-tests/templates/ct_mc.xml b/test-files/golden-tests/templates/ct_mc.xml
index 774d2efff5..15cdc59510 100644
--- a/test-files/golden-tests/templates/ct_mc.xml
+++ b/test-files/golden-tests/templates/ct_mc.xml
@@ -55,6 +55,7 @@
   </source>
   <kind>record</kind>
   <id>fWoD36lD5WiSb4UmeWlbUQhHuXU=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>5tUSuMtQqtYE49jBjSYSWp0DJAM=</parent>
   <key-kind>struct</key-kind>
@@ -80,6 +81,7 @@
   </source>
   <kind>function</kind>
   <id>FBE8MWhdRJutTkraJIXajcEr4U0=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>fWoD36lD5WiSb4UmeWlbUQhHuXU=</parent>
   <named>
diff --git a/test-files/golden-tests/templates/ct_mc_expl_outside.xml b/test-files/golden-tests/templates/ct_mc_expl_outside.xml
index f4a71e9b82..c70c04393d 100644
--- a/test-files/golden-tests/templates/ct_mc_expl_outside.xml
+++ b/test-files/golden-tests/templates/ct_mc_expl_outside.xml
@@ -56,6 +56,7 @@
   </source>
   <kind>record</kind>
   <id>fWoD36lD5WiSb4UmeWlbUQhHuXU=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>5tUSuMtQqtYE49jBjSYSWp0DJAM=</parent>
   <key-kind>struct</key-kind>
@@ -81,6 +82,7 @@
   </source>
   <kind>function</kind>
   <id>FBE8MWhdRJutTkraJIXajcEr4U0=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>fWoD36lD5WiSb4UmeWlbUQhHuXU=</parent>
   <named>
@@ -147,6 +149,7 @@
   </source>
   <kind>record</kind>
   <id>xks7eBJx25CIVelbqBa2LCCEll4=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>AKwlChAOi+0ttIAPsD7uitS+gk0=</parent>
   <key-kind>struct</key-kind>
@@ -172,6 +175,7 @@
   </source>
   <kind>function</kind>
   <id>692fgnQlzTAWgxI/0d6qH/zXq2w=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>xks7eBJx25CIVelbqBa2LCCEll4=</parent>
   <named>
diff --git a/test-files/golden-tests/templates/ct_mct.xml b/test-files/golden-tests/templates/ct_mct.xml
index a144c48625..7dc5a12532 100644
--- a/test-files/golden-tests/templates/ct_mct.xml
+++ b/test-files/golden-tests/templates/ct_mct.xml
@@ -55,6 +55,7 @@
   </source>
   <kind>record</kind>
   <id>dKDSVrZun8skBV/NUCmJyCUOvJA=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>5tUSuMtQqtYE49jBjSYSWp0DJAM=</parent>
   <key-kind>struct</key-kind>
@@ -87,6 +88,7 @@
   </source>
   <kind>function</kind>
   <id>E/7hys/9wYX9YmsaiN5VHroNb8A=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>dKDSVrZun8skBV/NUCmJyCUOvJA=</parent>
   <named>
diff --git a/test-files/golden-tests/templates/ct_mct_expl_inline.xml b/test-files/golden-tests/templates/ct_mct_expl_inline.xml
index 6580f28709..218a32f99e 100644
--- a/test-files/golden-tests/templates/ct_mct_expl_inline.xml
+++ b/test-files/golden-tests/templates/ct_mct_expl_inline.xml
@@ -56,6 +56,7 @@
   </source>
   <kind>record</kind>
   <id>dKDSVrZun8skBV/NUCmJyCUOvJA=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>5tUSuMtQqtYE49jBjSYSWp0DJAM=</parent>
   <key-kind>struct</key-kind>
@@ -88,6 +89,7 @@
   </source>
   <kind>function</kind>
   <id>E/7hys/9wYX9YmsaiN5VHroNb8A=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>dKDSVrZun8skBV/NUCmJyCUOvJA=</parent>
   <named>
@@ -111,6 +113,7 @@
   </source>
   <kind>record</kind>
   <id>bHsbts/3qH4qdnqFkFXkR6e8OCw=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>5tUSuMtQqtYE49jBjSYSWp0DJAM=</parent>
   <key-kind>struct</key-kind>
@@ -148,6 +151,7 @@
   </source>
   <kind>function</kind>
   <id>ymRqXpmLCXBjCy4HMrul4HOObrs=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>bHsbts/3qH4qdnqFkFXkR6e8OCw=</parent>
   <named>
diff --git a/test-files/golden-tests/templates/ct_mct_expl_outside.xml b/test-files/golden-tests/templates/ct_mct_expl_outside.xml
index 86c9fbb084..4c2d64111b 100644
--- a/test-files/golden-tests/templates/ct_mct_expl_outside.xml
+++ b/test-files/golden-tests/templates/ct_mct_expl_outside.xml
@@ -56,6 +56,7 @@
   </source>
   <kind>record</kind>
   <id>dKDSVrZun8skBV/NUCmJyCUOvJA=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>5tUSuMtQqtYE49jBjSYSWp0DJAM=</parent>
   <key-kind>struct</key-kind>
@@ -88,6 +89,7 @@
   </source>
   <kind>function</kind>
   <id>E/7hys/9wYX9YmsaiN5VHroNb8A=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>dKDSVrZun8skBV/NUCmJyCUOvJA=</parent>
   <named>
@@ -149,6 +151,7 @@
   </source>
   <kind>record</kind>
   <id>O0cvG3FLegojxWfTpLGLrtCaiDg=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>AKwlChAOi+0ttIAPsD7uitS+gk0=</parent>
   <key-kind>struct</key-kind>
@@ -180,6 +183,7 @@
   </source>
   <kind>record</kind>
   <id>IMS2etMN5nj/r7pRC8mVNme6K+o=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>AKwlChAOi+0ttIAPsD7uitS+gk0=</parent>
   <key-kind>struct</key-kind>
@@ -217,6 +221,7 @@
   </source>
   <kind>function</kind>
   <id>wgUjzBOiB/QKB2Z0bKQ7J2DgRR0=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>IMS2etMN5nj/r7pRC8mVNme6K+o=</parent>
   <named>
diff --git a/test-files/golden-tests/templates/ct_mf.xml b/test-files/golden-tests/templates/ct_mf.xml
index 8d593fd26a..89bc8cd82b 100644
--- a/test-files/golden-tests/templates/ct_mf.xml
+++ b/test-files/golden-tests/templates/ct_mf.xml
@@ -55,6 +55,7 @@
   </source>
   <kind>function</kind>
   <id>c4jAAYDw9qnOxUCpXquNT7fALUY=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>5tUSuMtQqtYE49jBjSYSWp0DJAM=</parent>
   <named>
diff --git a/test-files/golden-tests/templates/ct_mf_expl_outside.xml b/test-files/golden-tests/templates/ct_mf_expl_outside.xml
index b6803bf651..af25664379 100644
--- a/test-files/golden-tests/templates/ct_mf_expl_outside.xml
+++ b/test-files/golden-tests/templates/ct_mf_expl_outside.xml
@@ -56,6 +56,7 @@
   </source>
   <kind>function</kind>
   <id>c4jAAYDw9qnOxUCpXquNT7fALUY=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>5tUSuMtQqtYE49jBjSYSWp0DJAM=</parent>
   <named>
@@ -122,6 +123,7 @@
   </source>
   <kind>function</kind>
   <id>5vQMmBbKdcjmr6fZ5KE/+hqkRD0=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>AKwlChAOi+0ttIAPsD7uitS+gk0=</parent>
   <named>
diff --git a/test-files/golden-tests/templates/ct_mft.xml b/test-files/golden-tests/templates/ct_mft.xml
index 20b403c803..283fb7194a 100644
--- a/test-files/golden-tests/templates/ct_mft.xml
+++ b/test-files/golden-tests/templates/ct_mft.xml
@@ -55,6 +55,7 @@
   </source>
   <kind>function</kind>
   <id>fycIFVnUjGsczEihLemEC7pcV4w=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>5tUSuMtQqtYE49jBjSYSWp0DJAM=</parent>
   <named>
diff --git a/test-files/golden-tests/templates/ct_mft_expl_inline.xml b/test-files/golden-tests/templates/ct_mft_expl_inline.xml
index cfbc7a499b..efb6a4c8b3 100644
--- a/test-files/golden-tests/templates/ct_mft_expl_inline.xml
+++ b/test-files/golden-tests/templates/ct_mft_expl_inline.xml
@@ -55,6 +55,7 @@
   </source>
   <kind>overloads</kind>
   <id>AvAESYZFVvK3PiO4+x9D9ee81UQ=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>5tUSuMtQqtYE49jBjSYSWp0DJAM=</parent>
   <func-class>normal</func-class>
@@ -79,6 +80,7 @@
   </source>
   <kind>function</kind>
   <id>fycIFVnUjGsczEihLemEC7pcV4w=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>5tUSuMtQqtYE49jBjSYSWp0DJAM=</parent>
   <named>
@@ -109,6 +111,7 @@
   </source>
   <kind>function</kind>
   <id>TneA5Ayz4v/9oOUbbnRL1ybm8VM=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>5tUSuMtQqtYE49jBjSYSWp0DJAM=</parent>
   <named>
diff --git a/test-files/golden-tests/templates/ct_mft_expl_outside.xml b/test-files/golden-tests/templates/ct_mft_expl_outside.xml
index 4bf78c294d..21d5bf89ed 100644
--- a/test-files/golden-tests/templates/ct_mft_expl_outside.xml
+++ b/test-files/golden-tests/templates/ct_mft_expl_outside.xml
@@ -56,6 +56,7 @@
   </source>
   <kind>function</kind>
   <id>fycIFVnUjGsczEihLemEC7pcV4w=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>5tUSuMtQqtYE49jBjSYSWp0DJAM=</parent>
   <named>
@@ -129,6 +130,7 @@
   </source>
   <kind>overloads</kind>
   <id>op80FfPhYepRTXrszso/lDC+jBQ=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>AKwlChAOi+0ttIAPsD7uitS+gk0=</parent>
   <func-class>normal</func-class>
@@ -153,6 +155,7 @@
   </source>
   <kind>function</kind>
   <id>MtpaTgur0M7GGwfDIj9dUJZjaHM=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>AKwlChAOi+0ttIAPsD7uitS+gk0=</parent>
   <named>
@@ -183,6 +186,7 @@
   </source>
   <kind>function</kind>
   <id>fjcm9F09lrCrLSgw6Swqw9KOBlM=</id>
+  <access>public</access>
   <extraction>regular</extraction>
   <parent>AKwlChAOi+0ttIAPsD7uitS+gk0=</parent>
   <named>
diff --git a/test-files/golden-tests/templates/ft_expl.adoc b/test-files/golden-tests/templates/ft_expl.adoc
index 9e7c47f0ef..cc2c0c2ab2 100644
--- a/test-files/golden-tests/templates/ft_expl.adoc
+++ b/test-files/golden-tests/templates/ft_expl.adoc
@@ -9,10 +9,10 @@
 [cols=1]
 |===
 | Name
-| link:#f-0c7[`f`] 
+| link:#f-01[`f`] 
 |===
 
-[#f-0c7]
+[#f-01]
 == f
 
 === Synopses
@@ -34,10 +34,10 @@ link:#f-03[f]();
 ----
 template&lt;&gt;
 void
-link:#f-0ca[f&lt;int&gt;]();
+link:#f-0c[f&lt;int&gt;]();
 ----
 
-[.small]#link:#f-0ca[_» more&period;&period;&period;_]#
+[.small]#link:#f-0c[_» more&period;&period;&period;_]#
 
 [#f-03]
 == f
@@ -53,7 +53,7 @@ void
 f();
 ----
 
-[#f-0ca]
+[#f-0c]
 == link:#f-03[f]&lt;int&gt;
 
 === Synopsis
diff --git a/test-files/golden-tests/templates/ft_expl.html b/test-files/golden-tests/templates/ft_expl.html
index 60bdd61040..49009071a7 100644
--- a/test-files/golden-tests/templates/ft_expl.html
+++ b/test-files/golden-tests/templates/ft_expl.html
@@ -21,14 +21,14 @@ <h2>
 </thead>
 <tbody>
 <tr>
-<td><a href="#f-0c7"><code>f</code></a> </td></tr>
+<td><a href="#f-01"><code>f</code></a> </td></tr>
 </tbody>
 </table>
 
 </div>
 <div>
 <div>
-<h2 id="f-0c7">
+<h2 id="f-01">
 f</h2>
 </div>
 <div>
@@ -45,8 +45,8 @@ <h3>
 
 <pre><code class="source-code cpp">template&lt;&gt;
 void
-<a href="#f-0ca">f&lt;int&gt;</a>();</code></pre>
-<span class="small"><a href="#f-0ca"><em>» more...</em></a></span>
+<a href="#f-0c">f&lt;int&gt;</a>();</code></pre>
+<span class="small"><a href="#f-0c"><em>» more...</em></a></span>
 
 </div>
 </div>
@@ -67,7 +67,7 @@ <h3>
 </div>
 <div>
 <div>
-<h2 id="f-0ca">
+<h2 id="f-0c">
 f&lt;int&gt;</h2>
 </div>
 <div>
diff --git a/test-files/golden-tests/templates/ft_expl.xml b/test-files/golden-tests/templates/ft_expl.xml
index 925f1b0e72..427b189cb6 100644
--- a/test-files/golden-tests/templates/ft_expl.xml
+++ b/test-files/golden-tests/templates/ft_expl.xml
@@ -8,7 +8,7 @@
   <id>//////////////////////////8=</id>
   <extraction>regular</extraction>
   <namespace-tranche>
-    <functions>x0B55dWJmTMqTXm6ZEu790gmPxY=</functions>
+    <functions>GDxqxKc4bkmO2HKXdEn9Zgy37O8=</functions>
   </namespace-tranche>
 </namespace>
 <overloads>
@@ -22,7 +22,7 @@
     </location>
   </source>
   <kind>overloads</kind>
-  <id>x0B55dWJmTMqTXm6ZEu790gmPxY=</id>
+  <id>GDxqxKc4bkmO2HKXdEn9Zgy37O8=</id>
   <extraction>regular</extraction>
   <parent>//////////////////////////8=</parent>
   <func-class>normal</func-class>
diff --git a/util/bootstrap/src/configs/run_configs.py b/util/bootstrap/src/configs/run_configs.py
index a65c9c517b..588e69b856 100644
--- a/util/bootstrap/src/configs/run_configs.py
+++ b/util/bootstrap/src/configs/run_configs.py
@@ -184,13 +184,21 @@ def get_dynamic_run_configs(
 
     # XML / RelaxNG tasks requiring Java and libxml2
     if java_path:
+        configs.append({
+            "name": "MrDocs Generate Schemas",
+            "script": os.path.join(options.build_dir, "bin", "mrdocs"),
+            "args": [
+                "--schemas=" + options.build_dir,
+            ],
+            "cwd": options.source_dir,
+        })
         configs.append({
             "name": "MrDocs Generate RelaxNG Schema",
             "script": java_path,
             "args": [
                 "-jar",
                 os.path.join(options.source_dir, "util", "trang.jar"),
-                os.path.join(options.source_dir, "mrdocs.rnc"),
+                os.path.join(options.build_dir, "mrdocs.rnc"),
                 os.path.join(options.build_dir, "mrdocs.rng"),
             ],
             "cwd": options.source_dir,
diff --git a/util/bootstrap/src/configs/visual_studio.py b/util/bootstrap/src/configs/visual_studio.py
index c519c86cd1..a1390e2f7c 100644
--- a/util/bootstrap/src/configs/visual_studio.py
+++ b/util/bootstrap/src/configs/visual_studio.py
@@ -162,7 +162,7 @@ def vs_config_project_target(config):
                 new_task["appliesTo"] = os.path.join(new_task["workingDirectory"], "package.json")
                 new_task["appliesTo"] = rel_to_mrdocs_dir(new_task["appliesTo"], source_dir)
             elif new_task["taskLabel"] == "MrDocs Generate RelaxNG Schema":
-                new_task["appliesTo"] = "mrdocs.rnc"
+                new_task["appliesTo"] = "*"
             elif new_task["taskLabel"] == "MrDocs XML Lint with RelaxNG Schema":
                 new_task["appliesTo"] = "mrdocs.rng"
 
diff --git a/util/bootstrap/tests/test_ide_configs.py b/util/bootstrap/tests/test_ide_configs.py
index 5276d6f082..b7fcdab215 100644
--- a/util/bootstrap/tests/test_ide_configs.py
+++ b/util/bootstrap/tests/test_ide_configs.py
@@ -784,7 +784,7 @@ def test_relaxng_schema_task(self, mock_ensure, mock_load, mock_write):
         )
         tasks_data = json.loads(mock_write.call_args_list[1][0][1])
         task = tasks_data["tasks"][0]
-        self.assertEqual(task["appliesTo"], "mrdocs.rnc")
+        self.assertEqual(task["appliesTo"], "*")
 
     @patch("src.configs.visual_studio.write_text")
     @patch("src.configs.visual_studio.load_json_file", return_value=None)