diff --git a/LICENSE b/LICENSE
index b73394e6..bf2cf9d3 100644
--- a/LICENSE
+++ b/LICENSE
@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 1984-2023 Intellectual Reserve, Inc. All rights reserved. A service provided by The Church of Jesus Christ of Latter-day Saints.
+   Copyright 1984-2024 Intellectual Reserve, Inc. All rights reserved. A service provided by The Church of Jesus Christ of Latter-day Saints.
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/NOTICE b/NOTICE
index a0330e52..f6cdaa73 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,7 +1,7 @@
 NOTICE:
 
 This work comprises, is based on, or is derived from the FAMILYSEARCH GEDCOM™
-Specification, © 1984-2023 Intellectual Reserve, Inc. All rights reserved.
+Specification, © 1984-2024 Intellectual Reserve, Inc. All rights reserved.
 
 "FAMILYSEARCH GEDCOM™" and "FAMILYSEARCH®" are trademarks of Intellectual
 Reserve, Inc. and may not be used except as allowed by the Apache 2.0 license
diff --git a/build/hyperlink.py b/build/hyperlink.py
index 9c06e8dc..4dd9abf4 100644
--- a/build/hyperlink.py
+++ b/build/hyperlink.py
@@ -111,5 +111,6 @@ def abnf(m):
                     # to.write(line)
                 else:
                     to.write(linkable(line, num))
+        to.write('\n\n') # ensure full break between each .md file
 
 # Step 3 is adding links inside gedstruct code blocks. This cannot be done in markdown, so it is handled by a separate processor for the HTML
diff --git a/build/uri-def.py b/build/uri-def.py
index a81190b0..72dcbc6c 100644
--- a/build/uri-def.py
+++ b/build/uri-def.py
@@ -82,10 +82,15 @@ def find_cat_tables(txt, g7, tagsets):
             else:
                 meaning = [meaning]
             if pfx in cats and meaning != cats[pfx]:
-                raise Exception('Concatenated URI '+pfx+' has multiple definitions:'
-                    + '\n    '+cats[pfx]
-                    + '\n    '+meaning
+                print('### WARNING ###\n'
+                    + 'Concatenated URI '+pfx+' has multiple definitions:'
+                    + '\n    '+repr(cats[pfx])
+                    + '\n    '+repr(meaning)
+                    , file=stderr
                 )
+                for m in meaning:
+                    if m not in cats[pfx]: cats[pfx].append(m)
+                meaning = cats[pfx]
             if 'enum-' in pfx:
                 yamltype = 'enumeration'
                 k1 = sect.find('`', sect.rfind('\n#', 0, entry.start()))
diff --git a/changelog.md b/changelog.md
index c51ae2e8..cf249eb0 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,3 +1,24 @@
+# Version 7.0.14
+
+- Recommend that `NO XYZ` only be used where `XYZ` is permitted (its meaning is undefined elsewhere).
+
+- Recommend that a given `INDI` have at most one `FAMC` pointing to a given `FAM` (having more than one has unclear meaning); and likewise that a given `FAM` have at most one `CHIL` pointing to a given `INDI` (having more than one indicates nonsensical birth order).
+
+- Refactor presentation of local files to better match related RFCs and only make implementable constraints, and to use its own `<FilePath>` datatype instead of `<Special>`. This does not change `FILE` payloads, only how they are specified to better support automated tooling.
+
+- Refactor the enumeration tags `CENS`, `EVEN`, `FACT`, `NCHI`, and `RESI` to have different URIs, removing a previous parsing ambiguity. This changes neither the set of tags permitted in any enumeration set nor those tags' meaning, only how they are specified to better support automated tooling.
+
+- Deprecate extension-defined substructures using `stdTag` in a way incompatible with any standard definition of that tag. The now-deprecated use was common in 5.5.1 and is permitted in 7.0, but can prevent extension structures from being adopted as-is as new standard structures in future versions of the specification.
+
+- Clarify that the "applies to" and "status" columns of `g7:enumset-ord-STAT` are recommendations, not restrictions.
+
+- Clarify that AGE values may be larger than any calendar supports. This was always permitted; that fact is now called out more clearly.
+
+- Clarify that records cannot be relocated standard structures. This was always incompatible with the definition of relocated standard structures; that fact is now called out more clearly.
+
+- Various typo corrections.
+
+
 # Version 7.0.13
 
 - Deprecated `ADR1`, `ADR2`, and `ADR3` which convey no information not already in `ADDR`.
@@ -73,7 +94,7 @@
 
 - Changes anticipating a coming extension registry:
 
-    - Add URIs for sets of enumeration values. This has changes some fragment identifiers in the HTML version of the spec and could cause hotlinks to the specific sections discussing enumeration sets to change.
+    - Add URIs for sets of enumeration values. This changed some fragment identifiers in the HTML version of the spec and could cause hotlinks to the specific sections discussing enumeration sets to change.
 
     - Many updates to the YAML format served at <https://gedcom.io/terms/v7/record-INDI> and at the other URIs in the specification.
 
@@ -139,7 +160,7 @@
         - `mul` can be used if there is no single primary language, but is unlikely to provide practical functionality beyond `und`.
         - `zxx` can be used for ASCII art and other non-language text, and can improve accessibility for screen readers.
 
-- Clarify that empty *payloads* are encoded as missing `LineVal`s and empty `LineVal`s are not been permitted; this has been true since 7.0.0 but was easily overlooked in the previous text.
+- Clarify that empty *payloads* are encoded as missing `LineVal`s and empty `LineVal`s are not permitted; this has been true since 7.0.0 but was easily overlooked in the previous text.
 
 - Note cases where the same couple might be the partners in multiple `FAM` records.
 
@@ -220,7 +241,7 @@
 
 # Version 7.0.0
 
-As a major release and the first update to the specification in 20 years, there a many changes in this version.
+As a major release and the first update to the specification in 20 years, there are many changes in this version.
 
 This version is the first version to use [semantic versioning](https://semver.org/).
 7 was chosen as the new major version number because 1 through 6 were each used previously, some for released standards and others for abandoned drafts.
@@ -302,7 +323,7 @@ Earlier versions of GEDCOM predated language tags, media types, and Unicode beca
 
 ## New Extensibility
 
-- Every standard tag now has a single "default" meaning, even if it also has additional meanings in other contexts. Tags conforming to this default meaning can now be used by extensions as substructures of structures with extention tags.
+- Every standard tag now has a single "default" meaning, even if it also has additional meanings in other contexts. Tags conforming to this default meaning can now be used by extensions as substructures of structures with extension tags.
 
 - Extension tags remain in a backwards-compatible way, but should additionally be paired with a URI to avoid name collisions and provide documentation.
 
@@ -326,7 +347,7 @@ Earlier versions of GEDCOM predated language tags, media types, and Unicode beca
 
 - Age phrases are now only phrases, not long-hand terms for specific age ranges
 
-- Previously registered values (APPROVED_SYSTEM_ID, RECEIVING_SYSTEM_NAME, etc) are kept as-is if present; new ones are URIs instead of having a separate registration process
+- Previously registered values (APPROVED_SYSTEM_ID, RECEIVING_SYSTEM_NAME, etc.) are kept as-is if present; new ones are URIs instead of having a separate registration process
 
 - `RESI` may have a payload, just as all other attributes may
 
@@ -344,7 +365,7 @@ Various ambiguities were identified in version 5.5.1: some due to poor wording,
 
 - Dual-year dates were used with widely different semantics and have been replaced by more flexibility in date phrases.
 
-- `SEX` is now unambiguously biological sex at birth; all other related concepts (gender identity, sexual preference, sex reassignment, etc) are time-varying attributes and to be stored in an individual attribute instead
+- `SEX` is now unambiguously biological sex at birth; all other related concepts (gender identity, sexual preference, sex reassignment, etc.) are time-varying attributes and to be stored in an individual attribute instead
 
     Note that new tags were not introduced for gender-related attributes. It is not yet clear what the correct set of attribute types should be given the evolving and regionally-specific understanding of these concepts. The generic `FACT` is recommended for these concepts instead. 
 
diff --git a/extracted-files/README.md b/extracted-files/README.md
index b2d875d7..cf83d469 100644
--- a/extracted-files/README.md
+++ b/extracted-files/README.md
@@ -12,7 +12,7 @@ All files in this directory and its sub-directories, except for this README file
 - Various TSV files provide simple look-ups; all of this information is also available in the YAML files
     - `cardinalities.tsv` contains (superstructure type, substructure type, cardinality of substructure) triples.
     - `enumrations.tsv` contains (enumeration set, enumeration value) pairs.
-    - `enumerationsets.tsv` contaisn (structure type, enmeration set) pairs.
+    - `enumerationsets.tsv` contains (structure type, enmeration set) pairs.
     - `payloads.tsv` contains (structure type, payload type) pairs.
     - `substructures.tsv` contains (superstructure type, substructure tag, substructure type) triples.
 
diff --git a/extracted-files/cardinalities.tsv b/extracted-files/cardinalities.tsv
index 8aa44e5e..d2e45d4b 100644
--- a/extracted-files/cardinalities.tsv
+++ b/extracted-files/cardinalities.tsv
@@ -150,6 +150,7 @@ https://gedcom.io/terms/v7/RETI	https://gedcom.io/terms/v7/AGNC	{0:1}
 https://gedcom.io/terms/v7/SSN	https://gedcom.io/terms/v7/AGNC	{0:1}
 https://gedcom.io/terms/v7/WILL	https://gedcom.io/terms/v7/AGNC	{0:1}
 https://gedcom.io/terms/v7/record-INDI	https://gedcom.io/terms/v7/ALIA	{0:M}
+https://gedcom.io/terms/v7/record-SUBM	https://gedcom.io/terms/v7/SUBM-ALIA	{0:1}
 https://gedcom.io/terms/v7/record-INDI	https://gedcom.io/terms/v7/ANCI	{0:M}
 https://gedcom.io/terms/v7/record-FAM	https://gedcom.io/terms/v7/ANUL	{0:M}
 https://gedcom.io/terms/v7/ADOP	https://gedcom.io/terms/v7/ASSO	{0:M}
@@ -347,8 +348,10 @@ https://gedcom.io/terms/v7/NATU	https://gedcom.io/terms/v7/DATE	{0:1}
 https://gedcom.io/terms/v7/NMR	https://gedcom.io/terms/v7/DATE	{0:1}
 https://gedcom.io/terms/v7/OCCU	https://gedcom.io/terms/v7/DATE	{0:1}
 https://gedcom.io/terms/v7/ORDN	https://gedcom.io/terms/v7/DATE	{0:1}
+https://gedcom.io/terms/v7/PEDI	https://gedcom.io/terms/v7/DATE	{0:1}
 https://gedcom.io/terms/v7/PROB	https://gedcom.io/terms/v7/DATE	{0:1}
 https://gedcom.io/terms/v7/PROP	https://gedcom.io/terms/v7/DATE	{0:1}
+https://gedcom.io/terms/v7/REPO	https://gedcom.io/terms/v7/DATE	{0:1}
 https://gedcom.io/terms/v7/RETI	https://gedcom.io/terms/v7/DATE	{0:1}
 https://gedcom.io/terms/v7/SLGC	https://gedcom.io/terms/v7/DATE	{0:1}
 https://gedcom.io/terms/v7/SLGS	https://gedcom.io/terms/v7/DATE	{0:1}
@@ -430,7 +433,63 @@ https://gedcom.io/terms/v7/record-FAM	https://gedcom.io/terms/v7/FAM-EVEN	{0:M}
 https://gedcom.io/terms/v7/record-INDI	https://gedcom.io/terms/v7/INDI-EVEN	{0:M}
 https://gedcom.io/terms/v7/DATA	https://gedcom.io/terms/v7/DATA-EVEN	{0:M}
 https://gedcom.io/terms/v7/SOUR	https://gedcom.io/terms/v7/SOUR-EVEN	{0:1}
+https://gedcom.io/terms/v7/ADOP	https://gedcom.io/terms/v7/EXID	{0:M}
+https://gedcom.io/terms/v7/ANUL	https://gedcom.io/terms/v7/EXID	{0:M}
+https://gedcom.io/terms/v7/BAPM	https://gedcom.io/terms/v7/EXID	{0:M}
+https://gedcom.io/terms/v7/BARM	https://gedcom.io/terms/v7/EXID	{0:M}
+https://gedcom.io/terms/v7/BASM	https://gedcom.io/terms/v7/EXID	{0:M}
+https://gedcom.io/terms/v7/BIRT	https://gedcom.io/terms/v7/EXID	{0:M}
+https://gedcom.io/terms/v7/BLES	https://gedcom.io/terms/v7/EXID	{0:M}
+https://gedcom.io/terms/v7/BURI	https://gedcom.io/terms/v7/EXID	{0:M}
+https://gedcom.io/terms/v7/CAST	https://gedcom.io/terms/v7/EXID	{0:M}
+https://gedcom.io/terms/v7/CHR	https://gedcom.io/terms/v7/EXID	{0:M}
+https://gedcom.io/terms/v7/CHRA	https://gedcom.io/terms/v7/EXID	{0:M}
+https://gedcom.io/terms/v7/CONF	https://gedcom.io/terms/v7/EXID	{0:M}
+https://gedcom.io/terms/v7/CREM	https://gedcom.io/terms/v7/EXID	{0:M}
+https://gedcom.io/terms/v7/DEAT	https://gedcom.io/terms/v7/EXID	{0:M}
+https://gedcom.io/terms/v7/DIV	https://gedcom.io/terms/v7/EXID	{0:M}
+https://gedcom.io/terms/v7/DIVF	https://gedcom.io/terms/v7/EXID	{0:M}
+https://gedcom.io/terms/v7/DSCR	https://gedcom.io/terms/v7/EXID	{0:M}
+https://gedcom.io/terms/v7/EDUC	https://gedcom.io/terms/v7/EXID	{0:M}
+https://gedcom.io/terms/v7/EMIG	https://gedcom.io/terms/v7/EXID	{0:M}
+https://gedcom.io/terms/v7/ENGA	https://gedcom.io/terms/v7/EXID	{0:M}
+https://gedcom.io/terms/v7/FAM-CENS	https://gedcom.io/terms/v7/EXID	{0:M}
+https://gedcom.io/terms/v7/FAM-EVEN	https://gedcom.io/terms/v7/EXID	{0:M}
+https://gedcom.io/terms/v7/FAM-FACT	https://gedcom.io/terms/v7/EXID	{0:M}
+https://gedcom.io/terms/v7/FAM-NCHI	https://gedcom.io/terms/v7/EXID	{0:M}
+https://gedcom.io/terms/v7/FAM-RESI	https://gedcom.io/terms/v7/EXID	{0:M}
+https://gedcom.io/terms/v7/FCOM	https://gedcom.io/terms/v7/EXID	{0:M}
+https://gedcom.io/terms/v7/GRAD	https://gedcom.io/terms/v7/EXID	{0:M}
+https://gedcom.io/terms/v7/IDNO	https://gedcom.io/terms/v7/EXID	{0:M}
+https://gedcom.io/terms/v7/IMMI	https://gedcom.io/terms/v7/EXID	{0:M}
+https://gedcom.io/terms/v7/INDI-CENS	https://gedcom.io/terms/v7/EXID	{0:M}
+https://gedcom.io/terms/v7/INDI-EVEN	https://gedcom.io/terms/v7/EXID	{0:M}
+https://gedcom.io/terms/v7/INDI-FACT	https://gedcom.io/terms/v7/EXID	{0:M}
+https://gedcom.io/terms/v7/INDI-FAMC	https://gedcom.io/terms/v7/EXID	{0:M}
+https://gedcom.io/terms/v7/INDI-NAME	https://gedcom.io/terms/v7/EXID	{0:M}
+https://gedcom.io/terms/v7/INDI-NCHI	https://gedcom.io/terms/v7/EXID	{0:M}
+https://gedcom.io/terms/v7/INDI-RELI	https://gedcom.io/terms/v7/EXID	{0:M}
+https://gedcom.io/terms/v7/INDI-RESI	https://gedcom.io/terms/v7/EXID	{0:M}
+https://gedcom.io/terms/v7/INDI-TITL	https://gedcom.io/terms/v7/EXID	{0:M}
+https://gedcom.io/terms/v7/MARB	https://gedcom.io/terms/v7/EXID	{0:M}
+https://gedcom.io/terms/v7/MARC	https://gedcom.io/terms/v7/EXID	{0:M}
+https://gedcom.io/terms/v7/MARL	https://gedcom.io/terms/v7/EXID	{0:M}
+https://gedcom.io/terms/v7/MARR	https://gedcom.io/terms/v7/EXID	{0:M}
+https://gedcom.io/terms/v7/MARS	https://gedcom.io/terms/v7/EXID	{0:M}
+https://gedcom.io/terms/v7/NATI	https://gedcom.io/terms/v7/EXID	{0:M}
+https://gedcom.io/terms/v7/NATU	https://gedcom.io/terms/v7/EXID	{0:M}
+https://gedcom.io/terms/v7/NMR	https://gedcom.io/terms/v7/EXID	{0:M}
+https://gedcom.io/terms/v7/NOTE	https://gedcom.io/terms/v7/EXID	{0:M}
+https://gedcom.io/terms/v7/OCCU	https://gedcom.io/terms/v7/EXID	{0:M}
+https://gedcom.io/terms/v7/ORDN	https://gedcom.io/terms/v7/EXID	{0:M}
 https://gedcom.io/terms/v7/PLAC	https://gedcom.io/terms/v7/EXID	{0:M}
+https://gedcom.io/terms/v7/PROB	https://gedcom.io/terms/v7/EXID	{0:M}
+https://gedcom.io/terms/v7/PROP	https://gedcom.io/terms/v7/EXID	{0:M}
+https://gedcom.io/terms/v7/RETI	https://gedcom.io/terms/v7/EXID	{0:M}
+https://gedcom.io/terms/v7/SEX	https://gedcom.io/terms/v7/EXID	{0:M}
+https://gedcom.io/terms/v7/SOUR	https://gedcom.io/terms/v7/EXID	{0:M}
+https://gedcom.io/terms/v7/SSN	https://gedcom.io/terms/v7/EXID	{0:M}
+https://gedcom.io/terms/v7/WILL	https://gedcom.io/terms/v7/EXID	{0:M}
 https://gedcom.io/terms/v7/record-FAM	https://gedcom.io/terms/v7/EXID	{0:M}
 https://gedcom.io/terms/v7/record-INDI	https://gedcom.io/terms/v7/EXID	{0:M}
 https://gedcom.io/terms/v7/record-OBJE	https://gedcom.io/terms/v7/EXID	{0:M}
@@ -529,6 +588,9 @@ https://gedcom.io/terms/v7/record-FAM	https://gedcom.io/terms/v7/FAM-HUSB	{0:1}
 https://gedcom.io/terms/v7/record-INDI	https://gedcom.io/terms/v7/IDNO	{0:M}
 https://gedcom.io/terms/v7/record-INDI	https://gedcom.io/terms/v7/IMMI	{0:M}
 https://gedcom.io/terms/v7/record-INDI	https://gedcom.io/terms/v7/INIL	{0:M}
+https://gedcom.io/terms/v7/BURI	https://gedcom.io/terms/v7/BURI-KIND	{0:1}
+https://gedcom.io/terms/v7/MARR	https://gedcom.io/terms/v7/MARR-KIND	{0:1}
+https://gedcom.io/terms/v7/INDI-NAME	https://gedcom.io/terms/v7/LANG	{0:1}
 https://gedcom.io/terms/v7/NAME-TRAN	https://gedcom.io/terms/v7/LANG	{1:1}
 https://gedcom.io/terms/v7/NOTE	https://gedcom.io/terms/v7/LANG	{0:1}
 https://gedcom.io/terms/v7/NOTE-TRAN	https://gedcom.io/terms/v7/LANG	{0:1}
@@ -564,6 +626,7 @@ https://gedcom.io/terms/v7/record-INDI	https://gedcom.io/terms/v7/INDI-NCHI	{0:M
 https://gedcom.io/terms/v7/INDI-NAME	https://gedcom.io/terms/v7/NICK	{0:M}
 https://gedcom.io/terms/v7/NAME-TRAN	https://gedcom.io/terms/v7/NICK	{0:M}
 https://gedcom.io/terms/v7/record-INDI	https://gedcom.io/terms/v7/NMR	{0:M}
+https://gedcom.io/terms/v7/INDI-NAME	https://gedcom.io/terms/v7/NO	{0:M}
 https://gedcom.io/terms/v7/record-FAM	https://gedcom.io/terms/v7/NO	{0:M}
 https://gedcom.io/terms/v7/record-INDI	https://gedcom.io/terms/v7/NO	{0:M}
 https://gedcom.io/terms/v7/ADOP	https://gedcom.io/terms/v7/NOTE	{0:M}
@@ -703,7 +766,7 @@ https://gedcom.io/terms/v7/record-SUBM	https://gedcom.io/terms/v7/OBJE	{0:M}
 https://gedcom.io/terms/v7/record-INDI	https://gedcom.io/terms/v7/OCCU	{0:M}
 https://gedcom.io/terms/v7/record-INDI	https://gedcom.io/terms/v7/ORDN	{0:M}
 https://gedcom.io/terms/v7/SOUR	https://gedcom.io/terms/v7/PAGE	{0:1}
-https://gedcom.io/terms/v7/INDI-FAMC	https://gedcom.io/terms/v7/PEDI	{0:1}
+https://gedcom.io/terms/v7/INDI-FAMC	https://gedcom.io/terms/v7/PEDI	{0:M}
 https://gedcom.io/terms/v7/ADOP	https://gedcom.io/terms/v7/PHON	{0:M}
 https://gedcom.io/terms/v7/ANUL	https://gedcom.io/terms/v7/PHON	{0:M}
 https://gedcom.io/terms/v7/BAPM	https://gedcom.io/terms/v7/PHON	{0:M}
@@ -775,6 +838,7 @@ https://gedcom.io/terms/v7/PEDI	https://gedcom.io/terms/v7/PHRASE	{0:1}
 https://gedcom.io/terms/v7/ROLE	https://gedcom.io/terms/v7/PHRASE	{0:1}
 https://gedcom.io/terms/v7/SDATE	https://gedcom.io/terms/v7/PHRASE	{0:1}
 https://gedcom.io/terms/v7/SOUR-EVEN	https://gedcom.io/terms/v7/PHRASE	{0:1}
+https://gedcom.io/terms/v7/TIME	https://gedcom.io/terms/v7/PHRASE	{0:1}
 https://gedcom.io/terms/v7/ADOP	https://gedcom.io/terms/v7/PLAC	{0:1}
 https://gedcom.io/terms/v7/ANUL	https://gedcom.io/terms/v7/PLAC	{0:1}
 https://gedcom.io/terms/v7/BAPL	https://gedcom.io/terms/v7/PLAC	{0:1}
@@ -839,6 +903,7 @@ https://gedcom.io/terms/v7/record-INDI	https://gedcom.io/terms/v7/PROB	{0:M}
 https://gedcom.io/terms/v7/record-INDI	https://gedcom.io/terms/v7/PROP	{0:M}
 https://gedcom.io/terms/v7/record-SOUR	https://gedcom.io/terms/v7/PUBL	{0:1}
 https://gedcom.io/terms/v7/SOUR	https://gedcom.io/terms/v7/QUAY	{0:1}
+https://gedcom.io/terms/v7/NOTE	https://gedcom.io/terms/v7/REFN	{0:M}
 https://gedcom.io/terms/v7/record-FAM	https://gedcom.io/terms/v7/REFN	{0:M}
 https://gedcom.io/terms/v7/record-INDI	https://gedcom.io/terms/v7/REFN	{0:M}
 https://gedcom.io/terms/v7/record-OBJE	https://gedcom.io/terms/v7/REFN	{0:M}
@@ -930,6 +995,7 @@ https://gedcom.io/terms/v7/IMMI	https://gedcom.io/terms/v7/RESN	{0:1}
 https://gedcom.io/terms/v7/INDI-CENS	https://gedcom.io/terms/v7/RESN	{0:1}
 https://gedcom.io/terms/v7/INDI-EVEN	https://gedcom.io/terms/v7/RESN	{0:1}
 https://gedcom.io/terms/v7/INDI-FACT	https://gedcom.io/terms/v7/RESN	{0:1}
+https://gedcom.io/terms/v7/INDI-NAME	https://gedcom.io/terms/v7/RESN	{0:1}
 https://gedcom.io/terms/v7/INDI-NCHI	https://gedcom.io/terms/v7/RESN	{0:1}
 https://gedcom.io/terms/v7/INDI-RELI	https://gedcom.io/terms/v7/RESN	{0:1}
 https://gedcom.io/terms/v7/INDI-RESI	https://gedcom.io/terms/v7/RESN	{0:1}
@@ -942,16 +1008,22 @@ https://gedcom.io/terms/v7/MARS	https://gedcom.io/terms/v7/RESN	{0:1}
 https://gedcom.io/terms/v7/NATI	https://gedcom.io/terms/v7/RESN	{0:1}
 https://gedcom.io/terms/v7/NATU	https://gedcom.io/terms/v7/RESN	{0:1}
 https://gedcom.io/terms/v7/NMR	https://gedcom.io/terms/v7/RESN	{0:1}
+https://gedcom.io/terms/v7/NOTE	https://gedcom.io/terms/v7/RESN	{0:1}
 https://gedcom.io/terms/v7/OCCU	https://gedcom.io/terms/v7/RESN	{0:1}
 https://gedcom.io/terms/v7/ORDN	https://gedcom.io/terms/v7/RESN	{0:1}
 https://gedcom.io/terms/v7/PROB	https://gedcom.io/terms/v7/RESN	{0:1}
 https://gedcom.io/terms/v7/PROP	https://gedcom.io/terms/v7/RESN	{0:1}
 https://gedcom.io/terms/v7/RETI	https://gedcom.io/terms/v7/RESN	{0:1}
+https://gedcom.io/terms/v7/SOUR	https://gedcom.io/terms/v7/RESN	{0:1}
 https://gedcom.io/terms/v7/SSN	https://gedcom.io/terms/v7/RESN	{0:1}
 https://gedcom.io/terms/v7/WILL	https://gedcom.io/terms/v7/RESN	{0:1}
 https://gedcom.io/terms/v7/record-FAM	https://gedcom.io/terms/v7/RESN	{0:1}
 https://gedcom.io/terms/v7/record-INDI	https://gedcom.io/terms/v7/RESN	{0:1}
 https://gedcom.io/terms/v7/record-OBJE	https://gedcom.io/terms/v7/RESN	{0:1}
+https://gedcom.io/terms/v7/record-REPO	https://gedcom.io/terms/v7/RESN	{0:1}
+https://gedcom.io/terms/v7/record-SNOTE	https://gedcom.io/terms/v7/RESN	{0:1}
+https://gedcom.io/terms/v7/record-SOUR	https://gedcom.io/terms/v7/RESN	{0:1}
+https://gedcom.io/terms/v7/record-SUBM	https://gedcom.io/terms/v7/RESN	{0:1}
 https://gedcom.io/terms/v7/record-SOUR	https://gedcom.io/terms/v7/REPO	{0:M}
 https://gedcom.io/terms/v7/record-FAM	https://gedcom.io/terms/v7/FAM-RESI	{0:M}
 https://gedcom.io/terms/v7/record-INDI	https://gedcom.io/terms/v7/INDI-RESI	{0:M}
@@ -1146,12 +1218,14 @@ https://gedcom.io/terms/v7/PROP	https://gedcom.io/terms/v7/SOUR	{0:M}
 https://gedcom.io/terms/v7/RETI	https://gedcom.io/terms/v7/SOUR	{0:M}
 https://gedcom.io/terms/v7/SLGC	https://gedcom.io/terms/v7/SOUR	{0:M}
 https://gedcom.io/terms/v7/SLGS	https://gedcom.io/terms/v7/SOUR	{0:M}
+https://gedcom.io/terms/v7/SOUR	https://gedcom.io/terms/v7/SOUR	{0:M}
 https://gedcom.io/terms/v7/SSN	https://gedcom.io/terms/v7/SOUR	{0:M}
 https://gedcom.io/terms/v7/WILL	https://gedcom.io/terms/v7/SOUR	{0:M}
 https://gedcom.io/terms/v7/record-FAM	https://gedcom.io/terms/v7/SOUR	{0:M}
 https://gedcom.io/terms/v7/record-INDI	https://gedcom.io/terms/v7/SOUR	{0:M}
 https://gedcom.io/terms/v7/record-OBJE	https://gedcom.io/terms/v7/SOUR	{0:M}
 https://gedcom.io/terms/v7/record-SNOTE	https://gedcom.io/terms/v7/SOUR	{0:M}
+https://gedcom.io/terms/v7/record-SOUR	https://gedcom.io/terms/v7/SOUR	{0:M}
 https://gedcom.io/terms/v7/HEAD	https://gedcom.io/terms/v7/HEAD-SOUR	{0:1}
 https://gedcom.io/terms/v7/INDI-NAME	https://gedcom.io/terms/v7/SPFX	{0:M}
 https://gedcom.io/terms/v7/NAME-TRAN	https://gedcom.io/terms/v7/SPFX	{0:M}
@@ -1179,9 +1253,9 @@ https://gedcom.io/terms/v7/SLGS	https://gedcom.io/terms/v7/TEMP	{0:1}
 https://gedcom.io/terms/v7/SOUR-DATA	https://gedcom.io/terms/v7/TEXT	{0:M}
 https://gedcom.io/terms/v7/record-SOUR	https://gedcom.io/terms/v7/TEXT	{0:1}
 https://gedcom.io/terms/v7/DATE	https://gedcom.io/terms/v7/TIME	{0:1}
-https://gedcom.io/terms/v7/DATE-exact	https://gedcom.io/terms/v7/TIME	{0:1}
-https://gedcom.io/terms/v7/HEAD-DATE	https://gedcom.io/terms/v7/TIME	{0:1}
 https://gedcom.io/terms/v7/SDATE	https://gedcom.io/terms/v7/TIME	{0:1}
+https://gedcom.io/terms/v7/DATE-exact	https://gedcom.io/terms/v7/TIME-exact	{0:1}
+https://gedcom.io/terms/v7/HEAD-DATE	https://gedcom.io/terms/v7/TIME-exact	{0:1}
 https://gedcom.io/terms/v7/FILE	https://gedcom.io/terms/v7/TITL	{0:1}
 https://gedcom.io/terms/v7/OBJE	https://gedcom.io/terms/v7/TITL	{0:1}
 https://gedcom.io/terms/v7/record-SOUR	https://gedcom.io/terms/v7/TITL	{0:1}
@@ -1290,6 +1364,7 @@ https://gedcom.io/terms/v7/MARS	https://gedcom.io/terms/v7/UID	{0:M}
 https://gedcom.io/terms/v7/NATI	https://gedcom.io/terms/v7/UID	{0:M}
 https://gedcom.io/terms/v7/NATU	https://gedcom.io/terms/v7/UID	{0:M}
 https://gedcom.io/terms/v7/NMR	https://gedcom.io/terms/v7/UID	{0:M}
+https://gedcom.io/terms/v7/NOTE	https://gedcom.io/terms/v7/UID	{0:M}
 https://gedcom.io/terms/v7/OCCU	https://gedcom.io/terms/v7/UID	{0:M}
 https://gedcom.io/terms/v7/ORDN	https://gedcom.io/terms/v7/UID	{0:M}
 https://gedcom.io/terms/v7/PROB	https://gedcom.io/terms/v7/UID	{0:M}
diff --git a/extracted-files/enumerations.tsv b/extracted-files/enumerations.tsv
index 59b9aaec..2cf4fe2e 100644
--- a/extracted-files/enumerations.tsv
+++ b/extracted-files/enumerations.tsv
@@ -1,8 +1,10 @@
 https://gedcom.io/terms/v7/FAMC-ADOP	https://gedcom.io/terms/v7/enumset-ADOP
 https://gedcom.io/terms/v7/DATA-EVEN	https://gedcom.io/terms/v7/enumset-EVENATTR
 https://gedcom.io/terms/v7/SOUR-EVEN	https://gedcom.io/terms/v7/enumset-EVENATTR
+https://gedcom.io/terms/v7/BURI-KIND	https://gedcom.io/terms/v7/enumset-BURI-KIND
+https://gedcom.io/terms/v7/MARR-KIND	https://gedcom.io/terms/v7/enumset-MARR-KIND
 https://gedcom.io/terms/v7/MEDI	https://gedcom.io/terms/v7/enumset-MEDI
-https://gedcom.io/terms/v7/NO	https://gedcom.io/terms/v7/enumset-EVEN
+https://gedcom.io/terms/v7/NO	https://gedcom.io/terms/v7/enumset-NO
 https://gedcom.io/terms/v7/PEDI	https://gedcom.io/terms/v7/enumset-PEDI
 https://gedcom.io/terms/v7/QUAY	https://gedcom.io/terms/v7/enumset-QUAY
 https://gedcom.io/terms/v7/RESN	https://gedcom.io/terms/v7/enumset-RESN
diff --git a/extracted-files/enumerationsets.tsv b/extracted-files/enumerationsets.tsv
index bd103f15..eb0de8b2 100644
--- a/extracted-files/enumerationsets.tsv
+++ b/extracted-files/enumerationsets.tsv
@@ -1,37 +1,11 @@
 https://gedcom.io/terms/v7/enumset-ADOP	https://gedcom.io/terms/v7/enum-ADOP-HUSB
 https://gedcom.io/terms/v7/enumset-ADOP	https://gedcom.io/terms/v7/enum-ADOP-WIFE
 https://gedcom.io/terms/v7/enumset-ADOP	https://gedcom.io/terms/v7/enum-BOTH
-https://gedcom.io/terms/v7/enumset-EVEN	https://gedcom.io/terms/v7/enum-CENS
-https://gedcom.io/terms/v7/enumset-EVEN	https://gedcom.io/terms/v7/ADOP
-https://gedcom.io/terms/v7/enumset-EVEN	https://gedcom.io/terms/v7/BAPM
-https://gedcom.io/terms/v7/enumset-EVEN	https://gedcom.io/terms/v7/BARM
-https://gedcom.io/terms/v7/enumset-EVEN	https://gedcom.io/terms/v7/BASM
-https://gedcom.io/terms/v7/enumset-EVEN	https://gedcom.io/terms/v7/BIRT
-https://gedcom.io/terms/v7/enumset-EVEN	https://gedcom.io/terms/v7/BLES
-https://gedcom.io/terms/v7/enumset-EVEN	https://gedcom.io/terms/v7/BURI
-https://gedcom.io/terms/v7/enumset-EVEN	https://gedcom.io/terms/v7/CHR
-https://gedcom.io/terms/v7/enumset-EVEN	https://gedcom.io/terms/v7/CHRA
-https://gedcom.io/terms/v7/enumset-EVEN	https://gedcom.io/terms/v7/CONF
-https://gedcom.io/terms/v7/enumset-EVEN	https://gedcom.io/terms/v7/CREM
-https://gedcom.io/terms/v7/enumset-EVEN	https://gedcom.io/terms/v7/DEAT
-https://gedcom.io/terms/v7/enumset-EVEN	https://gedcom.io/terms/v7/EMIG
-https://gedcom.io/terms/v7/enumset-EVEN	https://gedcom.io/terms/v7/FCOM
-https://gedcom.io/terms/v7/enumset-EVEN	https://gedcom.io/terms/v7/GRAD
-https://gedcom.io/terms/v7/enumset-EVEN	https://gedcom.io/terms/v7/IMMI
-https://gedcom.io/terms/v7/enumset-EVEN	https://gedcom.io/terms/v7/NATU
-https://gedcom.io/terms/v7/enumset-EVEN	https://gedcom.io/terms/v7/ORDN
-https://gedcom.io/terms/v7/enumset-EVEN	https://gedcom.io/terms/v7/PROB
-https://gedcom.io/terms/v7/enumset-EVEN	https://gedcom.io/terms/v7/RETI
-https://gedcom.io/terms/v7/enumset-EVEN	https://gedcom.io/terms/v7/WILL
-https://gedcom.io/terms/v7/enumset-EVEN	https://gedcom.io/terms/v7/ANUL
-https://gedcom.io/terms/v7/enumset-EVEN	https://gedcom.io/terms/v7/DIV
-https://gedcom.io/terms/v7/enumset-EVEN	https://gedcom.io/terms/v7/DIVF
-https://gedcom.io/terms/v7/enumset-EVEN	https://gedcom.io/terms/v7/ENGA
-https://gedcom.io/terms/v7/enumset-EVEN	https://gedcom.io/terms/v7/MARB
-https://gedcom.io/terms/v7/enumset-EVEN	https://gedcom.io/terms/v7/MARC
-https://gedcom.io/terms/v7/enumset-EVEN	https://gedcom.io/terms/v7/MARL
-https://gedcom.io/terms/v7/enumset-EVEN	https://gedcom.io/terms/v7/MARR
-https://gedcom.io/terms/v7/enumset-EVEN	https://gedcom.io/terms/v7/MARS
+https://gedcom.io/terms/v7/enumset-BURI-KIND	https://gedcom.io/terms/v7/enum-GRAVE
+https://gedcom.io/terms/v7/enumset-BURI-KIND	https://gedcom.io/terms/v7/enum-VAULT
+https://gedcom.io/terms/v7/enumset-BURI-KIND	https://gedcom.io/terms/v7/enum-SEA
+https://gedcom.io/terms/v7/enumset-BURI-KIND	https://gedcom.io/terms/v7/enum-SKY
+https://gedcom.io/terms/v7/enumset-BURI-KIND	https://gedcom.io/terms/v7/enum-OTHER
 https://gedcom.io/terms/v7/enumset-EVENATTR	https://gedcom.io/terms/v7/enum-CENS
 https://gedcom.io/terms/v7/enumset-EVENATTR	https://gedcom.io/terms/v7/enum-NCHI
 https://gedcom.io/terms/v7/enumset-EVENATTR	https://gedcom.io/terms/v7/enum-RESI
@@ -78,9 +52,15 @@ https://gedcom.io/terms/v7/enumset-EVENATTR	https://gedcom.io/terms/v7/PROP
 https://gedcom.io/terms/v7/enumset-EVENATTR	https://gedcom.io/terms/v7/RELI
 https://gedcom.io/terms/v7/enumset-EVENATTR	https://gedcom.io/terms/v7/SSN
 https://gedcom.io/terms/v7/enumset-EVENATTR	https://gedcom.io/terms/v7/TITL
+https://gedcom.io/terms/v7/enumset-MARR-KIND	https://gedcom.io/terms/v7/enum-CIVIL
+https://gedcom.io/terms/v7/enumset-MARR-KIND	https://gedcom.io/terms/v7/enum-COMMON_LAW
+https://gedcom.io/terms/v7/enumset-MARR-KIND	https://gedcom.io/terms/v7/enum-INFORMAL
+https://gedcom.io/terms/v7/enumset-MARR-KIND	https://gedcom.io/terms/v7/enum-RELIGIOUS
+https://gedcom.io/terms/v7/enumset-MARR-KIND	https://gedcom.io/terms/v7/enum-OTHER
 https://gedcom.io/terms/v7/enumset-MEDI	https://gedcom.io/terms/v7/enum-AUDIO
 https://gedcom.io/terms/v7/enumset-MEDI	https://gedcom.io/terms/v7/enum-BOOK
 https://gedcom.io/terms/v7/enumset-MEDI	https://gedcom.io/terms/v7/enum-CARD
+https://gedcom.io/terms/v7/enumset-MEDI	https://gedcom.io/terms/v7/enum-DIGITAL
 https://gedcom.io/terms/v7/enumset-MEDI	https://gedcom.io/terms/v7/enum-ELECTRONIC
 https://gedcom.io/terms/v7/enumset-MEDI	https://gedcom.io/terms/v7/enum-FICHE
 https://gedcom.io/terms/v7/enumset-MEDI	https://gedcom.io/terms/v7/enum-FILM
@@ -88,10 +68,12 @@ https://gedcom.io/terms/v7/enumset-MEDI	https://gedcom.io/terms/v7/enum-MAGAZINE
 https://gedcom.io/terms/v7/enumset-MEDI	https://gedcom.io/terms/v7/enum-MANUSCRIPT
 https://gedcom.io/terms/v7/enumset-MEDI	https://gedcom.io/terms/v7/enum-MAP
 https://gedcom.io/terms/v7/enumset-MEDI	https://gedcom.io/terms/v7/enum-NEWSPAPER
+https://gedcom.io/terms/v7/enumset-MEDI	https://gedcom.io/terms/v7/enum-ONLINE
 https://gedcom.io/terms/v7/enumset-MEDI	https://gedcom.io/terms/v7/enum-PHOTO
 https://gedcom.io/terms/v7/enumset-MEDI	https://gedcom.io/terms/v7/enum-TOMBSTONE
 https://gedcom.io/terms/v7/enumset-MEDI	https://gedcom.io/terms/v7/enum-VIDEO
 https://gedcom.io/terms/v7/enumset-MEDI	https://gedcom.io/terms/v7/enum-OTHER
+https://gedcom.io/terms/v7/enumset-NO	https://gedcom.io/terms/v7/enum-CENS
 https://gedcom.io/terms/v7/enumset-PEDI	https://gedcom.io/terms/v7/enum-ADOPTED
 https://gedcom.io/terms/v7/enumset-PEDI	https://gedcom.io/terms/v7/enum-BIRTH
 https://gedcom.io/terms/v7/enumset-PEDI	https://gedcom.io/terms/v7/enum-FOSTER
@@ -138,6 +120,7 @@ https://gedcom.io/terms/v7/enumset-ord-STAT	https://gedcom.io/terms/v7/enum-PRE_
 https://gedcom.io/terms/v7/enumset-ord-STAT	https://gedcom.io/terms/v7/enum-STILLBORN
 https://gedcom.io/terms/v7/enumset-ord-STAT	https://gedcom.io/terms/v7/enum-SUBMITTED
 https://gedcom.io/terms/v7/enumset-ord-STAT	https://gedcom.io/terms/v7/enum-UNCLEARED
+https://gedcom.io/terms/v7/enumset-NAME-TYPE	https://gedcom.io/terms/v7/enum-ADOPTED
 https://gedcom.io/terms/v7/enumset-NAME-TYPE	https://gedcom.io/terms/v7/enum-AKA
 https://gedcom.io/terms/v7/enumset-NAME-TYPE	https://gedcom.io/terms/v7/enum-BIRTH
 https://gedcom.io/terms/v7/enumset-NAME-TYPE	https://gedcom.io/terms/v7/enum-IMMIGRANT
diff --git a/extracted-files/grammar.gedstruct b/extracted-files/grammar.gedstruct
index 7d0309c9..93e101c5 100644
--- a/extracted-files/grammar.gedstruct
+++ b/extracted-files/grammar.gedstruct
@@ -39,11 +39,11 @@ n HEAD                                     {1:1}  g7:HEAD
         +3 WWW <Special>                   {0:M}  g7:WWW
      +2 DATA <Text>                        {0:1}  g7:HEAD-SOUR-DATA
         +3 DATE <DateExact>                {0:1}  g7:DATE-exact
-           +4 TIME <Time>                  {0:1}  g7:TIME
+           +4 TIME <Time>                  {0:1}  g7:TIME-exact
         +3 COPR <Text>                     {0:1}  g7:COPR
   +1 DEST <Special>                        {0:1}  g7:DEST
   +1 DATE <DateExact>                      {0:1}  g7:HEAD-DATE
-     +2 TIME <Time>                        {0:1}  g7:TIME
+     +2 TIME <Time>                        {0:1}  g7:TIME-exact
   +1 SUBM @<XREF:SUBM>@                    {0:1}  g7:SUBM
   +1 COPR <Text>                           {0:1}  g7:COPR
   +1 LANG <Language>                       {0:1}  g7:HEAD-LANG
@@ -57,7 +57,7 @@ n @XREF:FAM@ FAM                           {1:1}  g7:record-FAM
   +1 RESN <List:Enum>                      {0:1}  g7:RESN
   +1 <<FAMILY_ATTRIBUTE_STRUCTURE>>        {0:M}
   +1 <<FAMILY_EVENT_STRUCTURE>>            {0:M}
-  +1 <<NON_EVENT_STRUCTURE>>               {0:M}
+  +1 <<NEGATIVE_ASSERTION>>                {0:M}
   +1 HUSB @<XREF:INDI>@                    {0:1}  g7:FAM-HUSB
      +2 PHRASE <Text>                      {0:1}  g7:PHRASE
   +1 WIFE @<XREF:INDI>@                    {0:1}  g7:FAM-WIFE
@@ -80,16 +80,21 @@ n @XREF:INDI@ INDI                         {1:1}  g7:record-INDI
   +1 RESN <List:Enum>                      {0:1}  g7:RESN
   +1 <<PERSONAL_NAME_STRUCTURE>>           {0:M}
   +1 SEX <Enum>                            {0:1}  g7:SEX
+     +2 EXID <Special>                     {0:M}  g7:EXID
+        +3 TYPE <Special>                  {0:1}  g7:EXID-TYPE
   +1 <<INDIVIDUAL_ATTRIBUTE_STRUCTURE>>    {0:M}
   +1 <<INDIVIDUAL_EVENT_STRUCTURE>>        {0:M}
-  +1 <<NON_EVENT_STRUCTURE>>               {0:M}
+  +1 <<NEGATIVE_ASSERTION>>                {0:M}
   +1 <<LDS_INDIVIDUAL_ORDINANCE>>          {0:M}
   +1 FAMC @<XREF:FAM>@                     {0:M}  g7:INDI-FAMC
-     +2 PEDI <Enum>                        {0:1}  g7:PEDI
+     +2 PEDI <Enum>                        {0:M}  g7:PEDI
         +3 PHRASE <Text>                   {0:1}  g7:PHRASE
+        +3 DATE <DateValue>                {0:1}  g7:DATE
      +2 STAT <Enum>                        {0:1}  g7:FAMC-STAT
         +3 PHRASE <Text>                   {0:1}  g7:PHRASE
      +2 <<NOTE_STRUCTURE>>                 {0:M}
+     +2 EXID <Special>                     {0:M}  g7:EXID
+        +3 TYPE <Special>                  {0:1}  g7:EXID-TYPE
   +1 FAMS @<XREF:FAM>@                     {0:M}  g7:FAMS
      +2 <<NOTE_STRUCTURE>>                 {0:M}
   +1 SUBM @<XREF:SUBM>@                    {0:M}  g7:SUBM
@@ -125,6 +130,7 @@ n @XREF:OBJE@ OBJE                         {1:1}  g7:record-OBJE
 
 REPOSITORY_RECORD :=
 n @XREF:REPO@ REPO                         {1:1}  g7:record-REPO
+  +1 RESN <List:Enum>                      {0:1}  g7:RESN
   +1 NAME <Text>                           {1:1}  g7:NAME
   +1 <<ADDRESS_STRUCTURE>>                 {0:1}
   +1 PHON <Special>                        {0:M}  g7:PHON
@@ -139,6 +145,7 @@ n @XREF:REPO@ REPO                         {1:1}  g7:record-REPO
 
 SHARED_NOTE_RECORD :=
 n @XREF:SNOTE@ SNOTE <Text>                {1:1}  g7:record-SNOTE
+  +1 RESN <List:Enum>                      {0:1}  g7:RESN
   +1 MIME <MediaType>                      {0:1}  g7:MIME
   +1 LANG <Language>                       {0:1}  g7:LANG
   +1 TRAN <Text>                           {0:M}  g7:NOTE-TRAN
@@ -152,6 +159,7 @@ n @XREF:SNOTE@ SNOTE <Text>                {1:1}  g7:record-SNOTE
 
 SOURCE_RECORD :=
 n @XREF:SOUR@ SOUR                         {1:1}  g7:record-SOUR
+  +1 RESN <List:Enum>                      {0:1}  g7:RESN
   +1 DATA                                  {0:1}  g7:DATA
      +2 EVEN <List:Enum>                   {0:M}  g7:DATA-EVEN
         +3 DATE <DatePeriod>               {0:1}  g7:DATA-EVEN-DATE
@@ -169,6 +177,7 @@ n @XREF:SOUR@ SOUR                         {1:1}  g7:record-SOUR
   +1 <<SOURCE_REPOSITORY_CITATION>>        {0:M}
   +1 <<IDENTIFIER_STRUCTURE>>              {0:M}
   +1 <<NOTE_STRUCTURE>>                    {0:M}
+  +1 <<SOURCE_CITATION>>                   {0:M}
   +1 <<MULTIMEDIA_LINK>>                   {0:M}
   +1 <<CHANGE_DATE>>                       {0:1}
   +1 <<CREATION_DATE>>                     {0:1}
@@ -176,6 +185,7 @@ n @XREF:SOUR@ SOUR                         {1:1}  g7:record-SOUR
 
 SUBMITTER_RECORD :=
 n @XREF:SUBM@ SUBM                         {1:1}  g7:record-SUBM
+  +1 RESN <List:Enum>                      {0:1}  g7:RESN
   +1 NAME <Text>                           {1:1}  g7:NAME
   +1 <<ADDRESS_STRUCTURE>>                 {0:1}
   +1 PHON <Special>                        {0:M}  g7:PHON
@@ -184,6 +194,7 @@ n @XREF:SUBM@ SUBM                         {1:1}  g7:record-SUBM
   +1 WWW <Special>                         {0:M}  g7:WWW
   +1 <<MULTIMEDIA_LINK>>                   {0:M}
   +1 LANG <Language>                       {0:M}  g7:SUBM-LANG
+  +1 ALIA @<XREF:INDI>@                    {0:1}  g7:SUBM-ALIA
   +1 <<IDENTIFIER_STRUCTURE>>              {0:M}
   +1 <<NOTE_STRUCTURE>>                    {0:M}
   +1 <<CHANGE_DATE>>                       {0:1}
@@ -213,19 +224,20 @@ n ASSO @<XREF:INDI>@                       {1:1}  g7:ASSO
 CHANGE_DATE :=
 n CHAN                                     {1:1}  g7:CHAN
   +1 DATE <DateExact>                      {1:1}  g7:DATE-exact
-     +2 TIME <Time>                        {0:1}  g7:TIME
+     +2 TIME <Time>                        {0:1}  g7:TIME-exact
   +1 <<NOTE_STRUCTURE>>                    {0:M}
 
 
 CREATION_DATE :=
 n CREA                                     {1:1}  g7:CREA
   +1 DATE <DateExact>                      {1:1}  g7:DATE-exact
-     +2 TIME <Time>                        {0:1}  g7:TIME
+     +2 TIME <Time>                        {0:1}  g7:TIME-exact
 
 
 DATE_VALUE :=
 n DATE <DateValue>                         {1:1}  g7:DATE
   +1 TIME <Time>                           {0:1}  g7:TIME
+     +2 PHRASE <Text>                      {0:1}  g7:PHRASE
   +1 PHRASE <Text>                         {0:1}  g7:PHRASE
 
 
@@ -243,12 +255,15 @@ n CAUS <Text>                              {0:1}  g7:CAUS
 n RESN <List:Enum>                         {0:1}  g7:RESN
 n SDATE <DateValue>                        {0:1}  g7:SDATE
   +1 TIME <Time>                           {0:1}  g7:TIME
+     +2 PHRASE <Text>                      {0:1}  g7:PHRASE
   +1 PHRASE <Text>                         {0:1}  g7:PHRASE
 n <<ASSOCIATION_STRUCTURE>>                {0:M}
 n <<NOTE_STRUCTURE>>                       {0:M}
 n <<SOURCE_CITATION>>                      {0:M}
 n <<MULTIMEDIA_LINK>>                      {0:M}
 n UID <Special>                            {0:M}  g7:UID
+n EXID <Special>                           {0:M}  g7:EXID
+  +1 TYPE <Special>                        {0:1}  g7:EXID-TYPE
 
 
 FAMILY_ATTRIBUTE_STRUCTURE :=
@@ -313,6 +328,7 @@ n MARL [Y|<NULL>]                          {1:1}  g7:MARL
 |
 n MARR [Y|<NULL>]                          {1:1}  g7:MARR
   +1 TYPE <Text>                           {0:1}  g7:TYPE
+  +1 KIND <Enum>                           {0:1}  g7:MARR-KIND
   +1 <<FAMILY_EVENT_DETAIL>>               {0:1}
 |
 n MARS [Y|<NULL>]                          {1:1}  g7:MARS
@@ -398,9 +414,9 @@ n FACT <Text>                              {1:1}  g7:INDI-FACT
 
 
 INDIVIDUAL_EVENT_DETAIL :=
-n <<EVENT_DETAIL>>                         {1:1}
 n AGE <Age>                                {0:1}  g7:AGE
   +1 PHRASE <Text>                         {0:1}  g7:PHRASE
+n <<EVENT_DETAIL>>                         {1:1}
 
 
 INDIVIDUAL_EVENT_STRUCTURE :=
@@ -435,6 +451,7 @@ n BLES [Y|<NULL>]                          {1:1}  g7:BLES
 |
 n BURI [Y|<NULL>]                          {1:1}  g7:BURI
   +1 TYPE <Text>                           {0:1}  g7:TYPE
+  +1 KIND <Enum>                           {0:1}  g7:BURI-KIND
   +1 <<INDIVIDUAL_EVENT_DETAIL>>           {0:1}
 |
 n CENS [Y|<NULL>]                          {1:1}  g7:INDI-CENS
@@ -530,7 +547,7 @@ n TEMP <Text>                            {0:1}  g7:TEMP
 n <<PLACE_STRUCTURE>>                    {0:1}
 n STAT <Enum>                            {0:1}  g7:ord-STAT
   +1 DATE <DateExact>                    {1:1}  g7:DATE-exact
-     +2 TIME <Time>                      {0:1}  g7:TIME
+     +2 TIME <Time>                      {0:1}  g7:TIME-exact
 n <<NOTE_STRUCTURE>>                     {0:M}
 n <<SOURCE_CITATION>>                    {0:M}
 
@@ -550,7 +567,7 @@ n OBJE @<XREF:OBJE>@                       {1:1}  g7:OBJE
   +1 TITL <Text>                           {0:1}  g7:TITL
 
 
-NON_EVENT_STRUCTURE :=
+NEGATIVE_ASSERTION :=
 n NO <Enum>                                {1:1}  g7:NO
   +1 DATE <DatePeriod>                     {0:1}  g7:NO-DATE
      +2 PHRASE <Text>                      {0:1}  g7:PHRASE
@@ -566,6 +583,8 @@ n NOTE <Text>                              {1:1}  g7:NOTE
   +1 TRAN <Text>                           {0:M}  g7:NOTE-TRAN
      +2 MIME <MediaType>                   {0:1}  g7:MIME
      +2 LANG <Language>                    {0:1}  g7:LANG
+  +1 RESN <List:Enum>                      {0:1}  g7:RESN
+  +1 <<IDENTIFIER_STRUCTURE>>              {0:M}
   +1 <<SOURCE_CITATION>>                   {0:M}
 |
 n SNOTE @<XREF:SNOTE>@                     {1:1}  g7:SNOTE
@@ -583,14 +602,19 @@ n NSFX <Text>                              {0:M}  g7:NSFX
 
 PERSONAL_NAME_STRUCTURE :=
 n NAME <PersonalName>                      {1:1}  g7:INDI-NAME
+  +1 RESN <List:Enum>                      {0:1}  g7:RESN
   +1 TYPE <Enum>                           {0:1}  g7:NAME-TYPE
      +2 PHRASE <Text>                      {0:1}  g7:PHRASE
   +1 <<PERSONAL_NAME_PIECES>>              {0:1}
+  +1 LANG <Language>                       {0:1}  g7:LANG
   +1 TRAN <PersonalName>                   {0:M}  g7:NAME-TRAN
      +2 LANG <Language>                    {1:1}  g7:LANG
      +2 <<PERSONAL_NAME_PIECES>>           {0:1}
+  +1 <<NEGATIVE_ASSERTION>>                {0:M}
   +1 <<NOTE_STRUCTURE>>                    {0:M}
   +1 <<SOURCE_CITATION>>                   {0:M}
+  +1 EXID <Special>                        {0:M}  g7:EXID
+     +2 TYPE <Special>                     {0:1}  g7:EXID-TYPE
 
 
 PLACE_STRUCTURE :=
@@ -609,6 +633,8 @@ n PLAC <List:Text>                         {1:1}  g7:PLAC
 
 SOURCE_CITATION :=
 n SOUR @<XREF:SOUR>@                       {1:1}  g7:SOUR
+  +1 RESN <List:Enum>                      {0:1}  g7:RESN
+  +1 <<SOURCE_CITATION>>                   {0:M}
   +1 PAGE <Text>                           {0:1}  g7:PAGE
   +1 DATA                                  {0:1}  g7:SOUR-DATA
      +2 <<DATE_VALUE>>                     {0:1}
@@ -622,6 +648,8 @@ n SOUR @<XREF:SOUR>@                       {1:1}  g7:SOUR
   +1 QUAY <Enum>                           {0:1}  g7:QUAY
   +1 <<MULTIMEDIA_LINK>>                   {0:M}
   +1 <<NOTE_STRUCTURE>>                    {0:M}
+  +1 EXID <Special>                        {0:M}  g7:EXID
+     +2 TYPE <Special>                     {0:1}  g7:EXID-TYPE
 
 
 SOURCE_REPOSITORY_CITATION :=
@@ -630,5 +658,6 @@ n REPO @<XREF:REPO>@                       {1:1}  g7:REPO
   +1 CALN <Special>                        {0:M}  g7:CALN
      +2 MEDI <Enum>                        {0:1}  g7:MEDI
         +3 PHRASE <Text>                   {0:1}  g7:PHRASE
+  +1 DATE <DateValue>                      {0:1}  g7:DATE
 
 
diff --git a/extracted-files/payloads.tsv b/extracted-files/payloads.tsv
index f9224ee4..36ffc96e 100644
--- a/extracted-files/payloads.tsv
+++ b/extracted-files/payloads.tsv
@@ -8,6 +8,7 @@ https://gedcom.io/terms/v7/ADR3	http://www.w3.org/2001/XMLSchema#string
 https://gedcom.io/terms/v7/AGE	https://gedcom.io/terms/v7/type-Age
 https://gedcom.io/terms/v7/AGNC	http://www.w3.org/2001/XMLSchema#string
 https://gedcom.io/terms/v7/ALIA	@<https://gedcom.io/terms/v7/record-INDI>@
+https://gedcom.io/terms/v7/SUBM-ALIA	@<https://gedcom.io/terms/v7/record-INDI>@
 https://gedcom.io/terms/v7/ANCI	@<https://gedcom.io/terms/v7/record-SUBM>@
 https://gedcom.io/terms/v7/ANUL	Y|<NULL>
 https://gedcom.io/terms/v7/ASSO	@<https://gedcom.io/terms/v7/record-INDI>@
@@ -86,6 +87,8 @@ https://gedcom.io/terms/v7/IDNO	http://www.w3.org/2001/XMLSchema#string
 https://gedcom.io/terms/v7/IMMI	Y|<NULL>
 https://gedcom.io/terms/v7/record-INDI	
 https://gedcom.io/terms/v7/INIL	
+https://gedcom.io/terms/v7/BURI-KIND	https://gedcom.io/terms/v7/type-Enum
+https://gedcom.io/terms/v7/MARR-KIND	https://gedcom.io/terms/v7/type-Enum
 https://gedcom.io/terms/v7/LANG	http://www.w3.org/2001/XMLSchema#Language
 https://gedcom.io/terms/v7/HEAD-LANG	http://www.w3.org/2001/XMLSchema#Language
 https://gedcom.io/terms/v7/SUBM-LANG	http://www.w3.org/2001/XMLSchema#Language
@@ -159,6 +162,7 @@ https://gedcom.io/terms/v7/TAG	http://www.w3.org/2001/XMLSchema#string
 https://gedcom.io/terms/v7/TEMP	http://www.w3.org/2001/XMLSchema#string
 https://gedcom.io/terms/v7/TEXT	http://www.w3.org/2001/XMLSchema#string
 https://gedcom.io/terms/v7/TIME	https://gedcom.io/terms/v7/type-Time
+https://gedcom.io/terms/v7/TIME-exact	https://gedcom.io/terms/v7/type-Time
 https://gedcom.io/terms/v7/TITL	http://www.w3.org/2001/XMLSchema#string
 https://gedcom.io/terms/v7/INDI-TITL	http://www.w3.org/2001/XMLSchema#string
 https://gedcom.io/terms/v7/TOP	http://www.w3.org/2001/XMLSchema#nonNegativeInteger
diff --git a/extracted-files/substructures.tsv b/extracted-files/substructures.tsv
index 3ef62369..c2aabad0 100644
--- a/extracted-files/substructures.tsv
+++ b/extracted-files/substructures.tsv
@@ -150,6 +150,7 @@ https://gedcom.io/terms/v7/RETI	AGNC	https://gedcom.io/terms/v7/AGNC
 https://gedcom.io/terms/v7/SSN	AGNC	https://gedcom.io/terms/v7/AGNC
 https://gedcom.io/terms/v7/WILL	AGNC	https://gedcom.io/terms/v7/AGNC
 https://gedcom.io/terms/v7/record-INDI	ALIA	https://gedcom.io/terms/v7/ALIA
+https://gedcom.io/terms/v7/record-SUBM	ALIA	https://gedcom.io/terms/v7/SUBM-ALIA
 https://gedcom.io/terms/v7/record-INDI	ANCI	https://gedcom.io/terms/v7/ANCI
 https://gedcom.io/terms/v7/record-FAM	ANUL	https://gedcom.io/terms/v7/ANUL
 https://gedcom.io/terms/v7/ADOP	ASSO	https://gedcom.io/terms/v7/ASSO
@@ -348,8 +349,10 @@ https://gedcom.io/terms/v7/NATU	DATE	https://gedcom.io/terms/v7/DATE
 https://gedcom.io/terms/v7/NMR	DATE	https://gedcom.io/terms/v7/DATE
 https://gedcom.io/terms/v7/OCCU	DATE	https://gedcom.io/terms/v7/DATE
 https://gedcom.io/terms/v7/ORDN	DATE	https://gedcom.io/terms/v7/DATE
+https://gedcom.io/terms/v7/PEDI	DATE	https://gedcom.io/terms/v7/DATE
 https://gedcom.io/terms/v7/PROB	DATE	https://gedcom.io/terms/v7/DATE
 https://gedcom.io/terms/v7/PROP	DATE	https://gedcom.io/terms/v7/DATE
+https://gedcom.io/terms/v7/REPO	DATE	https://gedcom.io/terms/v7/DATE
 https://gedcom.io/terms/v7/RETI	DATE	https://gedcom.io/terms/v7/DATE
 https://gedcom.io/terms/v7/SLGC	DATE	https://gedcom.io/terms/v7/DATE
 https://gedcom.io/terms/v7/SLGS	DATE	https://gedcom.io/terms/v7/DATE
@@ -431,7 +434,63 @@ https://gedcom.io/terms/v7/record-FAM	EVEN	https://gedcom.io/terms/v7/FAM-EVEN
 https://gedcom.io/terms/v7/record-INDI	EVEN	https://gedcom.io/terms/v7/INDI-EVEN
 https://gedcom.io/terms/v7/DATA	EVEN	https://gedcom.io/terms/v7/DATA-EVEN
 https://gedcom.io/terms/v7/SOUR	EVEN	https://gedcom.io/terms/v7/SOUR-EVEN
+https://gedcom.io/terms/v7/ADOP	EXID	https://gedcom.io/terms/v7/EXID
+https://gedcom.io/terms/v7/ANUL	EXID	https://gedcom.io/terms/v7/EXID
+https://gedcom.io/terms/v7/BAPM	EXID	https://gedcom.io/terms/v7/EXID
+https://gedcom.io/terms/v7/BARM	EXID	https://gedcom.io/terms/v7/EXID
+https://gedcom.io/terms/v7/BASM	EXID	https://gedcom.io/terms/v7/EXID
+https://gedcom.io/terms/v7/BIRT	EXID	https://gedcom.io/terms/v7/EXID
+https://gedcom.io/terms/v7/BLES	EXID	https://gedcom.io/terms/v7/EXID
+https://gedcom.io/terms/v7/BURI	EXID	https://gedcom.io/terms/v7/EXID
+https://gedcom.io/terms/v7/CAST	EXID	https://gedcom.io/terms/v7/EXID
+https://gedcom.io/terms/v7/CHR	EXID	https://gedcom.io/terms/v7/EXID
+https://gedcom.io/terms/v7/CHRA	EXID	https://gedcom.io/terms/v7/EXID
+https://gedcom.io/terms/v7/CONF	EXID	https://gedcom.io/terms/v7/EXID
+https://gedcom.io/terms/v7/CREM	EXID	https://gedcom.io/terms/v7/EXID
+https://gedcom.io/terms/v7/DEAT	EXID	https://gedcom.io/terms/v7/EXID
+https://gedcom.io/terms/v7/DIV	EXID	https://gedcom.io/terms/v7/EXID
+https://gedcom.io/terms/v7/DIVF	EXID	https://gedcom.io/terms/v7/EXID
+https://gedcom.io/terms/v7/DSCR	EXID	https://gedcom.io/terms/v7/EXID
+https://gedcom.io/terms/v7/EDUC	EXID	https://gedcom.io/terms/v7/EXID
+https://gedcom.io/terms/v7/EMIG	EXID	https://gedcom.io/terms/v7/EXID
+https://gedcom.io/terms/v7/ENGA	EXID	https://gedcom.io/terms/v7/EXID
+https://gedcom.io/terms/v7/FAM-CENS	EXID	https://gedcom.io/terms/v7/EXID
+https://gedcom.io/terms/v7/FAM-EVEN	EXID	https://gedcom.io/terms/v7/EXID
+https://gedcom.io/terms/v7/FAM-FACT	EXID	https://gedcom.io/terms/v7/EXID
+https://gedcom.io/terms/v7/FAM-NCHI	EXID	https://gedcom.io/terms/v7/EXID
+https://gedcom.io/terms/v7/FAM-RESI	EXID	https://gedcom.io/terms/v7/EXID
+https://gedcom.io/terms/v7/FCOM	EXID	https://gedcom.io/terms/v7/EXID
+https://gedcom.io/terms/v7/GRAD	EXID	https://gedcom.io/terms/v7/EXID
+https://gedcom.io/terms/v7/IDNO	EXID	https://gedcom.io/terms/v7/EXID
+https://gedcom.io/terms/v7/IMMI	EXID	https://gedcom.io/terms/v7/EXID
+https://gedcom.io/terms/v7/INDI-CENS	EXID	https://gedcom.io/terms/v7/EXID
+https://gedcom.io/terms/v7/INDI-EVEN	EXID	https://gedcom.io/terms/v7/EXID
+https://gedcom.io/terms/v7/INDI-FACT	EXID	https://gedcom.io/terms/v7/EXID
+https://gedcom.io/terms/v7/INDI-FAMC	EXID	https://gedcom.io/terms/v7/EXID
+https://gedcom.io/terms/v7/INDI-NAME	EXID	https://gedcom.io/terms/v7/EXID
+https://gedcom.io/terms/v7/INDI-NCHI	EXID	https://gedcom.io/terms/v7/EXID
+https://gedcom.io/terms/v7/INDI-RELI	EXID	https://gedcom.io/terms/v7/EXID
+https://gedcom.io/terms/v7/INDI-RESI	EXID	https://gedcom.io/terms/v7/EXID
+https://gedcom.io/terms/v7/INDI-TITL	EXID	https://gedcom.io/terms/v7/EXID
+https://gedcom.io/terms/v7/MARB	EXID	https://gedcom.io/terms/v7/EXID
+https://gedcom.io/terms/v7/MARC	EXID	https://gedcom.io/terms/v7/EXID
+https://gedcom.io/terms/v7/MARL	EXID	https://gedcom.io/terms/v7/EXID
+https://gedcom.io/terms/v7/MARR	EXID	https://gedcom.io/terms/v7/EXID
+https://gedcom.io/terms/v7/MARS	EXID	https://gedcom.io/terms/v7/EXID
+https://gedcom.io/terms/v7/NATI	EXID	https://gedcom.io/terms/v7/EXID
+https://gedcom.io/terms/v7/NATU	EXID	https://gedcom.io/terms/v7/EXID
+https://gedcom.io/terms/v7/NMR	EXID	https://gedcom.io/terms/v7/EXID
+https://gedcom.io/terms/v7/NOTE	EXID	https://gedcom.io/terms/v7/EXID
+https://gedcom.io/terms/v7/OCCU	EXID	https://gedcom.io/terms/v7/EXID
+https://gedcom.io/terms/v7/ORDN	EXID	https://gedcom.io/terms/v7/EXID
 https://gedcom.io/terms/v7/PLAC	EXID	https://gedcom.io/terms/v7/EXID
+https://gedcom.io/terms/v7/PROB	EXID	https://gedcom.io/terms/v7/EXID
+https://gedcom.io/terms/v7/PROP	EXID	https://gedcom.io/terms/v7/EXID
+https://gedcom.io/terms/v7/RETI	EXID	https://gedcom.io/terms/v7/EXID
+https://gedcom.io/terms/v7/SEX	EXID	https://gedcom.io/terms/v7/EXID
+https://gedcom.io/terms/v7/SOUR	EXID	https://gedcom.io/terms/v7/EXID
+https://gedcom.io/terms/v7/SSN	EXID	https://gedcom.io/terms/v7/EXID
+https://gedcom.io/terms/v7/WILL	EXID	https://gedcom.io/terms/v7/EXID
 https://gedcom.io/terms/v7/record-FAM	EXID	https://gedcom.io/terms/v7/EXID
 https://gedcom.io/terms/v7/record-INDI	EXID	https://gedcom.io/terms/v7/EXID
 https://gedcom.io/terms/v7/record-OBJE	EXID	https://gedcom.io/terms/v7/EXID
@@ -533,6 +592,9 @@ https://gedcom.io/terms/v7/record-INDI	IDNO	https://gedcom.io/terms/v7/IDNO
 https://gedcom.io/terms/v7/record-INDI	IMMI	https://gedcom.io/terms/v7/IMMI
 	INDI	https://gedcom.io/terms/v7/record-INDI
 https://gedcom.io/terms/v7/record-INDI	INIL	https://gedcom.io/terms/v7/INIL
+https://gedcom.io/terms/v7/BURI	KIND	https://gedcom.io/terms/v7/BURI-KIND
+https://gedcom.io/terms/v7/MARR	KIND	https://gedcom.io/terms/v7/MARR-KIND
+https://gedcom.io/terms/v7/INDI-NAME	LANG	https://gedcom.io/terms/v7/LANG
 https://gedcom.io/terms/v7/NAME-TRAN	LANG	https://gedcom.io/terms/v7/LANG
 https://gedcom.io/terms/v7/NOTE	LANG	https://gedcom.io/terms/v7/LANG
 https://gedcom.io/terms/v7/NOTE-TRAN	LANG	https://gedcom.io/terms/v7/LANG
@@ -568,6 +630,7 @@ https://gedcom.io/terms/v7/record-INDI	NCHI	https://gedcom.io/terms/v7/INDI-NCHI
 https://gedcom.io/terms/v7/INDI-NAME	NICK	https://gedcom.io/terms/v7/NICK
 https://gedcom.io/terms/v7/NAME-TRAN	NICK	https://gedcom.io/terms/v7/NICK
 https://gedcom.io/terms/v7/record-INDI	NMR	https://gedcom.io/terms/v7/NMR
+https://gedcom.io/terms/v7/INDI-NAME	NO	https://gedcom.io/terms/v7/NO
 https://gedcom.io/terms/v7/record-FAM	NO	https://gedcom.io/terms/v7/NO
 https://gedcom.io/terms/v7/record-INDI	NO	https://gedcom.io/terms/v7/NO
 https://gedcom.io/terms/v7/ADOP	NOTE	https://gedcom.io/terms/v7/NOTE
@@ -780,6 +843,7 @@ https://gedcom.io/terms/v7/PEDI	PHRASE	https://gedcom.io/terms/v7/PHRASE
 https://gedcom.io/terms/v7/ROLE	PHRASE	https://gedcom.io/terms/v7/PHRASE
 https://gedcom.io/terms/v7/SDATE	PHRASE	https://gedcom.io/terms/v7/PHRASE
 https://gedcom.io/terms/v7/SOUR-EVEN	PHRASE	https://gedcom.io/terms/v7/PHRASE
+https://gedcom.io/terms/v7/TIME	PHRASE	https://gedcom.io/terms/v7/PHRASE
 https://gedcom.io/terms/v7/ADOP	PLAC	https://gedcom.io/terms/v7/PLAC
 https://gedcom.io/terms/v7/ANUL	PLAC	https://gedcom.io/terms/v7/PLAC
 https://gedcom.io/terms/v7/BAPL	PLAC	https://gedcom.io/terms/v7/PLAC
@@ -844,6 +908,7 @@ https://gedcom.io/terms/v7/record-INDI	PROB	https://gedcom.io/terms/v7/PROB
 https://gedcom.io/terms/v7/record-INDI	PROP	https://gedcom.io/terms/v7/PROP
 https://gedcom.io/terms/v7/record-SOUR	PUBL	https://gedcom.io/terms/v7/PUBL
 https://gedcom.io/terms/v7/SOUR	QUAY	https://gedcom.io/terms/v7/QUAY
+https://gedcom.io/terms/v7/NOTE	REFN	https://gedcom.io/terms/v7/REFN
 https://gedcom.io/terms/v7/record-FAM	REFN	https://gedcom.io/terms/v7/REFN
 https://gedcom.io/terms/v7/record-INDI	REFN	https://gedcom.io/terms/v7/REFN
 https://gedcom.io/terms/v7/record-OBJE	REFN	https://gedcom.io/terms/v7/REFN
@@ -935,6 +1000,7 @@ https://gedcom.io/terms/v7/IMMI	RESN	https://gedcom.io/terms/v7/RESN
 https://gedcom.io/terms/v7/INDI-CENS	RESN	https://gedcom.io/terms/v7/RESN
 https://gedcom.io/terms/v7/INDI-EVEN	RESN	https://gedcom.io/terms/v7/RESN
 https://gedcom.io/terms/v7/INDI-FACT	RESN	https://gedcom.io/terms/v7/RESN
+https://gedcom.io/terms/v7/INDI-NAME	RESN	https://gedcom.io/terms/v7/RESN
 https://gedcom.io/terms/v7/INDI-NCHI	RESN	https://gedcom.io/terms/v7/RESN
 https://gedcom.io/terms/v7/INDI-RELI	RESN	https://gedcom.io/terms/v7/RESN
 https://gedcom.io/terms/v7/INDI-RESI	RESN	https://gedcom.io/terms/v7/RESN
@@ -947,16 +1013,22 @@ https://gedcom.io/terms/v7/MARS	RESN	https://gedcom.io/terms/v7/RESN
 https://gedcom.io/terms/v7/NATI	RESN	https://gedcom.io/terms/v7/RESN
 https://gedcom.io/terms/v7/NATU	RESN	https://gedcom.io/terms/v7/RESN
 https://gedcom.io/terms/v7/NMR	RESN	https://gedcom.io/terms/v7/RESN
+https://gedcom.io/terms/v7/NOTE	RESN	https://gedcom.io/terms/v7/RESN
 https://gedcom.io/terms/v7/OCCU	RESN	https://gedcom.io/terms/v7/RESN
 https://gedcom.io/terms/v7/ORDN	RESN	https://gedcom.io/terms/v7/RESN
 https://gedcom.io/terms/v7/PROB	RESN	https://gedcom.io/terms/v7/RESN
 https://gedcom.io/terms/v7/PROP	RESN	https://gedcom.io/terms/v7/RESN
 https://gedcom.io/terms/v7/RETI	RESN	https://gedcom.io/terms/v7/RESN
+https://gedcom.io/terms/v7/SOUR	RESN	https://gedcom.io/terms/v7/RESN
 https://gedcom.io/terms/v7/SSN	RESN	https://gedcom.io/terms/v7/RESN
 https://gedcom.io/terms/v7/WILL	RESN	https://gedcom.io/terms/v7/RESN
 https://gedcom.io/terms/v7/record-FAM	RESN	https://gedcom.io/terms/v7/RESN
 https://gedcom.io/terms/v7/record-INDI	RESN	https://gedcom.io/terms/v7/RESN
 https://gedcom.io/terms/v7/record-OBJE	RESN	https://gedcom.io/terms/v7/RESN
+https://gedcom.io/terms/v7/record-REPO	RESN	https://gedcom.io/terms/v7/RESN
+https://gedcom.io/terms/v7/record-SNOTE	RESN	https://gedcom.io/terms/v7/RESN
+https://gedcom.io/terms/v7/record-SOUR	RESN	https://gedcom.io/terms/v7/RESN
+https://gedcom.io/terms/v7/record-SUBM	RESN	https://gedcom.io/terms/v7/RESN
 https://gedcom.io/terms/v7/record-SOUR	REPO	https://gedcom.io/terms/v7/REPO
 	REPO	https://gedcom.io/terms/v7/record-REPO
 https://gedcom.io/terms/v7/record-FAM	RESI	https://gedcom.io/terms/v7/FAM-RESI
@@ -1153,12 +1225,14 @@ https://gedcom.io/terms/v7/PROP	SOUR	https://gedcom.io/terms/v7/SOUR
 https://gedcom.io/terms/v7/RETI	SOUR	https://gedcom.io/terms/v7/SOUR
 https://gedcom.io/terms/v7/SLGC	SOUR	https://gedcom.io/terms/v7/SOUR
 https://gedcom.io/terms/v7/SLGS	SOUR	https://gedcom.io/terms/v7/SOUR
+https://gedcom.io/terms/v7/SOUR	SOUR	https://gedcom.io/terms/v7/SOUR
 https://gedcom.io/terms/v7/SSN	SOUR	https://gedcom.io/terms/v7/SOUR
 https://gedcom.io/terms/v7/WILL	SOUR	https://gedcom.io/terms/v7/SOUR
 https://gedcom.io/terms/v7/record-FAM	SOUR	https://gedcom.io/terms/v7/SOUR
 https://gedcom.io/terms/v7/record-INDI	SOUR	https://gedcom.io/terms/v7/SOUR
 https://gedcom.io/terms/v7/record-OBJE	SOUR	https://gedcom.io/terms/v7/SOUR
 https://gedcom.io/terms/v7/record-SNOTE	SOUR	https://gedcom.io/terms/v7/SOUR
+https://gedcom.io/terms/v7/record-SOUR	SOUR	https://gedcom.io/terms/v7/SOUR
 	SOUR	https://gedcom.io/terms/v7/record-SOUR
 https://gedcom.io/terms/v7/HEAD	SOUR	https://gedcom.io/terms/v7/HEAD-SOUR
 https://gedcom.io/terms/v7/INDI-NAME	SPFX	https://gedcom.io/terms/v7/SPFX
@@ -1188,9 +1262,9 @@ https://gedcom.io/terms/v7/SLGS	TEMP	https://gedcom.io/terms/v7/TEMP
 https://gedcom.io/terms/v7/SOUR-DATA	TEXT	https://gedcom.io/terms/v7/TEXT
 https://gedcom.io/terms/v7/record-SOUR	TEXT	https://gedcom.io/terms/v7/TEXT
 https://gedcom.io/terms/v7/DATE	TIME	https://gedcom.io/terms/v7/TIME
-https://gedcom.io/terms/v7/DATE-exact	TIME	https://gedcom.io/terms/v7/TIME
-https://gedcom.io/terms/v7/HEAD-DATE	TIME	https://gedcom.io/terms/v7/TIME
 https://gedcom.io/terms/v7/SDATE	TIME	https://gedcom.io/terms/v7/TIME
+https://gedcom.io/terms/v7/DATE-exact	TIME	https://gedcom.io/terms/v7/TIME-exact
+https://gedcom.io/terms/v7/HEAD-DATE	TIME	https://gedcom.io/terms/v7/TIME-exact
 https://gedcom.io/terms/v7/FILE	TITL	https://gedcom.io/terms/v7/TITL
 https://gedcom.io/terms/v7/OBJE	TITL	https://gedcom.io/terms/v7/TITL
 https://gedcom.io/terms/v7/record-SOUR	TITL	https://gedcom.io/terms/v7/TITL
@@ -1300,6 +1374,7 @@ https://gedcom.io/terms/v7/MARS	UID	https://gedcom.io/terms/v7/UID
 https://gedcom.io/terms/v7/NATI	UID	https://gedcom.io/terms/v7/UID
 https://gedcom.io/terms/v7/NATU	UID	https://gedcom.io/terms/v7/UID
 https://gedcom.io/terms/v7/NMR	UID	https://gedcom.io/terms/v7/UID
+https://gedcom.io/terms/v7/NOTE	UID	https://gedcom.io/terms/v7/UID
 https://gedcom.io/terms/v7/OCCU	UID	https://gedcom.io/terms/v7/UID
 https://gedcom.io/terms/v7/ORDN	UID	https://gedcom.io/terms/v7/UID
 https://gedcom.io/terms/v7/PROB	UID	https://gedcom.io/terms/v7/UID
diff --git a/extracted-files/tags/ADOP b/extracted-files/tags/ADOP
index 99c0e227..7872bbdc 100644
--- a/extracted-files/tags/ADOP
+++ b/extracted-files/tags/ADOP
@@ -28,6 +28,7 @@ substructures:
   "https://gedcom.io/terms/v7/CAUS": "{0:1}"
   "https://gedcom.io/terms/v7/DATE": "{0:1}"
   "https://gedcom.io/terms/v7/EMAIL": "{0:M}"
+  "https://gedcom.io/terms/v7/EXID": "{0:M}"
   "https://gedcom.io/terms/v7/FAX": "{0:M}"
   "https://gedcom.io/terms/v7/NOTE": "{0:M}"
   "https://gedcom.io/terms/v7/OBJE": "{0:M}"
@@ -46,6 +47,5 @@ superstructures:
   "https://gedcom.io/terms/v7/record-INDI": "{0:M}"
 
 value of:
-  - "https://gedcom.io/terms/v7/enumset-EVEN"
   - "https://gedcom.io/terms/v7/enumset-EVENATTR"
 ...
diff --git a/extracted-files/tags/ANUL b/extracted-files/tags/ANUL
index a69daf96..097a302a 100644
--- a/extracted-files/tags/ANUL
+++ b/extracted-files/tags/ANUL
@@ -25,6 +25,7 @@ substructures:
   "https://gedcom.io/terms/v7/CAUS": "{0:1}"
   "https://gedcom.io/terms/v7/DATE": "{0:1}"
   "https://gedcom.io/terms/v7/EMAIL": "{0:M}"
+  "https://gedcom.io/terms/v7/EXID": "{0:M}"
   "https://gedcom.io/terms/v7/FAX": "{0:M}"
   "https://gedcom.io/terms/v7/HUSB": "{0:1}"
   "https://gedcom.io/terms/v7/NOTE": "{0:M}"
@@ -45,6 +46,5 @@ superstructures:
   "https://gedcom.io/terms/v7/record-FAM": "{0:M}"
 
 value of:
-  - "https://gedcom.io/terms/v7/enumset-EVEN"
   - "https://gedcom.io/terms/v7/enumset-EVENATTR"
 ...
diff --git a/extracted-files/tags/BAPM b/extracted-files/tags/BAPM
index 31d0a514..16ef1c50 100644
--- a/extracted-files/tags/BAPM
+++ b/extracted-files/tags/BAPM
@@ -26,6 +26,7 @@ substructures:
   "https://gedcom.io/terms/v7/CAUS": "{0:1}"
   "https://gedcom.io/terms/v7/DATE": "{0:1}"
   "https://gedcom.io/terms/v7/EMAIL": "{0:M}"
+  "https://gedcom.io/terms/v7/EXID": "{0:M}"
   "https://gedcom.io/terms/v7/FAX": "{0:M}"
   "https://gedcom.io/terms/v7/NOTE": "{0:M}"
   "https://gedcom.io/terms/v7/OBJE": "{0:M}"
@@ -44,6 +45,5 @@ superstructures:
   "https://gedcom.io/terms/v7/record-INDI": "{0:M}"
 
 value of:
-  - "https://gedcom.io/terms/v7/enumset-EVEN"
   - "https://gedcom.io/terms/v7/enumset-EVENATTR"
 ...
diff --git a/extracted-files/tags/BARM b/extracted-files/tags/BARM
index e7765c11..8c744263 100644
--- a/extracted-files/tags/BARM
+++ b/extracted-files/tags/BARM
@@ -26,6 +26,7 @@ substructures:
   "https://gedcom.io/terms/v7/CAUS": "{0:1}"
   "https://gedcom.io/terms/v7/DATE": "{0:1}"
   "https://gedcom.io/terms/v7/EMAIL": "{0:M}"
+  "https://gedcom.io/terms/v7/EXID": "{0:M}"
   "https://gedcom.io/terms/v7/FAX": "{0:M}"
   "https://gedcom.io/terms/v7/NOTE": "{0:M}"
   "https://gedcom.io/terms/v7/OBJE": "{0:M}"
@@ -44,6 +45,5 @@ superstructures:
   "https://gedcom.io/terms/v7/record-INDI": "{0:M}"
 
 value of:
-  - "https://gedcom.io/terms/v7/enumset-EVEN"
   - "https://gedcom.io/terms/v7/enumset-EVENATTR"
 ...
diff --git a/extracted-files/tags/BASM b/extracted-files/tags/BASM
index a2b9200b..e7b2a538 100644
--- a/extracted-files/tags/BASM
+++ b/extracted-files/tags/BASM
@@ -27,6 +27,7 @@ substructures:
   "https://gedcom.io/terms/v7/CAUS": "{0:1}"
   "https://gedcom.io/terms/v7/DATE": "{0:1}"
   "https://gedcom.io/terms/v7/EMAIL": "{0:M}"
+  "https://gedcom.io/terms/v7/EXID": "{0:M}"
   "https://gedcom.io/terms/v7/FAX": "{0:M}"
   "https://gedcom.io/terms/v7/NOTE": "{0:M}"
   "https://gedcom.io/terms/v7/OBJE": "{0:M}"
@@ -45,6 +46,5 @@ superstructures:
   "https://gedcom.io/terms/v7/record-INDI": "{0:M}"
 
 value of:
-  - "https://gedcom.io/terms/v7/enumset-EVEN"
   - "https://gedcom.io/terms/v7/enumset-EVENATTR"
 ...
diff --git a/extracted-files/tags/BIRT b/extracted-files/tags/BIRT
index a3cd24b0..3cf2e93f 100644
--- a/extracted-files/tags/BIRT
+++ b/extracted-files/tags/BIRT
@@ -26,6 +26,7 @@ substructures:
   "https://gedcom.io/terms/v7/CAUS": "{0:1}"
   "https://gedcom.io/terms/v7/DATE": "{0:1}"
   "https://gedcom.io/terms/v7/EMAIL": "{0:M}"
+  "https://gedcom.io/terms/v7/EXID": "{0:M}"
   "https://gedcom.io/terms/v7/FAMC": "{0:1}"
   "https://gedcom.io/terms/v7/FAX": "{0:M}"
   "https://gedcom.io/terms/v7/NOTE": "{0:M}"
@@ -45,6 +46,5 @@ superstructures:
   "https://gedcom.io/terms/v7/record-INDI": "{0:M}"
 
 value of:
-  - "https://gedcom.io/terms/v7/enumset-EVEN"
   - "https://gedcom.io/terms/v7/enumset-EVENATTR"
 ...
diff --git a/extracted-files/tags/BLES b/extracted-files/tags/BLES
index 50a956a5..a71db47a 100644
--- a/extracted-files/tags/BLES
+++ b/extracted-files/tags/BLES
@@ -27,6 +27,7 @@ substructures:
   "https://gedcom.io/terms/v7/CAUS": "{0:1}"
   "https://gedcom.io/terms/v7/DATE": "{0:1}"
   "https://gedcom.io/terms/v7/EMAIL": "{0:M}"
+  "https://gedcom.io/terms/v7/EXID": "{0:M}"
   "https://gedcom.io/terms/v7/FAX": "{0:M}"
   "https://gedcom.io/terms/v7/NOTE": "{0:M}"
   "https://gedcom.io/terms/v7/OBJE": "{0:M}"
@@ -45,6 +46,5 @@ superstructures:
   "https://gedcom.io/terms/v7/record-INDI": "{0:M}"
 
 value of:
-  - "https://gedcom.io/terms/v7/enumset-EVEN"
   - "https://gedcom.io/terms/v7/enumset-EVENATTR"
 ...
diff --git a/extracted-files/tags/BURI b/extracted-files/tags/BURI
index ce193931..6810837e 100644
--- a/extracted-files/tags/BURI
+++ b/extracted-files/tags/BURI
@@ -31,9 +31,11 @@ substructures:
   "https://gedcom.io/terms/v7/AGE": "{0:1}"
   "https://gedcom.io/terms/v7/AGNC": "{0:1}"
   "https://gedcom.io/terms/v7/ASSO": "{0:M}"
+  "https://gedcom.io/terms/v7/BURI-KIND": "{0:1}"
   "https://gedcom.io/terms/v7/CAUS": "{0:1}"
   "https://gedcom.io/terms/v7/DATE": "{0:1}"
   "https://gedcom.io/terms/v7/EMAIL": "{0:M}"
+  "https://gedcom.io/terms/v7/EXID": "{0:M}"
   "https://gedcom.io/terms/v7/FAX": "{0:M}"
   "https://gedcom.io/terms/v7/NOTE": "{0:M}"
   "https://gedcom.io/terms/v7/OBJE": "{0:M}"
@@ -52,6 +54,5 @@ superstructures:
   "https://gedcom.io/terms/v7/record-INDI": "{0:M}"
 
 value of:
-  - "https://gedcom.io/terms/v7/enumset-EVEN"
   - "https://gedcom.io/terms/v7/enumset-EVENATTR"
 ...
diff --git a/extracted-files/tags/BURI-KIND b/extracted-files/tags/BURI-KIND
new file mode 100644
index 00000000..8814220e
--- /dev/null
+++ b/extracted-files/tags/BURI-KIND
@@ -0,0 +1,31 @@
+%YAML 1.2
+---
+lang: en-US
+
+type: structure
+
+uri: https://gedcom.io/terms/v7/BURI-KIND
+
+standard tag: KIND
+
+specification:
+  - Kind
+  - |
+    An enumerated value from set `https://gedcom.io/terms/v7/enumset-BURI-KIND`
+    indicating what was done with the remains of the deceased.
+    
+    Note `KIND` does not have a `https://gedcom.io/terms/v7/PHRASE` substructure;
+    the `https://gedcom.io/terms/v7/TYPE` substructure of the `KIND`'s
+    superstructure should be used for that purpose instead.
+
+label: 'Kind'
+
+payload: https://gedcom.io/terms/v7/type-Enum
+
+enumeration set: "https://gedcom.io/terms/v7/enumset-BURI-KIND"
+
+substructures: {}
+
+superstructures:
+  "https://gedcom.io/terms/v7/BURI": "{0:1}"
+...
diff --git a/extracted-files/tags/CAST b/extracted-files/tags/CAST
index a7f7acf4..131790ed 100644
--- a/extracted-files/tags/CAST
+++ b/extracted-files/tags/CAST
@@ -28,6 +28,7 @@ substructures:
   "https://gedcom.io/terms/v7/CAUS": "{0:1}"
   "https://gedcom.io/terms/v7/DATE": "{0:1}"
   "https://gedcom.io/terms/v7/EMAIL": "{0:M}"
+  "https://gedcom.io/terms/v7/EXID": "{0:M}"
   "https://gedcom.io/terms/v7/FAX": "{0:M}"
   "https://gedcom.io/terms/v7/NOTE": "{0:M}"
   "https://gedcom.io/terms/v7/OBJE": "{0:M}"
diff --git a/extracted-files/tags/CHR b/extracted-files/tags/CHR
index 9d3275e1..dd02def5 100644
--- a/extracted-files/tags/CHR
+++ b/extracted-files/tags/CHR
@@ -26,6 +26,7 @@ substructures:
   "https://gedcom.io/terms/v7/CAUS": "{0:1}"
   "https://gedcom.io/terms/v7/DATE": "{0:1}"
   "https://gedcom.io/terms/v7/EMAIL": "{0:M}"
+  "https://gedcom.io/terms/v7/EXID": "{0:M}"
   "https://gedcom.io/terms/v7/FAMC": "{0:1}"
   "https://gedcom.io/terms/v7/FAX": "{0:M}"
   "https://gedcom.io/terms/v7/NOTE": "{0:M}"
@@ -45,6 +46,5 @@ superstructures:
   "https://gedcom.io/terms/v7/record-INDI": "{0:M}"
 
 value of:
-  - "https://gedcom.io/terms/v7/enumset-EVEN"
   - "https://gedcom.io/terms/v7/enumset-EVENATTR"
 ...
diff --git a/extracted-files/tags/CHRA b/extracted-files/tags/CHRA
index 3c609b2f..674e1cc0 100644
--- a/extracted-files/tags/CHRA
+++ b/extracted-files/tags/CHRA
@@ -26,6 +26,7 @@ substructures:
   "https://gedcom.io/terms/v7/CAUS": "{0:1}"
   "https://gedcom.io/terms/v7/DATE": "{0:1}"
   "https://gedcom.io/terms/v7/EMAIL": "{0:M}"
+  "https://gedcom.io/terms/v7/EXID": "{0:M}"
   "https://gedcom.io/terms/v7/FAX": "{0:M}"
   "https://gedcom.io/terms/v7/NOTE": "{0:M}"
   "https://gedcom.io/terms/v7/OBJE": "{0:M}"
@@ -44,6 +45,5 @@ superstructures:
   "https://gedcom.io/terms/v7/record-INDI": "{0:M}"
 
 value of:
-  - "https://gedcom.io/terms/v7/enumset-EVEN"
   - "https://gedcom.io/terms/v7/enumset-EVENATTR"
 ...
diff --git a/extracted-files/tags/CONF b/extracted-files/tags/CONF
index e255f82a..7b39db36 100644
--- a/extracted-files/tags/CONF
+++ b/extracted-files/tags/CONF
@@ -26,6 +26,7 @@ substructures:
   "https://gedcom.io/terms/v7/CAUS": "{0:1}"
   "https://gedcom.io/terms/v7/DATE": "{0:1}"
   "https://gedcom.io/terms/v7/EMAIL": "{0:M}"
+  "https://gedcom.io/terms/v7/EXID": "{0:M}"
   "https://gedcom.io/terms/v7/FAX": "{0:M}"
   "https://gedcom.io/terms/v7/NOTE": "{0:M}"
   "https://gedcom.io/terms/v7/OBJE": "{0:M}"
@@ -44,6 +45,5 @@ superstructures:
   "https://gedcom.io/terms/v7/record-INDI": "{0:M}"
 
 value of:
-  - "https://gedcom.io/terms/v7/enumset-EVEN"
   - "https://gedcom.io/terms/v7/enumset-EVENATTR"
 ...
diff --git a/extracted-files/tags/CREM b/extracted-files/tags/CREM
index 69ae4cad..c36b4509 100644
--- a/extracted-files/tags/CREM
+++ b/extracted-files/tags/CREM
@@ -26,6 +26,7 @@ substructures:
   "https://gedcom.io/terms/v7/CAUS": "{0:1}"
   "https://gedcom.io/terms/v7/DATE": "{0:1}"
   "https://gedcom.io/terms/v7/EMAIL": "{0:M}"
+  "https://gedcom.io/terms/v7/EXID": "{0:M}"
   "https://gedcom.io/terms/v7/FAX": "{0:M}"
   "https://gedcom.io/terms/v7/NOTE": "{0:M}"
   "https://gedcom.io/terms/v7/OBJE": "{0:M}"
@@ -44,6 +45,5 @@ superstructures:
   "https://gedcom.io/terms/v7/record-INDI": "{0:M}"
 
 value of:
-  - "https://gedcom.io/terms/v7/enumset-EVEN"
   - "https://gedcom.io/terms/v7/enumset-EVENATTR"
 ...
diff --git a/extracted-files/tags/DATE b/extracted-files/tags/DATE
index 5563801e..3519526d 100644
--- a/extracted-files/tags/DATE
+++ b/extracted-files/tags/DATE
@@ -86,8 +86,10 @@ superstructures:
   "https://gedcom.io/terms/v7/NMR": "{0:1}"
   "https://gedcom.io/terms/v7/OCCU": "{0:1}"
   "https://gedcom.io/terms/v7/ORDN": "{0:1}"
+  "https://gedcom.io/terms/v7/PEDI": "{0:1}"
   "https://gedcom.io/terms/v7/PROB": "{0:1}"
   "https://gedcom.io/terms/v7/PROP": "{0:1}"
+  "https://gedcom.io/terms/v7/REPO": "{0:1}"
   "https://gedcom.io/terms/v7/RETI": "{0:1}"
   "https://gedcom.io/terms/v7/SLGC": "{0:1}"
   "https://gedcom.io/terms/v7/SLGS": "{0:1}"
diff --git a/extracted-files/tags/DATE-exact b/extracted-files/tags/DATE-exact
index cbfcd07b..50cedd2f 100644
--- a/extracted-files/tags/DATE-exact
+++ b/extracted-files/tags/DATE-exact
@@ -18,7 +18,7 @@ label: 'Date'
 payload: https://gedcom.io/terms/v7/type-Date#exact
 
 substructures:
-  "https://gedcom.io/terms/v7/TIME": "{0:1}"
+  "https://gedcom.io/terms/v7/TIME-exact": "{0:1}"
 
 superstructures:
   "https://gedcom.io/terms/v7/CHAN": "{1:1}"
diff --git a/extracted-files/tags/DEAT b/extracted-files/tags/DEAT
index 8262217f..b522730a 100644
--- a/extracted-files/tags/DEAT
+++ b/extracted-files/tags/DEAT
@@ -26,6 +26,7 @@ substructures:
   "https://gedcom.io/terms/v7/CAUS": "{0:1}"
   "https://gedcom.io/terms/v7/DATE": "{0:1}"
   "https://gedcom.io/terms/v7/EMAIL": "{0:M}"
+  "https://gedcom.io/terms/v7/EXID": "{0:M}"
   "https://gedcom.io/terms/v7/FAX": "{0:M}"
   "https://gedcom.io/terms/v7/NOTE": "{0:M}"
   "https://gedcom.io/terms/v7/OBJE": "{0:M}"
@@ -44,6 +45,5 @@ superstructures:
   "https://gedcom.io/terms/v7/record-INDI": "{0:M}"
 
 value of:
-  - "https://gedcom.io/terms/v7/enumset-EVEN"
   - "https://gedcom.io/terms/v7/enumset-EVENATTR"
 ...
diff --git a/extracted-files/tags/DIV b/extracted-files/tags/DIV
index 7be4efae..b2bf4ee3 100644
--- a/extracted-files/tags/DIV
+++ b/extracted-files/tags/DIV
@@ -25,6 +25,7 @@ substructures:
   "https://gedcom.io/terms/v7/CAUS": "{0:1}"
   "https://gedcom.io/terms/v7/DATE": "{0:1}"
   "https://gedcom.io/terms/v7/EMAIL": "{0:M}"
+  "https://gedcom.io/terms/v7/EXID": "{0:M}"
   "https://gedcom.io/terms/v7/FAX": "{0:M}"
   "https://gedcom.io/terms/v7/HUSB": "{0:1}"
   "https://gedcom.io/terms/v7/NOTE": "{0:M}"
@@ -45,6 +46,5 @@ superstructures:
   "https://gedcom.io/terms/v7/record-FAM": "{0:M}"
 
 value of:
-  - "https://gedcom.io/terms/v7/enumset-EVEN"
   - "https://gedcom.io/terms/v7/enumset-EVENATTR"
 ...
diff --git a/extracted-files/tags/DIVF b/extracted-files/tags/DIVF
index efeae320..fe978791 100644
--- a/extracted-files/tags/DIVF
+++ b/extracted-files/tags/DIVF
@@ -25,6 +25,7 @@ substructures:
   "https://gedcom.io/terms/v7/CAUS": "{0:1}"
   "https://gedcom.io/terms/v7/DATE": "{0:1}"
   "https://gedcom.io/terms/v7/EMAIL": "{0:M}"
+  "https://gedcom.io/terms/v7/EXID": "{0:M}"
   "https://gedcom.io/terms/v7/FAX": "{0:M}"
   "https://gedcom.io/terms/v7/HUSB": "{0:1}"
   "https://gedcom.io/terms/v7/NOTE": "{0:M}"
@@ -45,6 +46,5 @@ superstructures:
   "https://gedcom.io/terms/v7/record-FAM": "{0:M}"
 
 value of:
-  - "https://gedcom.io/terms/v7/enumset-EVEN"
   - "https://gedcom.io/terms/v7/enumset-EVENATTR"
 ...
diff --git a/extracted-files/tags/DSCR b/extracted-files/tags/DSCR
index 9857f289..f0c09a74 100644
--- a/extracted-files/tags/DSCR
+++ b/extracted-files/tags/DSCR
@@ -26,6 +26,7 @@ substructures:
   "https://gedcom.io/terms/v7/CAUS": "{0:1}"
   "https://gedcom.io/terms/v7/DATE": "{0:1}"
   "https://gedcom.io/terms/v7/EMAIL": "{0:M}"
+  "https://gedcom.io/terms/v7/EXID": "{0:M}"
   "https://gedcom.io/terms/v7/FAX": "{0:M}"
   "https://gedcom.io/terms/v7/NOTE": "{0:M}"
   "https://gedcom.io/terms/v7/OBJE": "{0:M}"
diff --git a/extracted-files/tags/EDUC b/extracted-files/tags/EDUC
index da3e8c38..bd6ee820 100644
--- a/extracted-files/tags/EDUC
+++ b/extracted-files/tags/EDUC
@@ -26,6 +26,7 @@ substructures:
   "https://gedcom.io/terms/v7/CAUS": "{0:1}"
   "https://gedcom.io/terms/v7/DATE": "{0:1}"
   "https://gedcom.io/terms/v7/EMAIL": "{0:M}"
+  "https://gedcom.io/terms/v7/EXID": "{0:M}"
   "https://gedcom.io/terms/v7/FAX": "{0:M}"
   "https://gedcom.io/terms/v7/NOTE": "{0:M}"
   "https://gedcom.io/terms/v7/OBJE": "{0:M}"
diff --git a/extracted-files/tags/EMIG b/extracted-files/tags/EMIG
index 4b8b2a76..e4865bf8 100644
--- a/extracted-files/tags/EMIG
+++ b/extracted-files/tags/EMIG
@@ -26,6 +26,7 @@ substructures:
   "https://gedcom.io/terms/v7/CAUS": "{0:1}"
   "https://gedcom.io/terms/v7/DATE": "{0:1}"
   "https://gedcom.io/terms/v7/EMAIL": "{0:M}"
+  "https://gedcom.io/terms/v7/EXID": "{0:M}"
   "https://gedcom.io/terms/v7/FAX": "{0:M}"
   "https://gedcom.io/terms/v7/NOTE": "{0:M}"
   "https://gedcom.io/terms/v7/OBJE": "{0:M}"
@@ -44,6 +45,5 @@ superstructures:
   "https://gedcom.io/terms/v7/record-INDI": "{0:M}"
 
 value of:
-  - "https://gedcom.io/terms/v7/enumset-EVEN"
   - "https://gedcom.io/terms/v7/enumset-EVENATTR"
 ...
diff --git a/extracted-files/tags/ENGA b/extracted-files/tags/ENGA
index 1ae95341..309aba40 100644
--- a/extracted-files/tags/ENGA
+++ b/extracted-files/tags/ENGA
@@ -25,6 +25,7 @@ substructures:
   "https://gedcom.io/terms/v7/CAUS": "{0:1}"
   "https://gedcom.io/terms/v7/DATE": "{0:1}"
   "https://gedcom.io/terms/v7/EMAIL": "{0:M}"
+  "https://gedcom.io/terms/v7/EXID": "{0:M}"
   "https://gedcom.io/terms/v7/FAX": "{0:M}"
   "https://gedcom.io/terms/v7/HUSB": "{0:1}"
   "https://gedcom.io/terms/v7/NOTE": "{0:M}"
@@ -45,6 +46,5 @@ superstructures:
   "https://gedcom.io/terms/v7/record-FAM": "{0:M}"
 
 value of:
-  - "https://gedcom.io/terms/v7/enumset-EVEN"
   - "https://gedcom.io/terms/v7/enumset-EVENATTR"
 ...
diff --git a/extracted-files/tags/EXID b/extracted-files/tags/EXID
index beebfa2f..a1b6bc7c 100644
--- a/extracted-files/tags/EXID
+++ b/extracted-files/tags/EXID
@@ -33,7 +33,63 @@ substructures:
   "https://gedcom.io/terms/v7/EXID-TYPE": "{0:1}"
 
 superstructures:
+  "https://gedcom.io/terms/v7/ADOP": "{0:M}"
+  "https://gedcom.io/terms/v7/ANUL": "{0:M}"
+  "https://gedcom.io/terms/v7/BAPM": "{0:M}"
+  "https://gedcom.io/terms/v7/BARM": "{0:M}"
+  "https://gedcom.io/terms/v7/BASM": "{0:M}"
+  "https://gedcom.io/terms/v7/BIRT": "{0:M}"
+  "https://gedcom.io/terms/v7/BLES": "{0:M}"
+  "https://gedcom.io/terms/v7/BURI": "{0:M}"
+  "https://gedcom.io/terms/v7/CAST": "{0:M}"
+  "https://gedcom.io/terms/v7/CHR": "{0:M}"
+  "https://gedcom.io/terms/v7/CHRA": "{0:M}"
+  "https://gedcom.io/terms/v7/CONF": "{0:M}"
+  "https://gedcom.io/terms/v7/CREM": "{0:M}"
+  "https://gedcom.io/terms/v7/DEAT": "{0:M}"
+  "https://gedcom.io/terms/v7/DIV": "{0:M}"
+  "https://gedcom.io/terms/v7/DIVF": "{0:M}"
+  "https://gedcom.io/terms/v7/DSCR": "{0:M}"
+  "https://gedcom.io/terms/v7/EDUC": "{0:M}"
+  "https://gedcom.io/terms/v7/EMIG": "{0:M}"
+  "https://gedcom.io/terms/v7/ENGA": "{0:M}"
+  "https://gedcom.io/terms/v7/FAM-CENS": "{0:M}"
+  "https://gedcom.io/terms/v7/FAM-EVEN": "{0:M}"
+  "https://gedcom.io/terms/v7/FAM-FACT": "{0:M}"
+  "https://gedcom.io/terms/v7/FAM-NCHI": "{0:M}"
+  "https://gedcom.io/terms/v7/FAM-RESI": "{0:M}"
+  "https://gedcom.io/terms/v7/FCOM": "{0:M}"
+  "https://gedcom.io/terms/v7/GRAD": "{0:M}"
+  "https://gedcom.io/terms/v7/IDNO": "{0:M}"
+  "https://gedcom.io/terms/v7/IMMI": "{0:M}"
+  "https://gedcom.io/terms/v7/INDI-CENS": "{0:M}"
+  "https://gedcom.io/terms/v7/INDI-EVEN": "{0:M}"
+  "https://gedcom.io/terms/v7/INDI-FACT": "{0:M}"
+  "https://gedcom.io/terms/v7/INDI-FAMC": "{0:M}"
+  "https://gedcom.io/terms/v7/INDI-NAME": "{0:M}"
+  "https://gedcom.io/terms/v7/INDI-NCHI": "{0:M}"
+  "https://gedcom.io/terms/v7/INDI-RELI": "{0:M}"
+  "https://gedcom.io/terms/v7/INDI-RESI": "{0:M}"
+  "https://gedcom.io/terms/v7/INDI-TITL": "{0:M}"
+  "https://gedcom.io/terms/v7/MARB": "{0:M}"
+  "https://gedcom.io/terms/v7/MARC": "{0:M}"
+  "https://gedcom.io/terms/v7/MARL": "{0:M}"
+  "https://gedcom.io/terms/v7/MARR": "{0:M}"
+  "https://gedcom.io/terms/v7/MARS": "{0:M}"
+  "https://gedcom.io/terms/v7/NATI": "{0:M}"
+  "https://gedcom.io/terms/v7/NATU": "{0:M}"
+  "https://gedcom.io/terms/v7/NMR": "{0:M}"
+  "https://gedcom.io/terms/v7/NOTE": "{0:M}"
+  "https://gedcom.io/terms/v7/OCCU": "{0:M}"
+  "https://gedcom.io/terms/v7/ORDN": "{0:M}"
   "https://gedcom.io/terms/v7/PLAC": "{0:M}"
+  "https://gedcom.io/terms/v7/PROB": "{0:M}"
+  "https://gedcom.io/terms/v7/PROP": "{0:M}"
+  "https://gedcom.io/terms/v7/RETI": "{0:M}"
+  "https://gedcom.io/terms/v7/SEX": "{0:M}"
+  "https://gedcom.io/terms/v7/SOUR": "{0:M}"
+  "https://gedcom.io/terms/v7/SSN": "{0:M}"
+  "https://gedcom.io/terms/v7/WILL": "{0:M}"
   "https://gedcom.io/terms/v7/record-FAM": "{0:M}"
   "https://gedcom.io/terms/v7/record-INDI": "{0:M}"
   "https://gedcom.io/terms/v7/record-OBJE": "{0:M}"
diff --git a/extracted-files/tags/FAM-CENS b/extracted-files/tags/FAM-CENS
index 9dbfcfd7..dfb1ea66 100644
--- a/extracted-files/tags/FAM-CENS
+++ b/extracted-files/tags/FAM-CENS
@@ -26,6 +26,7 @@ substructures:
   "https://gedcom.io/terms/v7/CAUS": "{0:1}"
   "https://gedcom.io/terms/v7/DATE": "{0:1}"
   "https://gedcom.io/terms/v7/EMAIL": "{0:M}"
+  "https://gedcom.io/terms/v7/EXID": "{0:M}"
   "https://gedcom.io/terms/v7/FAX": "{0:M}"
   "https://gedcom.io/terms/v7/HUSB": "{0:1}"
   "https://gedcom.io/terms/v7/NOTE": "{0:M}"
diff --git a/extracted-files/tags/FAM-EVEN b/extracted-files/tags/FAM-EVEN
index 5978a008..1d7ee6ca 100644
--- a/extracted-files/tags/FAM-EVEN
+++ b/extracted-files/tags/FAM-EVEN
@@ -23,6 +23,7 @@ substructures:
   "https://gedcom.io/terms/v7/CAUS": "{0:1}"
   "https://gedcom.io/terms/v7/DATE": "{0:1}"
   "https://gedcom.io/terms/v7/EMAIL": "{0:M}"
+  "https://gedcom.io/terms/v7/EXID": "{0:M}"
   "https://gedcom.io/terms/v7/FAX": "{0:M}"
   "https://gedcom.io/terms/v7/HUSB": "{0:1}"
   "https://gedcom.io/terms/v7/NOTE": "{0:M}"
diff --git a/extracted-files/tags/FAM-FACT b/extracted-files/tags/FAM-FACT
index 19835bb5..61ad650d 100644
--- a/extracted-files/tags/FAM-FACT
+++ b/extracted-files/tags/FAM-FACT
@@ -23,6 +23,7 @@ substructures:
   "https://gedcom.io/terms/v7/CAUS": "{0:1}"
   "https://gedcom.io/terms/v7/DATE": "{0:1}"
   "https://gedcom.io/terms/v7/EMAIL": "{0:M}"
+  "https://gedcom.io/terms/v7/EXID": "{0:M}"
   "https://gedcom.io/terms/v7/FAX": "{0:M}"
   "https://gedcom.io/terms/v7/HUSB": "{0:1}"
   "https://gedcom.io/terms/v7/NOTE": "{0:M}"
diff --git a/extracted-files/tags/FAM-NCHI b/extracted-files/tags/FAM-NCHI
index 1d9f5cc6..1552bb77 100644
--- a/extracted-files/tags/FAM-NCHI
+++ b/extracted-files/tags/FAM-NCHI
@@ -25,6 +25,7 @@ substructures:
   "https://gedcom.io/terms/v7/CAUS": "{0:1}"
   "https://gedcom.io/terms/v7/DATE": "{0:1}"
   "https://gedcom.io/terms/v7/EMAIL": "{0:M}"
+  "https://gedcom.io/terms/v7/EXID": "{0:M}"
   "https://gedcom.io/terms/v7/FAX": "{0:M}"
   "https://gedcom.io/terms/v7/HUSB": "{0:1}"
   "https://gedcom.io/terms/v7/NOTE": "{0:M}"
diff --git a/extracted-files/tags/FAM-RESI b/extracted-files/tags/FAM-RESI
index 053daeb3..f2715e55 100644
--- a/extracted-files/tags/FAM-RESI
+++ b/extracted-files/tags/FAM-RESI
@@ -29,6 +29,7 @@ substructures:
   "https://gedcom.io/terms/v7/CAUS": "{0:1}"
   "https://gedcom.io/terms/v7/DATE": "{0:1}"
   "https://gedcom.io/terms/v7/EMAIL": "{0:M}"
+  "https://gedcom.io/terms/v7/EXID": "{0:M}"
   "https://gedcom.io/terms/v7/FAX": "{0:M}"
   "https://gedcom.io/terms/v7/HUSB": "{0:1}"
   "https://gedcom.io/terms/v7/NOTE": "{0:M}"
diff --git a/extracted-files/tags/FCOM b/extracted-files/tags/FCOM
index d6f3690d..835efeda 100644
--- a/extracted-files/tags/FCOM
+++ b/extracted-files/tags/FCOM
@@ -26,6 +26,7 @@ substructures:
   "https://gedcom.io/terms/v7/CAUS": "{0:1}"
   "https://gedcom.io/terms/v7/DATE": "{0:1}"
   "https://gedcom.io/terms/v7/EMAIL": "{0:M}"
+  "https://gedcom.io/terms/v7/EXID": "{0:M}"
   "https://gedcom.io/terms/v7/FAX": "{0:M}"
   "https://gedcom.io/terms/v7/NOTE": "{0:M}"
   "https://gedcom.io/terms/v7/OBJE": "{0:M}"
@@ -44,6 +45,5 @@ superstructures:
   "https://gedcom.io/terms/v7/record-INDI": "{0:M}"
 
 value of:
-  - "https://gedcom.io/terms/v7/enumset-EVEN"
   - "https://gedcom.io/terms/v7/enumset-EVENATTR"
 ...
diff --git a/extracted-files/tags/GRAD b/extracted-files/tags/GRAD
index 5561d1b5..3c051892 100644
--- a/extracted-files/tags/GRAD
+++ b/extracted-files/tags/GRAD
@@ -26,6 +26,7 @@ substructures:
   "https://gedcom.io/terms/v7/CAUS": "{0:1}"
   "https://gedcom.io/terms/v7/DATE": "{0:1}"
   "https://gedcom.io/terms/v7/EMAIL": "{0:M}"
+  "https://gedcom.io/terms/v7/EXID": "{0:M}"
   "https://gedcom.io/terms/v7/FAX": "{0:M}"
   "https://gedcom.io/terms/v7/NOTE": "{0:M}"
   "https://gedcom.io/terms/v7/OBJE": "{0:M}"
@@ -44,6 +45,5 @@ superstructures:
   "https://gedcom.io/terms/v7/record-INDI": "{0:M}"
 
 value of:
-  - "https://gedcom.io/terms/v7/enumset-EVEN"
   - "https://gedcom.io/terms/v7/enumset-EVENATTR"
 ...
diff --git a/extracted-files/tags/HEAD-DATE b/extracted-files/tags/HEAD-DATE
index 212a7b05..3a04b860 100644
--- a/extracted-files/tags/HEAD-DATE
+++ b/extracted-files/tags/HEAD-DATE
@@ -17,7 +17,7 @@ label: 'Date'
 payload: https://gedcom.io/terms/v7/type-Date#exact
 
 substructures:
-  "https://gedcom.io/terms/v7/TIME": "{0:1}"
+  "https://gedcom.io/terms/v7/TIME-exact": "{0:1}"
 
 superstructures:
   "https://gedcom.io/terms/v7/HEAD": "{0:1}"
diff --git a/extracted-files/tags/IDNO b/extracted-files/tags/IDNO
index 2c35861f..39ce6023 100644
--- a/extracted-files/tags/IDNO
+++ b/extracted-files/tags/IDNO
@@ -28,6 +28,7 @@ substructures:
   "https://gedcom.io/terms/v7/CAUS": "{0:1}"
   "https://gedcom.io/terms/v7/DATE": "{0:1}"
   "https://gedcom.io/terms/v7/EMAIL": "{0:M}"
+  "https://gedcom.io/terms/v7/EXID": "{0:M}"
   "https://gedcom.io/terms/v7/FAX": "{0:M}"
   "https://gedcom.io/terms/v7/NOTE": "{0:M}"
   "https://gedcom.io/terms/v7/OBJE": "{0:M}"
diff --git a/extracted-files/tags/IMMI b/extracted-files/tags/IMMI
index a7a881c6..85e0480b 100644
--- a/extracted-files/tags/IMMI
+++ b/extracted-files/tags/IMMI
@@ -26,6 +26,7 @@ substructures:
   "https://gedcom.io/terms/v7/CAUS": "{0:1}"
   "https://gedcom.io/terms/v7/DATE": "{0:1}"
   "https://gedcom.io/terms/v7/EMAIL": "{0:M}"
+  "https://gedcom.io/terms/v7/EXID": "{0:M}"
   "https://gedcom.io/terms/v7/FAX": "{0:M}"
   "https://gedcom.io/terms/v7/NOTE": "{0:M}"
   "https://gedcom.io/terms/v7/OBJE": "{0:M}"
@@ -44,6 +45,5 @@ superstructures:
   "https://gedcom.io/terms/v7/record-INDI": "{0:M}"
 
 value of:
-  - "https://gedcom.io/terms/v7/enumset-EVEN"
   - "https://gedcom.io/terms/v7/enumset-EVENATTR"
 ...
diff --git a/extracted-files/tags/INDI-CENS b/extracted-files/tags/INDI-CENS
index 13b9ce58..68985840 100644
--- a/extracted-files/tags/INDI-CENS
+++ b/extracted-files/tags/INDI-CENS
@@ -27,6 +27,7 @@ substructures:
   "https://gedcom.io/terms/v7/CAUS": "{0:1}"
   "https://gedcom.io/terms/v7/DATE": "{0:1}"
   "https://gedcom.io/terms/v7/EMAIL": "{0:M}"
+  "https://gedcom.io/terms/v7/EXID": "{0:M}"
   "https://gedcom.io/terms/v7/FAX": "{0:M}"
   "https://gedcom.io/terms/v7/NOTE": "{0:M}"
   "https://gedcom.io/terms/v7/OBJE": "{0:M}"
diff --git a/extracted-files/tags/INDI-EVEN b/extracted-files/tags/INDI-EVEN
index b779cb72..425bd3bc 100644
--- a/extracted-files/tags/INDI-EVEN
+++ b/extracted-files/tags/INDI-EVEN
@@ -45,6 +45,7 @@ substructures:
   "https://gedcom.io/terms/v7/CAUS": "{0:1}"
   "https://gedcom.io/terms/v7/DATE": "{0:1}"
   "https://gedcom.io/terms/v7/EMAIL": "{0:M}"
+  "https://gedcom.io/terms/v7/EXID": "{0:M}"
   "https://gedcom.io/terms/v7/FAX": "{0:M}"
   "https://gedcom.io/terms/v7/NOTE": "{0:M}"
   "https://gedcom.io/terms/v7/OBJE": "{0:M}"
diff --git a/extracted-files/tags/INDI-FACT b/extracted-files/tags/INDI-FACT
index 6f3a47fe..c89e589b 100644
--- a/extracted-files/tags/INDI-FACT
+++ b/extracted-files/tags/INDI-FACT
@@ -42,6 +42,7 @@ substructures:
   "https://gedcom.io/terms/v7/CAUS": "{0:1}"
   "https://gedcom.io/terms/v7/DATE": "{0:1}"
   "https://gedcom.io/terms/v7/EMAIL": "{0:M}"
+  "https://gedcom.io/terms/v7/EXID": "{0:M}"
   "https://gedcom.io/terms/v7/FAX": "{0:M}"
   "https://gedcom.io/terms/v7/NOTE": "{0:M}"
   "https://gedcom.io/terms/v7/OBJE": "{0:M}"
diff --git a/extracted-files/tags/INDI-FAMC b/extracted-files/tags/INDI-FAMC
index 12f05f06..b5af6d9c 100644
--- a/extracted-files/tags/INDI-FAMC
+++ b/extracted-files/tags/INDI-FAMC
@@ -19,9 +19,10 @@ label: 'Family child'
 payload: "@<https://gedcom.io/terms/v7/record-FAM>@"
 
 substructures:
+  "https://gedcom.io/terms/v7/EXID": "{0:M}"
   "https://gedcom.io/terms/v7/FAMC-STAT": "{0:1}"
   "https://gedcom.io/terms/v7/NOTE": "{0:M}"
-  "https://gedcom.io/terms/v7/PEDI": "{0:1}"
+  "https://gedcom.io/terms/v7/PEDI": "{0:M}"
   "https://gedcom.io/terms/v7/SNOTE": "{0:M}"
 
 superstructures:
diff --git a/extracted-files/tags/INDI-NAME b/extracted-files/tags/INDI-NAME
index 80631848..1228648e 100644
--- a/extracted-files/tags/INDI-NAME
+++ b/extracted-files/tags/INDI-NAME
@@ -47,13 +47,17 @@ label: 'Name'
 payload: https://gedcom.io/terms/v7/type-Name
 
 substructures:
+  "https://gedcom.io/terms/v7/EXID": "{0:M}"
   "https://gedcom.io/terms/v7/GIVN": "{0:M}"
+  "https://gedcom.io/terms/v7/LANG": "{0:1}"
   "https://gedcom.io/terms/v7/NAME-TRAN": "{0:M}"
   "https://gedcom.io/terms/v7/NAME-TYPE": "{0:1}"
   "https://gedcom.io/terms/v7/NICK": "{0:M}"
+  "https://gedcom.io/terms/v7/NO": "{0:M}"
   "https://gedcom.io/terms/v7/NOTE": "{0:M}"
   "https://gedcom.io/terms/v7/NPFX": "{0:M}"
   "https://gedcom.io/terms/v7/NSFX": "{0:M}"
+  "https://gedcom.io/terms/v7/RESN": "{0:1}"
   "https://gedcom.io/terms/v7/SNOTE": "{0:M}"
   "https://gedcom.io/terms/v7/SOUR": "{0:M}"
   "https://gedcom.io/terms/v7/SPFX": "{0:M}"
diff --git a/extracted-files/tags/INDI-NCHI b/extracted-files/tags/INDI-NCHI
index ac841731..114fde8b 100644
--- a/extracted-files/tags/INDI-NCHI
+++ b/extracted-files/tags/INDI-NCHI
@@ -27,6 +27,7 @@ substructures:
   "https://gedcom.io/terms/v7/CAUS": "{0:1}"
   "https://gedcom.io/terms/v7/DATE": "{0:1}"
   "https://gedcom.io/terms/v7/EMAIL": "{0:M}"
+  "https://gedcom.io/terms/v7/EXID": "{0:M}"
   "https://gedcom.io/terms/v7/FAX": "{0:M}"
   "https://gedcom.io/terms/v7/NOTE": "{0:M}"
   "https://gedcom.io/terms/v7/OBJE": "{0:M}"
diff --git a/extracted-files/tags/INDI-RELI b/extracted-files/tags/INDI-RELI
index aa7ec256..571cf6d9 100644
--- a/extracted-files/tags/INDI-RELI
+++ b/extracted-files/tags/INDI-RELI
@@ -24,6 +24,7 @@ substructures:
   "https://gedcom.io/terms/v7/CAUS": "{0:1}"
   "https://gedcom.io/terms/v7/DATE": "{0:1}"
   "https://gedcom.io/terms/v7/EMAIL": "{0:M}"
+  "https://gedcom.io/terms/v7/EXID": "{0:M}"
   "https://gedcom.io/terms/v7/FAX": "{0:M}"
   "https://gedcom.io/terms/v7/NOTE": "{0:M}"
   "https://gedcom.io/terms/v7/OBJE": "{0:M}"
diff --git a/extracted-files/tags/INDI-RESI b/extracted-files/tags/INDI-RESI
index 40b16406..8ad6d214 100644
--- a/extracted-files/tags/INDI-RESI
+++ b/extracted-files/tags/INDI-RESI
@@ -50,6 +50,7 @@ substructures:
   "https://gedcom.io/terms/v7/CAUS": "{0:1}"
   "https://gedcom.io/terms/v7/DATE": "{0:1}"
   "https://gedcom.io/terms/v7/EMAIL": "{0:M}"
+  "https://gedcom.io/terms/v7/EXID": "{0:M}"
   "https://gedcom.io/terms/v7/FAX": "{0:M}"
   "https://gedcom.io/terms/v7/NOTE": "{0:M}"
   "https://gedcom.io/terms/v7/OBJE": "{0:M}"
diff --git a/extracted-files/tags/INDI-TITL b/extracted-files/tags/INDI-TITL
index 5b448aa3..0b5af82f 100644
--- a/extracted-files/tags/INDI-TITL
+++ b/extracted-files/tags/INDI-TITL
@@ -24,6 +24,7 @@ substructures:
   "https://gedcom.io/terms/v7/CAUS": "{0:1}"
   "https://gedcom.io/terms/v7/DATE": "{0:1}"
   "https://gedcom.io/terms/v7/EMAIL": "{0:M}"
+  "https://gedcom.io/terms/v7/EXID": "{0:M}"
   "https://gedcom.io/terms/v7/FAX": "{0:M}"
   "https://gedcom.io/terms/v7/NOTE": "{0:M}"
   "https://gedcom.io/terms/v7/OBJE": "{0:M}"
diff --git a/extracted-files/tags/LANG b/extracted-files/tags/LANG
index dfc510e4..d267bbf9 100644
--- a/extracted-files/tags/LANG
+++ b/extracted-files/tags/LANG
@@ -27,7 +27,8 @@ specification:
     language, it is recommended that a language tag identifying the primary
     language be used. If no one language is primary, the language tag `mul`
     (meaning "multiple") may be used, but most language-specific algorithms will
-    treat `mul` the same way they do `und`.
+    treat `mul` the same way they do `und`. Multi-language text can be handled more
+    robustly using [the `text/html` MediaType].
     
     <div class="note">
     
@@ -72,6 +73,7 @@ payload: http://www.w3.org/2001/XMLSchema#Language
 substructures: {}
 
 superstructures:
+  "https://gedcom.io/terms/v7/INDI-NAME": "{0:1}"
   "https://gedcom.io/terms/v7/NAME-TRAN": "{1:1}"
   "https://gedcom.io/terms/v7/NOTE": "{0:1}"
   "https://gedcom.io/terms/v7/NOTE-TRAN": "{0:1}"
diff --git a/extracted-files/tags/MARB b/extracted-files/tags/MARB
index dc822820..490989a5 100644
--- a/extracted-files/tags/MARB
+++ b/extracted-files/tags/MARB
@@ -25,6 +25,7 @@ substructures:
   "https://gedcom.io/terms/v7/CAUS": "{0:1}"
   "https://gedcom.io/terms/v7/DATE": "{0:1}"
   "https://gedcom.io/terms/v7/EMAIL": "{0:M}"
+  "https://gedcom.io/terms/v7/EXID": "{0:M}"
   "https://gedcom.io/terms/v7/FAX": "{0:M}"
   "https://gedcom.io/terms/v7/HUSB": "{0:1}"
   "https://gedcom.io/terms/v7/NOTE": "{0:M}"
@@ -45,6 +46,5 @@ superstructures:
   "https://gedcom.io/terms/v7/record-FAM": "{0:M}"
 
 value of:
-  - "https://gedcom.io/terms/v7/enumset-EVEN"
   - "https://gedcom.io/terms/v7/enumset-EVENATTR"
 ...
diff --git a/extracted-files/tags/MARC b/extracted-files/tags/MARC
index d497222d..1e8358f4 100644
--- a/extracted-files/tags/MARC
+++ b/extracted-files/tags/MARC
@@ -27,6 +27,7 @@ substructures:
   "https://gedcom.io/terms/v7/CAUS": "{0:1}"
   "https://gedcom.io/terms/v7/DATE": "{0:1}"
   "https://gedcom.io/terms/v7/EMAIL": "{0:M}"
+  "https://gedcom.io/terms/v7/EXID": "{0:M}"
   "https://gedcom.io/terms/v7/FAX": "{0:M}"
   "https://gedcom.io/terms/v7/HUSB": "{0:1}"
   "https://gedcom.io/terms/v7/NOTE": "{0:M}"
@@ -47,6 +48,5 @@ superstructures:
   "https://gedcom.io/terms/v7/record-FAM": "{0:M}"
 
 value of:
-  - "https://gedcom.io/terms/v7/enumset-EVEN"
   - "https://gedcom.io/terms/v7/enumset-EVENATTR"
 ...
diff --git a/extracted-files/tags/MARL b/extracted-files/tags/MARL
index 83dc33f7..cdf32045 100644
--- a/extracted-files/tags/MARL
+++ b/extracted-files/tags/MARL
@@ -25,6 +25,7 @@ substructures:
   "https://gedcom.io/terms/v7/CAUS": "{0:1}"
   "https://gedcom.io/terms/v7/DATE": "{0:1}"
   "https://gedcom.io/terms/v7/EMAIL": "{0:M}"
+  "https://gedcom.io/terms/v7/EXID": "{0:M}"
   "https://gedcom.io/terms/v7/FAX": "{0:M}"
   "https://gedcom.io/terms/v7/HUSB": "{0:1}"
   "https://gedcom.io/terms/v7/NOTE": "{0:M}"
@@ -45,6 +46,5 @@ superstructures:
   "https://gedcom.io/terms/v7/record-FAM": "{0:M}"
 
 value of:
-  - "https://gedcom.io/terms/v7/enumset-EVEN"
   - "https://gedcom.io/terms/v7/enumset-EVENATTR"
 ...
diff --git a/extracted-files/tags/MARR b/extracted-files/tags/MARR
index 59d2e1c2..99358680 100644
--- a/extracted-files/tags/MARR
+++ b/extracted-files/tags/MARR
@@ -26,8 +26,10 @@ substructures:
   "https://gedcom.io/terms/v7/CAUS": "{0:1}"
   "https://gedcom.io/terms/v7/DATE": "{0:1}"
   "https://gedcom.io/terms/v7/EMAIL": "{0:M}"
+  "https://gedcom.io/terms/v7/EXID": "{0:M}"
   "https://gedcom.io/terms/v7/FAX": "{0:M}"
   "https://gedcom.io/terms/v7/HUSB": "{0:1}"
+  "https://gedcom.io/terms/v7/MARR-KIND": "{0:1}"
   "https://gedcom.io/terms/v7/NOTE": "{0:M}"
   "https://gedcom.io/terms/v7/OBJE": "{0:M}"
   "https://gedcom.io/terms/v7/PHON": "{0:M}"
@@ -46,6 +48,5 @@ superstructures:
   "https://gedcom.io/terms/v7/record-FAM": "{0:M}"
 
 value of:
-  - "https://gedcom.io/terms/v7/enumset-EVEN"
   - "https://gedcom.io/terms/v7/enumset-EVENATTR"
 ...
diff --git a/extracted-files/tags/MARR-KIND b/extracted-files/tags/MARR-KIND
new file mode 100644
index 00000000..b8280712
--- /dev/null
+++ b/extracted-files/tags/MARR-KIND
@@ -0,0 +1,31 @@
+%YAML 1.2
+---
+lang: en-US
+
+type: structure
+
+uri: https://gedcom.io/terms/v7/MARR-KIND
+
+standard tag: KIND
+
+specification:
+  - Kind
+  - |
+    An enumerated value from set `https://gedcom.io/terms/v7/enumset-MARR-KIND`
+    indicating what kind of marriage the superstructure describes.
+    
+    Note `KIND` does not have a `https://gedcom.io/terms/v7/PHRASE` substructure;
+    the `https://gedcom.io/terms/v7/TYPE` substructure of the `KIND`'s
+    superstructure should be used for that purpose instead.
+
+label: 'Kind'
+
+payload: https://gedcom.io/terms/v7/type-Enum
+
+enumeration set: "https://gedcom.io/terms/v7/enumset-MARR-KIND"
+
+substructures: {}
+
+superstructures:
+  "https://gedcom.io/terms/v7/MARR": "{0:1}"
+...
diff --git a/extracted-files/tags/MARS b/extracted-files/tags/MARS
index 382b09c6..6a53de04 100644
--- a/extracted-files/tags/MARS
+++ b/extracted-files/tags/MARS
@@ -27,6 +27,7 @@ substructures:
   "https://gedcom.io/terms/v7/CAUS": "{0:1}"
   "https://gedcom.io/terms/v7/DATE": "{0:1}"
   "https://gedcom.io/terms/v7/EMAIL": "{0:M}"
+  "https://gedcom.io/terms/v7/EXID": "{0:M}"
   "https://gedcom.io/terms/v7/FAX": "{0:M}"
   "https://gedcom.io/terms/v7/HUSB": "{0:1}"
   "https://gedcom.io/terms/v7/NOTE": "{0:M}"
@@ -47,6 +48,5 @@ superstructures:
   "https://gedcom.io/terms/v7/record-FAM": "{0:M}"
 
 value of:
-  - "https://gedcom.io/terms/v7/enumset-EVEN"
   - "https://gedcom.io/terms/v7/enumset-EVENATTR"
 ...
diff --git a/extracted-files/tags/MEDI b/extracted-files/tags/MEDI
index b8dd74d7..c7a89a84 100644
--- a/extracted-files/tags/MEDI
+++ b/extracted-files/tags/MEDI
@@ -21,9 +21,9 @@ specification:
     
     <div class="example">
     
-    Consider an asset in a repository that is a digital scan of a book of compiled
-    newspapers; for this asset, the `CALN`.`MEDI` is recommended to be `ELECTRONIC`
-    rather than `BOOK` or `NEWSPAPER`.
+    Consider an asset in an online repository that is a digital scan of a book of
+    compiled newspapers; for this asset, the `CALN`.`MEDI` is recommended to be
+    `ONLINE` rather than `BOOK` or `NEWSPAPER`.
     
     </div>
 
diff --git a/extracted-files/tags/MIME b/extracted-files/tags/MIME
index e2cb3f28..d8edfb5b 100644
--- a/extracted-files/tags/MIME
+++ b/extracted-files/tags/MIME
@@ -26,6 +26,8 @@ specification:
         strike-through text (or corresponding display in other locales; see [HTML
         §4.5] for more).
       - `sup` and `sub` elements for super- and sub-script.
+      - `span` with a `lang` attribute for marking part of text in a different
+        human language than the rest.
       - The 3 XML entities that appear in text: `&amp;`, `&lt;` `&gt;`. Note that
         `&quote;` and `&apos;` are only needed in attributes. Other entities should
         be represented as their respective Unicode characters instead.
diff --git a/extracted-files/tags/NAME-TRAN b/extracted-files/tags/NAME-TRAN
index 29786481..6be4b508 100644
--- a/extracted-files/tags/NAME-TRAN
+++ b/extracted-files/tags/NAME-TRAN
@@ -20,6 +20,7 @@ specification:
     
     ```gedcom
     1 NAME /孔/德庸
+    2 LANG zh
     2 GIVN 德庸
     2 SURN 孔
     2 TRAN /Kǒng/ Déyōng
diff --git a/extracted-files/tags/NATI b/extracted-files/tags/NATI
index edce4c74..51603ac0 100644
--- a/extracted-files/tags/NATI
+++ b/extracted-files/tags/NATI
@@ -27,6 +27,7 @@ substructures:
   "https://gedcom.io/terms/v7/CAUS": "{0:1}"
   "https://gedcom.io/terms/v7/DATE": "{0:1}"
   "https://gedcom.io/terms/v7/EMAIL": "{0:M}"
+  "https://gedcom.io/terms/v7/EXID": "{0:M}"
   "https://gedcom.io/terms/v7/FAX": "{0:M}"
   "https://gedcom.io/terms/v7/NOTE": "{0:M}"
   "https://gedcom.io/terms/v7/OBJE": "{0:M}"
diff --git a/extracted-files/tags/NATU b/extracted-files/tags/NATU
index 2aab5dbf..d0b74cdb 100644
--- a/extracted-files/tags/NATU
+++ b/extracted-files/tags/NATU
@@ -26,6 +26,7 @@ substructures:
   "https://gedcom.io/terms/v7/CAUS": "{0:1}"
   "https://gedcom.io/terms/v7/DATE": "{0:1}"
   "https://gedcom.io/terms/v7/EMAIL": "{0:M}"
+  "https://gedcom.io/terms/v7/EXID": "{0:M}"
   "https://gedcom.io/terms/v7/FAX": "{0:M}"
   "https://gedcom.io/terms/v7/NOTE": "{0:M}"
   "https://gedcom.io/terms/v7/OBJE": "{0:M}"
@@ -44,6 +45,5 @@ superstructures:
   "https://gedcom.io/terms/v7/record-INDI": "{0:M}"
 
 value of:
-  - "https://gedcom.io/terms/v7/enumset-EVEN"
   - "https://gedcom.io/terms/v7/enumset-EVENATTR"
 ...
diff --git a/extracted-files/tags/NMR b/extracted-files/tags/NMR
index 569f23d9..29e7c375 100644
--- a/extracted-files/tags/NMR
+++ b/extracted-files/tags/NMR
@@ -27,6 +27,7 @@ substructures:
   "https://gedcom.io/terms/v7/CAUS": "{0:1}"
   "https://gedcom.io/terms/v7/DATE": "{0:1}"
   "https://gedcom.io/terms/v7/EMAIL": "{0:M}"
+  "https://gedcom.io/terms/v7/EXID": "{0:M}"
   "https://gedcom.io/terms/v7/FAX": "{0:M}"
   "https://gedcom.io/terms/v7/NOTE": "{0:M}"
   "https://gedcom.io/terms/v7/OBJE": "{0:M}"
diff --git a/extracted-files/tags/NO b/extracted-files/tags/NO
index 0814085c..ea5cf641 100644
--- a/extracted-files/tags/NO
+++ b/extracted-files/tags/NO
@@ -9,10 +9,15 @@ uri: https://gedcom.io/terms/v7/NO
 standard tag: 'NO'
 
 specification:
-  - Did not happen
-  - An enumerated value from set `https://gedcom.io/terms/v7/enumset-EVEN`
-    identifying an event type which did not occur to the superstructure's subject.
-    See `NON_EVENT_STRUCTURE` for more details.
+  - Negative assertion
+  - |
+    An enumerated value from set `https://gedcom.io/terms/v7/enumset-NO`
+    identifying something that was not part of the superstructure: an event type
+    which did not occur to the superstructure's subject, that the superstructure's
+    subject did not have an name or name part, etc. A specific payload `NO XYZ`
+    should only appear where `XYZ` would be legal.
+    
+    See `NEGATIVE_ASSERTION` for more.
   - |
     Indicates that a specific type of event, given in the payload, did not happen
     within a given date period (or never happened if there is no `DATE`
@@ -39,11 +44,11 @@ specification:
     
     </div>
 
-label: 'Did not happen'
+label: 'Negative assertion'
 
 payload: https://gedcom.io/terms/v7/type-Enum
 
-enumeration set: "https://gedcom.io/terms/v7/enumset-EVEN"
+enumeration set: "https://gedcom.io/terms/v7/enumset-NO"
 
 substructures:
   "https://gedcom.io/terms/v7/NO-DATE": "{0:1}"
@@ -52,6 +57,7 @@ substructures:
   "https://gedcom.io/terms/v7/SOUR": "{0:M}"
 
 superstructures:
+  "https://gedcom.io/terms/v7/INDI-NAME": "{0:M}"
   "https://gedcom.io/terms/v7/record-FAM": "{0:M}"
   "https://gedcom.io/terms/v7/record-INDI": "{0:M}"
 ...
diff --git a/extracted-files/tags/NOTE b/extracted-files/tags/NOTE
index 0b3bf722..d9728087 100644
--- a/extracted-files/tags/NOTE
+++ b/extracted-files/tags/NOTE
@@ -23,10 +23,14 @@ label: 'Note'
 payload: http://www.w3.org/2001/XMLSchema#string
 
 substructures:
+  "https://gedcom.io/terms/v7/EXID": "{0:M}"
   "https://gedcom.io/terms/v7/LANG": "{0:1}"
   "https://gedcom.io/terms/v7/MIME": "{0:1}"
   "https://gedcom.io/terms/v7/NOTE-TRAN": "{0:M}"
+  "https://gedcom.io/terms/v7/REFN": "{0:M}"
+  "https://gedcom.io/terms/v7/RESN": "{0:1}"
   "https://gedcom.io/terms/v7/SOUR": "{0:M}"
+  "https://gedcom.io/terms/v7/UID": "{0:M}"
 
 superstructures:
   "https://gedcom.io/terms/v7/ADOP": "{0:M}"
diff --git a/extracted-files/tags/OCCU b/extracted-files/tags/OCCU
index 43a03f90..7816459c 100644
--- a/extracted-files/tags/OCCU
+++ b/extracted-files/tags/OCCU
@@ -26,6 +26,7 @@ substructures:
   "https://gedcom.io/terms/v7/CAUS": "{0:1}"
   "https://gedcom.io/terms/v7/DATE": "{0:1}"
   "https://gedcom.io/terms/v7/EMAIL": "{0:M}"
+  "https://gedcom.io/terms/v7/EXID": "{0:M}"
   "https://gedcom.io/terms/v7/FAX": "{0:M}"
   "https://gedcom.io/terms/v7/NOTE": "{0:M}"
   "https://gedcom.io/terms/v7/OBJE": "{0:M}"
diff --git a/extracted-files/tags/ORDN b/extracted-files/tags/ORDN
index 15bc634c..1d63e107 100644
--- a/extracted-files/tags/ORDN
+++ b/extracted-files/tags/ORDN
@@ -26,6 +26,7 @@ substructures:
   "https://gedcom.io/terms/v7/CAUS": "{0:1}"
   "https://gedcom.io/terms/v7/DATE": "{0:1}"
   "https://gedcom.io/terms/v7/EMAIL": "{0:M}"
+  "https://gedcom.io/terms/v7/EXID": "{0:M}"
   "https://gedcom.io/terms/v7/FAX": "{0:M}"
   "https://gedcom.io/terms/v7/NOTE": "{0:M}"
   "https://gedcom.io/terms/v7/OBJE": "{0:M}"
@@ -44,6 +45,5 @@ superstructures:
   "https://gedcom.io/terms/v7/record-INDI": "{0:M}"
 
 value of:
-  - "https://gedcom.io/terms/v7/enumset-EVEN"
   - "https://gedcom.io/terms/v7/enumset-EVENATTR"
 ...
diff --git a/extracted-files/tags/PEDI b/extracted-files/tags/PEDI
index a1f385ff..74f2e7a8 100644
--- a/extracted-files/tags/PEDI
+++ b/extracted-files/tags/PEDI
@@ -21,8 +21,9 @@ payload: https://gedcom.io/terms/v7/type-Enum
 enumeration set: "https://gedcom.io/terms/v7/enumset-PEDI"
 
 substructures:
+  "https://gedcom.io/terms/v7/DATE": "{0:1}"
   "https://gedcom.io/terms/v7/PHRASE": "{0:1}"
 
 superstructures:
-  "https://gedcom.io/terms/v7/INDI-FAMC": "{0:1}"
+  "https://gedcom.io/terms/v7/INDI-FAMC": "{0:M}"
 ...
diff --git a/extracted-files/tags/PHRASE b/extracted-files/tags/PHRASE
index 97d6d57f..9ea5e76a 100644
--- a/extracted-files/tags/PHRASE
+++ b/extracted-files/tags/PHRASE
@@ -111,4 +111,5 @@ superstructures:
   "https://gedcom.io/terms/v7/ROLE": "{0:1}"
   "https://gedcom.io/terms/v7/SDATE": "{0:1}"
   "https://gedcom.io/terms/v7/SOUR-EVEN": "{0:1}"
+  "https://gedcom.io/terms/v7/TIME": "{0:1}"
 ...
diff --git a/extracted-files/tags/PROB b/extracted-files/tags/PROB
index 86f5c37c..e1e7da18 100644
--- a/extracted-files/tags/PROB
+++ b/extracted-files/tags/PROB
@@ -27,6 +27,7 @@ substructures:
   "https://gedcom.io/terms/v7/CAUS": "{0:1}"
   "https://gedcom.io/terms/v7/DATE": "{0:1}"
   "https://gedcom.io/terms/v7/EMAIL": "{0:M}"
+  "https://gedcom.io/terms/v7/EXID": "{0:M}"
   "https://gedcom.io/terms/v7/FAX": "{0:M}"
   "https://gedcom.io/terms/v7/NOTE": "{0:M}"
   "https://gedcom.io/terms/v7/OBJE": "{0:M}"
@@ -45,6 +46,5 @@ superstructures:
   "https://gedcom.io/terms/v7/record-INDI": "{0:M}"
 
 value of:
-  - "https://gedcom.io/terms/v7/enumset-EVEN"
   - "https://gedcom.io/terms/v7/enumset-EVENATTR"
 ...
diff --git a/extracted-files/tags/PROP b/extracted-files/tags/PROP
index 769b9f55..b71311c6 100644
--- a/extracted-files/tags/PROP
+++ b/extracted-files/tags/PROP
@@ -26,6 +26,7 @@ substructures:
   "https://gedcom.io/terms/v7/CAUS": "{0:1}"
   "https://gedcom.io/terms/v7/DATE": "{0:1}"
   "https://gedcom.io/terms/v7/EMAIL": "{0:M}"
+  "https://gedcom.io/terms/v7/EXID": "{0:M}"
   "https://gedcom.io/terms/v7/FAX": "{0:M}"
   "https://gedcom.io/terms/v7/NOTE": "{0:M}"
   "https://gedcom.io/terms/v7/OBJE": "{0:M}"
diff --git a/extracted-files/tags/REFN b/extracted-files/tags/REFN
index 3598ea23..d10a0e59 100644
--- a/extracted-files/tags/REFN
+++ b/extracted-files/tags/REFN
@@ -28,6 +28,7 @@ substructures:
   "https://gedcom.io/terms/v7/TYPE": "{0:1}"
 
 superstructures:
+  "https://gedcom.io/terms/v7/NOTE": "{0:M}"
   "https://gedcom.io/terms/v7/record-FAM": "{0:M}"
   "https://gedcom.io/terms/v7/record-INDI": "{0:M}"
   "https://gedcom.io/terms/v7/record-OBJE": "{0:M}"
diff --git a/extracted-files/tags/REPO b/extracted-files/tags/REPO
index 8699b972..8db8a327 100644
--- a/extracted-files/tags/REPO
+++ b/extracted-files/tags/REPO
@@ -11,12 +11,18 @@ standard tag: REPO
 specification:
   - Repository
   - See `SOURCE_REPOSITORY_CITATION`.
-  - This structure is used within a source record to point to a name and address
+  - |
+    This structure is used within a source record to point to a name and address
     record of the holder of the source document. Formal and informal repository
     name and addresses are stored in the `REPOSITORY_RECORD`. More formal
     repositories, such as the Family History Library, should show a call number of
     the source at that repository. The call number of that source should be
     recorded using a `CALN` substructure.
+    
+    A `DATE` substructure can be used to denote the date when the source was known
+    to be held by the specific holder. For example, if a Family Bible was passed
+    from one person to another over time, a `SOURCE_REPOSITORY_CITATION` with a
+    `DATE` substructure can be used to track the provenance as it was handed down.
 
 label: 'Repository'
 
@@ -24,6 +30,7 @@ payload: "@<https://gedcom.io/terms/v7/record-REPO>@"
 
 substructures:
   "https://gedcom.io/terms/v7/CALN": "{0:M}"
+  "https://gedcom.io/terms/v7/DATE": "{0:1}"
   "https://gedcom.io/terms/v7/NOTE": "{0:M}"
   "https://gedcom.io/terms/v7/SNOTE": "{0:M}"
 
diff --git a/extracted-files/tags/RESN b/extracted-files/tags/RESN
index bae7f0c9..cd5516f6 100644
--- a/extracted-files/tags/RESN
+++ b/extracted-files/tags/RESN
@@ -22,6 +22,15 @@ specification:
     structure and its superstructure being removed from the export. Such removal
     must abide by some constraints: see [Removing data] for more details.
     
+    A structure that points to a record that is being removed due to `RESN`
+    processing will have its pointer replaced by a `voidPtr`, preserving the
+    structure's substructures. That might be desirable, but could cause accidental
+    information leakage; for example, if a `https://gedcom.io/terms/v7/ADOP-FAMC`
+    points to a restricted `FAMC` it may contain `FAMC`-identifying information in
+    its substructures that the user also wishes to treat as restricted.
+    Applications are encouraged to prompt the user when a pointer becomes void
+    during `RESN` processing and give them the option of additional data removal.
+    
     This is metadata about the structure itself, not data about its subject.
 
 label: 'Restriction'
@@ -65,6 +74,7 @@ superstructures:
   "https://gedcom.io/terms/v7/INDI-CENS": "{0:1}"
   "https://gedcom.io/terms/v7/INDI-EVEN": "{0:1}"
   "https://gedcom.io/terms/v7/INDI-FACT": "{0:1}"
+  "https://gedcom.io/terms/v7/INDI-NAME": "{0:1}"
   "https://gedcom.io/terms/v7/INDI-NCHI": "{0:1}"
   "https://gedcom.io/terms/v7/INDI-RELI": "{0:1}"
   "https://gedcom.io/terms/v7/INDI-RESI": "{0:1}"
@@ -77,14 +87,20 @@ superstructures:
   "https://gedcom.io/terms/v7/NATI": "{0:1}"
   "https://gedcom.io/terms/v7/NATU": "{0:1}"
   "https://gedcom.io/terms/v7/NMR": "{0:1}"
+  "https://gedcom.io/terms/v7/NOTE": "{0:1}"
   "https://gedcom.io/terms/v7/OCCU": "{0:1}"
   "https://gedcom.io/terms/v7/ORDN": "{0:1}"
   "https://gedcom.io/terms/v7/PROB": "{0:1}"
   "https://gedcom.io/terms/v7/PROP": "{0:1}"
   "https://gedcom.io/terms/v7/RETI": "{0:1}"
+  "https://gedcom.io/terms/v7/SOUR": "{0:1}"
   "https://gedcom.io/terms/v7/SSN": "{0:1}"
   "https://gedcom.io/terms/v7/WILL": "{0:1}"
   "https://gedcom.io/terms/v7/record-FAM": "{0:1}"
   "https://gedcom.io/terms/v7/record-INDI": "{0:1}"
   "https://gedcom.io/terms/v7/record-OBJE": "{0:1}"
+  "https://gedcom.io/terms/v7/record-REPO": "{0:1}"
+  "https://gedcom.io/terms/v7/record-SNOTE": "{0:1}"
+  "https://gedcom.io/terms/v7/record-SOUR": "{0:1}"
+  "https://gedcom.io/terms/v7/record-SUBM": "{0:1}"
 ...
diff --git a/extracted-files/tags/RETI b/extracted-files/tags/RETI
index ff730a3a..5f23d085 100644
--- a/extracted-files/tags/RETI
+++ b/extracted-files/tags/RETI
@@ -27,6 +27,7 @@ substructures:
   "https://gedcom.io/terms/v7/CAUS": "{0:1}"
   "https://gedcom.io/terms/v7/DATE": "{0:1}"
   "https://gedcom.io/terms/v7/EMAIL": "{0:M}"
+  "https://gedcom.io/terms/v7/EXID": "{0:M}"
   "https://gedcom.io/terms/v7/FAX": "{0:M}"
   "https://gedcom.io/terms/v7/NOTE": "{0:M}"
   "https://gedcom.io/terms/v7/OBJE": "{0:M}"
@@ -45,6 +46,5 @@ superstructures:
   "https://gedcom.io/terms/v7/record-INDI": "{0:M}"
 
 value of:
-  - "https://gedcom.io/terms/v7/enumset-EVEN"
   - "https://gedcom.io/terms/v7/enumset-EVENATTR"
 ...
diff --git a/extracted-files/tags/SEX b/extracted-files/tags/SEX
index b36ee962..32e6e584 100644
--- a/extracted-files/tags/SEX
+++ b/extracted-files/tags/SEX
@@ -19,7 +19,8 @@ payload: https://gedcom.io/terms/v7/type-Enum
 
 enumeration set: "https://gedcom.io/terms/v7/enumset-SEX"
 
-substructures: {}
+substructures:
+  "https://gedcom.io/terms/v7/EXID": "{0:M}"
 
 superstructures:
   "https://gedcom.io/terms/v7/record-INDI": "{0:1}"
diff --git a/extracted-files/tags/SOUR b/extracted-files/tags/SOUR
index 49c23127..826100b6 100644
--- a/extracted-files/tags/SOUR
+++ b/extracted-files/tags/SOUR
@@ -30,6 +30,11 @@ specification:
     information referenced;" with a `voidPtr` there is no information referenced,
     so the `PAGE` may describe the entire source.
     
+    A `SOUR`.`SOUR` allows indicating a source citation for a cited source from
+    which the present information was derived. For example, if the source is an
+    index that cites where the original record is located, then the `SOUR`.`SOUR`
+    would contain the location cited by the index.
+    
     A `SOURCE_CITATION` can contain a `NOTE_STRUCTURE`, which in turn can contain a
     `SOURCE_CITATION`, allowing potentially unbounded nesting of structures.
     Because each dataset is finite, this nesting is also guaranteed to be finite.
@@ -39,11 +44,14 @@ label: 'Source'
 payload: "@<https://gedcom.io/terms/v7/record-SOUR>@"
 
 substructures:
+  "https://gedcom.io/terms/v7/EXID": "{0:M}"
   "https://gedcom.io/terms/v7/NOTE": "{0:M}"
   "https://gedcom.io/terms/v7/OBJE": "{0:M}"
   "https://gedcom.io/terms/v7/PAGE": "{0:1}"
   "https://gedcom.io/terms/v7/QUAY": "{0:1}"
+  "https://gedcom.io/terms/v7/RESN": "{0:1}"
   "https://gedcom.io/terms/v7/SNOTE": "{0:M}"
+  "https://gedcom.io/terms/v7/SOUR": "{0:M}"
   "https://gedcom.io/terms/v7/SOUR-DATA": "{0:1}"
   "https://gedcom.io/terms/v7/SOUR-EVEN": "{0:1}"
 
@@ -107,10 +115,12 @@ superstructures:
   "https://gedcom.io/terms/v7/RETI": "{0:M}"
   "https://gedcom.io/terms/v7/SLGC": "{0:M}"
   "https://gedcom.io/terms/v7/SLGS": "{0:M}"
+  "https://gedcom.io/terms/v7/SOUR": "{0:M}"
   "https://gedcom.io/terms/v7/SSN": "{0:M}"
   "https://gedcom.io/terms/v7/WILL": "{0:M}"
   "https://gedcom.io/terms/v7/record-FAM": "{0:M}"
   "https://gedcom.io/terms/v7/record-INDI": "{0:M}"
   "https://gedcom.io/terms/v7/record-OBJE": "{0:M}"
   "https://gedcom.io/terms/v7/record-SNOTE": "{0:M}"
+  "https://gedcom.io/terms/v7/record-SOUR": "{0:M}"
 ...
diff --git a/extracted-files/tags/SSN b/extracted-files/tags/SSN
index ff8172dc..297849c7 100644
--- a/extracted-files/tags/SSN
+++ b/extracted-files/tags/SSN
@@ -27,6 +27,7 @@ substructures:
   "https://gedcom.io/terms/v7/CAUS": "{0:1}"
   "https://gedcom.io/terms/v7/DATE": "{0:1}"
   "https://gedcom.io/terms/v7/EMAIL": "{0:M}"
+  "https://gedcom.io/terms/v7/EXID": "{0:M}"
   "https://gedcom.io/terms/v7/FAX": "{0:M}"
   "https://gedcom.io/terms/v7/NOTE": "{0:M}"
   "https://gedcom.io/terms/v7/OBJE": "{0:M}"
diff --git a/extracted-files/tags/SUBM-ALIA b/extracted-files/tags/SUBM-ALIA
new file mode 100644
index 00000000..e4b7e5d7
--- /dev/null
+++ b/extracted-files/tags/SUBM-ALIA
@@ -0,0 +1,31 @@
+%YAML 1.2
+---
+lang: en-US
+
+type: structure
+
+uri: https://gedcom.io/terms/v7/SUBM-ALIA
+
+standard tag: ALIA
+
+specification:
+  - Alias
+  - |
+    Indicates that the user described by the superstructure is the same person as
+    the individual described by the referenced `INDI`.
+    
+    A `SUBM` may only have a single `INDI` linked in this way to simplify
+    implementation of algorithms that depend on the `INDI` representing a
+    particular user. Applications using `https://gedcom.io/terms/v7/ALIA` to
+    represent a person with multiple `INDI` records should select or generate a
+    representative `INDI` for the `SUBM`.`ALIA`.
+
+label: 'Alias'
+
+payload: "@<https://gedcom.io/terms/v7/record-INDI>@"
+
+substructures: {}
+
+superstructures:
+  "https://gedcom.io/terms/v7/record-SUBM": "{0:1}"
+...
diff --git a/extracted-files/tags/TIME b/extracted-files/tags/TIME
index 5e97b64a..48d29ef2 100644
--- a/extracted-files/tags/TIME
+++ b/extracted-files/tags/TIME
@@ -16,11 +16,10 @@ label: 'Time'
 
 payload: https://gedcom.io/terms/v7/type-Time
 
-substructures: {}
+substructures:
+  "https://gedcom.io/terms/v7/PHRASE": "{0:1}"
 
 superstructures:
   "https://gedcom.io/terms/v7/DATE": "{0:1}"
-  "https://gedcom.io/terms/v7/DATE-exact": "{0:1}"
-  "https://gedcom.io/terms/v7/HEAD-DATE": "{0:1}"
   "https://gedcom.io/terms/v7/SDATE": "{0:1}"
 ...
diff --git a/extracted-files/tags/TIME-exact b/extracted-files/tags/TIME-exact
new file mode 100644
index 00000000..70b20b5e
--- /dev/null
+++ b/extracted-files/tags/TIME-exact
@@ -0,0 +1,27 @@
+%YAML 1.2
+---
+lang: en-US
+
+type: structure
+
+uri: https://gedcom.io/terms/v7/TIME-exact
+
+standard tag: TIME
+
+specification:
+  - Time
+  - A `Time` value in a 24-hour clock format. The time should be presented in UTC
+    and indicate that with a `Z` in the time payload. Unlike a
+    `https://gedcom.io/terms/v7/TIME`, no `https://gedcom.io/terms/v7/PHRASE` is
+    permitted under a `https://gedcom.io/terms/v7/TIME-exact`.
+
+label: 'Time'
+
+payload: https://gedcom.io/terms/v7/type-Time
+
+substructures: {}
+
+superstructures:
+  "https://gedcom.io/terms/v7/DATE-exact": "{0:1}"
+  "https://gedcom.io/terms/v7/HEAD-DATE": "{0:1}"
+...
diff --git a/extracted-files/tags/UID b/extracted-files/tags/UID
index f2fcd7d3..cca3d3d7 100644
--- a/extracted-files/tags/UID
+++ b/extracted-files/tags/UID
@@ -94,6 +94,7 @@ superstructures:
   "https://gedcom.io/terms/v7/NATI": "{0:M}"
   "https://gedcom.io/terms/v7/NATU": "{0:M}"
   "https://gedcom.io/terms/v7/NMR": "{0:M}"
+  "https://gedcom.io/terms/v7/NOTE": "{0:M}"
   "https://gedcom.io/terms/v7/OCCU": "{0:M}"
   "https://gedcom.io/terms/v7/ORDN": "{0:M}"
   "https://gedcom.io/terms/v7/PROB": "{0:M}"
diff --git a/extracted-files/tags/WILL b/extracted-files/tags/WILL
index 19f6b753..155c9cc4 100644
--- a/extracted-files/tags/WILL
+++ b/extracted-files/tags/WILL
@@ -28,6 +28,7 @@ substructures:
   "https://gedcom.io/terms/v7/CAUS": "{0:1}"
   "https://gedcom.io/terms/v7/DATE": "{0:1}"
   "https://gedcom.io/terms/v7/EMAIL": "{0:M}"
+  "https://gedcom.io/terms/v7/EXID": "{0:M}"
   "https://gedcom.io/terms/v7/FAX": "{0:M}"
   "https://gedcom.io/terms/v7/NOTE": "{0:M}"
   "https://gedcom.io/terms/v7/OBJE": "{0:M}"
@@ -46,6 +47,5 @@ superstructures:
   "https://gedcom.io/terms/v7/record-INDI": "{0:M}"
 
 value of:
-  - "https://gedcom.io/terms/v7/enumset-EVEN"
   - "https://gedcom.io/terms/v7/enumset-EVENATTR"
 ...
diff --git a/extracted-files/tags/cal-FRENCH_R b/extracted-files/tags/cal-FRENCH_R
index 251bc28d..ceb06568 100644
--- a/extracted-files/tags/cal-FRENCH_R
+++ b/extracted-files/tags/cal-FRENCH_R
@@ -17,21 +17,21 @@ specification:
     
     Permitted months are
     
-    | Code   | Name                 |
-    | :----- | :------------------- |
-    | `VEND` | Vendémiaire          |
-    | `BRUM` | Brumaire             |
-    | `FRIM` | Frimaire             |
-    | `NIVO` | Nivôse               |
-    | `PLUV` | Pluviôse             |
-    | `VENT` | Ventôse              |
-    | `GERM` | Germinal             |
-    | `FLOR` | Floréal              |
-    | `PRAI` | Prairial             |
-    | `MESS` | Messidor             |
-    | `THER` | Thermidor            |
-    | `FRUC` | Fructidor            |
-    | `COMP` | Jour Complémentaires |
+    | Code   | Name                  |
+    | :----- | :-------------------- |
+    | `VEND` | Vendémiaire           |
+    | `BRUM` | Brumaire              |
+    | `FRIM` | Frimaire              |
+    | `NIVO` | Nivôse                |
+    | `PLUV` | Pluviôse              |
+    | `VENT` | Ventôse               |
+    | `GERM` | Germinal              |
+    | `FLOR` | Floréal               |
+    | `PRAI` | Prairial              |
+    | `MESS` | Messidor              |
+    | `THER` | Thermidor             |
+    | `FRUC` | Fructidor             |
+    | `COMP` | Jours complémentaires |
     
     No epoch marker is permitted in this calendar.
     
diff --git a/extracted-files/tags/enum-ADOPTED b/extracted-files/tags/enum-ADOPTED
index 00672096..3e5c0e47 100644
--- a/extracted-files/tags/enum-ADOPTED
+++ b/extracted-files/tags/enum-ADOPTED
@@ -10,7 +10,9 @@ standard tag: ADOPTED
 
 specification:
   - Adoptive parents
+  - Name given at the time of adoption.
 
 value of:
+  - "https://gedcom.io/terms/v7/enumset-NAME-TYPE"
   - "https://gedcom.io/terms/v7/enumset-PEDI"
 ...
diff --git a/extracted-files/tags/enum-CENS b/extracted-files/tags/enum-CENS
index b0dd4ac1..83f52f2b 100644
--- a/extracted-files/tags/enum-CENS
+++ b/extracted-files/tags/enum-CENS
@@ -13,6 +13,6 @@ specification:
     `https://gedcom.io/terms/v7/FAM-CENS`
 
 value of:
-  - "https://gedcom.io/terms/v7/enumset-EVEN"
   - "https://gedcom.io/terms/v7/enumset-EVENATTR"
+  - "https://gedcom.io/terms/v7/enumset-NO"
 ...
diff --git a/extracted-files/tags/enum-CIVIL b/extracted-files/tags/enum-CIVIL
new file mode 100644
index 00000000..a115acc9
--- /dev/null
+++ b/extracted-files/tags/enum-CIVIL
@@ -0,0 +1,17 @@
+%YAML 1.2
+---
+lang: en-US
+
+type: enumeration
+
+uri: https://gedcom.io/terms/v7/enum-CIVIL
+
+standard tag: CIVIL
+
+specification:
+  - A civil marriage event, creating a state of marriage via a civil ceremony or
+    registration process
+
+value of:
+  - "https://gedcom.io/terms/v7/enumset-MARR-KIND"
+...
diff --git a/extracted-files/tags/enum-COMMON_LAW b/extracted-files/tags/enum-COMMON_LAW
new file mode 100644
index 00000000..5f1d8764
--- /dev/null
+++ b/extracted-files/tags/enum-COMMON_LAW
@@ -0,0 +1,16 @@
+%YAML 1.2
+---
+lang: en-US
+
+type: enumeration
+
+uri: https://gedcom.io/terms/v7/enum-COMMON_LAW
+
+standard tag: COMMON_LAW
+
+specification:
+  - Civil or religious recognition of a preexisting informal marriage
+
+value of:
+  - "https://gedcom.io/terms/v7/enumset-MARR-KIND"
+...
diff --git a/extracted-files/tags/enum-DIGITAL b/extracted-files/tags/enum-DIGITAL
new file mode 100644
index 00000000..59a4e0e8
--- /dev/null
+++ b/extracted-files/tags/enum-DIGITAL
@@ -0,0 +1,16 @@
+%YAML 1.2
+---
+lang: en-US
+
+type: enumeration
+
+uri: https://gedcom.io/terms/v7/enum-DIGITAL
+
+standard tag: DIGITAL
+
+specification:
+  - Digital storage medium
+
+value of:
+  - "https://gedcom.io/terms/v7/enumset-MEDI"
+...
diff --git a/extracted-files/tags/enum-ELECTRONIC b/extracted-files/tags/enum-ELECTRONIC
index b44d8c80..38e663d9 100644
--- a/extracted-files/tags/enum-ELECTRONIC
+++ b/extracted-files/tags/enum-ELECTRONIC
@@ -9,7 +9,7 @@ uri: https://gedcom.io/terms/v7/enum-ELECTRONIC
 standard tag: ELECTRONIC
 
 specification:
-  - A digital artifact
+  - A digital artifact (deprecated)
 
 value of:
   - "https://gedcom.io/terms/v7/enumset-MEDI"
diff --git a/extracted-files/tags/enum-GRAVE b/extracted-files/tags/enum-GRAVE
new file mode 100644
index 00000000..e1b6960e
--- /dev/null
+++ b/extracted-files/tags/enum-GRAVE
@@ -0,0 +1,16 @@
+%YAML 1.2
+---
+lang: en-US
+
+type: enumeration
+
+uri: https://gedcom.io/terms/v7/enum-GRAVE
+
+standard tag: GRAVE
+
+specification:
+  - Buried under the ground
+
+value of:
+  - "https://gedcom.io/terms/v7/enumset-BURI-KIND"
+...
diff --git a/extracted-files/tags/enum-INFORMAL b/extracted-files/tags/enum-INFORMAL
new file mode 100644
index 00000000..93d2cdb7
--- /dev/null
+++ b/extracted-files/tags/enum-INFORMAL
@@ -0,0 +1,17 @@
+%YAML 1.2
+---
+lang: en-US
+
+type: enumeration
+
+uri: https://gedcom.io/terms/v7/enum-INFORMAL
+
+standard tag: INFORMAL
+
+specification:
+  - An informal or de facto marriage, creating a state of marriage by mutual
+    agreement without civil or religious involvement
+
+value of:
+  - "https://gedcom.io/terms/v7/enumset-MARR-KIND"
+...
diff --git a/extracted-files/tags/enum-ONLINE b/extracted-files/tags/enum-ONLINE
new file mode 100644
index 00000000..e6d066dd
--- /dev/null
+++ b/extracted-files/tags/enum-ONLINE
@@ -0,0 +1,16 @@
+%YAML 1.2
+---
+lang: en-US
+
+type: enumeration
+
+uri: https://gedcom.io/terms/v7/enum-ONLINE
+
+standard tag: ONLINE
+
+specification:
+  - Online digital artifact
+
+value of:
+  - "https://gedcom.io/terms/v7/enumset-MEDI"
+...
diff --git a/extracted-files/tags/enum-OTHER b/extracted-files/tags/enum-OTHER
index adcc706d..1fd9cba7 100644
--- a/extracted-files/tags/enum-OTHER
+++ b/extracted-files/tags/enum-OTHER
@@ -9,9 +9,12 @@ uri: https://gedcom.io/terms/v7/enum-OTHER
 standard tag: OTHER
 
 specification:
+  - A value not listed here; should be paired with a `TYPE` structure
   - A value not listed here; should have a `PHRASE` substructure
 
 value of:
+  - "https://gedcom.io/terms/v7/enumset-BURI-KIND"
+  - "https://gedcom.io/terms/v7/enumset-MARR-KIND"
   - "https://gedcom.io/terms/v7/enumset-MEDI"
   - "https://gedcom.io/terms/v7/enumset-NAME-TYPE"
   - "https://gedcom.io/terms/v7/enumset-PEDI"
diff --git a/extracted-files/tags/enum-RELIGIOUS b/extracted-files/tags/enum-RELIGIOUS
new file mode 100644
index 00000000..651a0a65
--- /dev/null
+++ b/extracted-files/tags/enum-RELIGIOUS
@@ -0,0 +1,17 @@
+%YAML 1.2
+---
+lang: en-US
+
+type: enumeration
+
+uri: https://gedcom.io/terms/v7/enum-RELIGIOUS
+
+standard tag: RELIGIOUS
+
+specification:
+  - A religious marriage event, creating a state of marriage via a religious
+    ceremony or registration process
+
+value of:
+  - "https://gedcom.io/terms/v7/enumset-MARR-KIND"
+...
diff --git a/extracted-files/tags/enum-SEA b/extracted-files/tags/enum-SEA
new file mode 100644
index 00000000..c02e98e3
--- /dev/null
+++ b/extracted-files/tags/enum-SEA
@@ -0,0 +1,16 @@
+%YAML 1.2
+---
+lang: en-US
+
+type: enumeration
+
+uri: https://gedcom.io/terms/v7/enum-SEA
+
+standard tag: SEA
+
+specification:
+  - Deposited in an ocean, lake, or other body of water
+
+value of:
+  - "https://gedcom.io/terms/v7/enumset-BURI-KIND"
+...
diff --git a/extracted-files/tags/enum-SKY b/extracted-files/tags/enum-SKY
new file mode 100644
index 00000000..77cb29bd
--- /dev/null
+++ b/extracted-files/tags/enum-SKY
@@ -0,0 +1,16 @@
+%YAML 1.2
+---
+lang: en-US
+
+type: enumeration
+
+uri: https://gedcom.io/terms/v7/enum-SKY
+
+standard tag: SKY
+
+specification:
+  - Placed on a burial tree, mountain, or other open place to be excarnated
+
+value of:
+  - "https://gedcom.io/terms/v7/enumset-BURI-KIND"
+...
diff --git a/extracted-files/tags/enum-VAULT b/extracted-files/tags/enum-VAULT
new file mode 100644
index 00000000..179b1261
--- /dev/null
+++ b/extracted-files/tags/enum-VAULT
@@ -0,0 +1,16 @@
+%YAML 1.2
+---
+lang: en-US
+
+type: enumeration
+
+uri: https://gedcom.io/terms/v7/enum-VAULT
+
+standard tag: VAULT
+
+specification:
+  - Placed in a tomb or crypt
+
+value of:
+  - "https://gedcom.io/terms/v7/enumset-BURI-KIND"
+...
diff --git a/extracted-files/tags/enumset-BURI-KIND b/extracted-files/tags/enumset-BURI-KIND
new file mode 100644
index 00000000..56034758
--- /dev/null
+++ b/extracted-files/tags/enumset-BURI-KIND
@@ -0,0 +1,15 @@
+%YAML 1.2
+---
+lang: en-US
+
+type: enumeration set
+
+uri: https://gedcom.io/terms/v7/enumset-BURI-KIND
+
+enumeration values:
+  - "https://gedcom.io/terms/v7/enum-GRAVE"
+  - "https://gedcom.io/terms/v7/enum-VAULT"
+  - "https://gedcom.io/terms/v7/enum-SEA"
+  - "https://gedcom.io/terms/v7/enum-SKY"
+  - "https://gedcom.io/terms/v7/enum-OTHER"
+...
diff --git a/extracted-files/tags/enumset-MARR-KIND b/extracted-files/tags/enumset-MARR-KIND
new file mode 100644
index 00000000..1ac291ba
--- /dev/null
+++ b/extracted-files/tags/enumset-MARR-KIND
@@ -0,0 +1,15 @@
+%YAML 1.2
+---
+lang: en-US
+
+type: enumeration set
+
+uri: https://gedcom.io/terms/v7/enumset-MARR-KIND
+
+enumeration values:
+  - "https://gedcom.io/terms/v7/enum-CIVIL"
+  - "https://gedcom.io/terms/v7/enum-COMMON_LAW"
+  - "https://gedcom.io/terms/v7/enum-INFORMAL"
+  - "https://gedcom.io/terms/v7/enum-RELIGIOUS"
+  - "https://gedcom.io/terms/v7/enum-OTHER"
+...
diff --git a/extracted-files/tags/enumset-MEDI b/extracted-files/tags/enumset-MEDI
index 9f69effe..e19adb3b 100644
--- a/extracted-files/tags/enumset-MEDI
+++ b/extracted-files/tags/enumset-MEDI
@@ -10,6 +10,7 @@ enumeration values:
   - "https://gedcom.io/terms/v7/enum-AUDIO"
   - "https://gedcom.io/terms/v7/enum-BOOK"
   - "https://gedcom.io/terms/v7/enum-CARD"
+  - "https://gedcom.io/terms/v7/enum-DIGITAL"
   - "https://gedcom.io/terms/v7/enum-ELECTRONIC"
   - "https://gedcom.io/terms/v7/enum-FICHE"
   - "https://gedcom.io/terms/v7/enum-FILM"
@@ -17,6 +18,7 @@ enumeration values:
   - "https://gedcom.io/terms/v7/enum-MANUSCRIPT"
   - "https://gedcom.io/terms/v7/enum-MAP"
   - "https://gedcom.io/terms/v7/enum-NEWSPAPER"
+  - "https://gedcom.io/terms/v7/enum-ONLINE"
   - "https://gedcom.io/terms/v7/enum-PHOTO"
   - "https://gedcom.io/terms/v7/enum-TOMBSTONE"
   - "https://gedcom.io/terms/v7/enum-VIDEO"
diff --git a/extracted-files/tags/enumset-NAME-TYPE b/extracted-files/tags/enumset-NAME-TYPE
index 291dfed2..53a30c48 100644
--- a/extracted-files/tags/enumset-NAME-TYPE
+++ b/extracted-files/tags/enumset-NAME-TYPE
@@ -7,6 +7,7 @@ type: enumeration set
 uri: https://gedcom.io/terms/v7/enumset-NAME-TYPE
 
 enumeration values:
+  - "https://gedcom.io/terms/v7/enum-ADOPTED"
   - "https://gedcom.io/terms/v7/enum-AKA"
   - "https://gedcom.io/terms/v7/enum-BIRTH"
   - "https://gedcom.io/terms/v7/enum-IMMIGRANT"
diff --git a/extracted-files/tags/enumset-NO b/extracted-files/tags/enumset-NO
new file mode 100644
index 00000000..ea9d5e14
--- /dev/null
+++ b/extracted-files/tags/enumset-NO
@@ -0,0 +1,11 @@
+%YAML 1.2
+---
+lang: en-US
+
+type: enumeration set
+
+uri: https://gedcom.io/terms/v7/enumset-NO
+
+enumeration values:
+  - "https://gedcom.io/terms/v7/enum-CENS"
+...
diff --git a/extracted-files/tags/month-COMP b/extracted-files/tags/month-COMP
index e2de50ea..34c80351 100644
--- a/extracted-files/tags/month-COMP
+++ b/extracted-files/tags/month-COMP
@@ -9,9 +9,9 @@ uri: https://gedcom.io/terms/v7/month-COMP
 standard tag: COMP
 
 specification:
-  - Jour Complémentaires
+  - Jours complémentaires
 
-label: 'Jour Complémentaires'
+label: 'Jours complémentaires'
 
 calendars:
   - "https://gedcom.io/terms/v7/cal-FRENCH_R"
diff --git a/extracted-files/tags/record-REPO b/extracted-files/tags/record-REPO
index 4eadba74..aa909d4f 100644
--- a/extracted-files/tags/record-REPO
+++ b/extracted-files/tags/record-REPO
@@ -40,6 +40,7 @@ substructures:
   "https://gedcom.io/terms/v7/NOTE": "{0:M}"
   "https://gedcom.io/terms/v7/PHON": "{0:M}"
   "https://gedcom.io/terms/v7/REFN": "{0:M}"
+  "https://gedcom.io/terms/v7/RESN": "{0:1}"
   "https://gedcom.io/terms/v7/SNOTE": "{0:M}"
   "https://gedcom.io/terms/v7/UID": "{0:M}"
   "https://gedcom.io/terms/v7/WWW": "{0:M}"
diff --git a/extracted-files/tags/record-SNOTE b/extracted-files/tags/record-SNOTE
index 5c261e57..f4c4acdf 100644
--- a/extracted-files/tags/record-SNOTE
+++ b/extracted-files/tags/record-SNOTE
@@ -19,9 +19,8 @@ specification:
     
     A shared note record may be pointed to by multiple other structures. Shared
     notes should only be used if editing the note in one place should edit it in
-    all other places or if the note itself requires an `IDENTIFIER_STRUCTURE`. If
-    each instance of the note may be edited separately and no identifier is needed,
-    a `NOTE` should be used instead.
+    all other places. If any instance of the note is edited separately from the
+    others, a `NOTE` should be used instead.
     
     Each [`SNOTE`.`TRAN`] must have either a `MIME` or `LANG` substructure or
     both.
@@ -68,6 +67,7 @@ substructures:
   "https://gedcom.io/terms/v7/MIME": "{0:1}"
   "https://gedcom.io/terms/v7/NOTE-TRAN": "{0:M}"
   "https://gedcom.io/terms/v7/REFN": "{0:M}"
+  "https://gedcom.io/terms/v7/RESN": "{0:1}"
   "https://gedcom.io/terms/v7/SOUR": "{0:M}"
   "https://gedcom.io/terms/v7/UID": "{0:M}"
 
diff --git a/extracted-files/tags/record-SOUR b/extracted-files/tags/record-SOUR
index 44c724b8..9937a6d2 100644
--- a/extracted-files/tags/record-SOUR
+++ b/extracted-files/tags/record-SOUR
@@ -17,6 +17,11 @@ specification:
     The part of a source relevant to a specific fact, such as a specific page or
     entry, is indicated in a `SOURCE_CITATION` that points to the source record.
     
+    The source record may itself contain a `SOURCE_CITATION` for a source from
+    which the present source was derived. For example, if the source is a
+    translation of another source, then the `SOURCE_CITATION` might reference the
+    original source.
+    
     <div class="note">
     
     This sourcing model is known to be insufficient for some use cases and may be
@@ -45,7 +50,9 @@ substructures:
   "https://gedcom.io/terms/v7/PUBL": "{0:1}"
   "https://gedcom.io/terms/v7/REFN": "{0:M}"
   "https://gedcom.io/terms/v7/REPO": "{0:M}"
+  "https://gedcom.io/terms/v7/RESN": "{0:1}"
   "https://gedcom.io/terms/v7/SNOTE": "{0:M}"
+  "https://gedcom.io/terms/v7/SOUR": "{0:M}"
   "https://gedcom.io/terms/v7/TEXT": "{0:1}"
   "https://gedcom.io/terms/v7/TITL": "{0:1}"
   "https://gedcom.io/terms/v7/UID": "{0:M}"
diff --git a/extracted-files/tags/record-SUBM b/extracted-files/tags/record-SUBM
index 2dcc7138..eb368ee1 100644
--- a/extracted-files/tags/record-SUBM
+++ b/extracted-files/tags/record-SUBM
@@ -33,7 +33,9 @@ substructures:
   "https://gedcom.io/terms/v7/OBJE": "{0:M}"
   "https://gedcom.io/terms/v7/PHON": "{0:M}"
   "https://gedcom.io/terms/v7/REFN": "{0:M}"
+  "https://gedcom.io/terms/v7/RESN": "{0:1}"
   "https://gedcom.io/terms/v7/SNOTE": "{0:M}"
+  "https://gedcom.io/terms/v7/SUBM-ALIA": "{0:1}"
   "https://gedcom.io/terms/v7/SUBM-LANG": "{0:M}"
   "https://gedcom.io/terms/v7/UID": "{0:M}"
   "https://gedcom.io/terms/v7/WWW": "{0:M}"
diff --git a/extracted-files/tags/type-Age b/extracted-files/tags/type-Age
index 4e176f39..89a76239 100644
--- a/extracted-files/tags/type-Age
+++ b/extracted-files/tags/type-Age
@@ -49,6 +49,16 @@ specification:
     be unaware of these traditions or may fail to convert them to the round-down
     convention, errors in age of up to a year are common.
     
+    <div class="note">
+    
+    Because age payloads are intended to allow recording the age as it was recorded
+    in records that could contain errors, odd ages such as `8w 30d`, `1y 400d`,
+    `1y 30m`, etc. are permitted. Some applications might convert these to more
+    standard forms; if so, it is recommended that they use a `PHRASE` substructure
+    to hold the original form.
+    
+    </div>
+    
     Age payloads may also be omitted entirely if no suitable form is known but a
     substructure (such as a `PHRASE`) is desired.
     
diff --git a/extracted-files/tags/type-FilePath b/extracted-files/tags/type-FilePath
new file mode 100644
index 00000000..97b2e785
--- /dev/null
+++ b/extracted-files/tags/type-FilePath
@@ -0,0 +1,56 @@
+%YAML 1.2
+---
+lang: en-US
+
+type: data type
+
+uri: https://gedcom.io/terms/v7/type-FilePath
+
+specification:
+  - |
+    The file path data type describes where an digital file is located in a
+    machine-readable way. Syntactically, the payload is a URI reference as defined
+    by [RFC 3986], or a valid URL string as defined by the [WHATWG URL
+    specification]. That is, it can be an absolute or relative URL, optionally
+    with a fragment string.
+    
+    Version 7.0 only supports the following URLs:
+    
+    - A URL with scheme `ftp`, `http`, or `https` refers to a **web-accessible
+      file**.
+    
+    - A URL with scheme `file` refers to either a **local file** or a **non-local
+      file**, as defined by [RFC 8089]. Local file URLs must not be used in
+      [FamilySearch GEDZIP] and should be avoided in datasets that are expected
+      to be shared on the web or with unknown parties, but may be appropriate for
+      close collaboration between parties with known similar file structures.
+    
+    - A URI reference with all of the following:
+    
+      - no scheme
+      - not beginning with `/` (U+002F)
+      - not containing any path segments equal to `..` (U+002E U+002E)
+      - not containing a reverse solidus character (U+005C `\`) or `banned`
+        character, either directly or in escaped form
+      - no query or fragment
+    
+      refers to a **local file**. If the dataset is part of a [GEDZIP file], the
+      URL of the local file is a zip archive filename; otherwise, the URL of a
+      local file is resolved with *base* equal to the directory containing the
+      dataset.
+    
+      It is recommended that local files use the directory prefix `media/`, but
+      doing so is not required.
+    
+      For compatibility with [GEDZIP] and related formats, it is recommended that
+      the following file paths not be used:
+    
+      - `gedcom.ged`
+      - `MANIFEST.MF`
+      - any URL beginning `META-INF/`
+    
+    Additional URLs may be supported in future versions of this specification.
+    
+    The URI for the `FilePath` data type is
+    `https://gedcom.io/terms/v7/type-FilePath`.
+...
diff --git a/specification/gedcom-0-introduction.md b/specification/gedcom-0-introduction.md
index 450d4b60..8c848a30 100644
--- a/specification/gedcom-0-introduction.md
+++ b/specification/gedcom-0-introduction.md
@@ -1,10 +1,10 @@
 ---
 title: The FamilySearch GEDCOM Specification
-subtitle: 7.0.13
+subtitle: 7.0.14
 email: GEDCOM@FamilySearch.org
 copyright: |
     :::{style="page-break-after: always;page-break-before: always;"}
-    Copyright 1984–2023 Intellectual Reserve, Inc. All rights reserved. A service provided by The Church of Jesus Christ of Latter-day Saints.
+    Copyright 1984–2024 Intellectual Reserve, Inc. All rights reserved. A service provided by The Church of Jesus Christ of Latter-day Saints.
     
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -20,7 +20,7 @@ copyright: |
     
     > NOTICE:
     > 
-    > This work comprises, is based on, or is derived from the FAMILYSEARCH GEDCOM™ Specification, © 1984-2023 Intellectual Reserve, Inc. All rights reserved.
+    > This work comprises, is based on, or is derived from the FAMILYSEARCH GEDCOM™ Specification, © 1984-2024 Intellectual Reserve, Inc. All rights reserved.
     >
     > "FAMILYSEARCH GEDCOM™" and "FAMILYSEARCH®" are trademarks of Intellectual Reserve, Inc. and may not be used except as allowed by the Apache 2.0 license that governs this work or as expressly authorized in writing and in advance by Intellectual Reserve, Inc.
     :::
diff --git a/specification/gedcom-1-hierarchical-container-format.md b/specification/gedcom-1-hierarchical-container-format.md
index aa258af1..f7ffceb7 100644
--- a/specification/gedcom-1-hierarchical-container-format.md
+++ b/specification/gedcom-1-hierarchical-container-format.md
@@ -319,7 +319,7 @@ Extensions cannot change existing meanings, cardinalities, or calendars.
 A **tagged extension structure** is a structure whose tag matches production `extTag`. Tagged extension structures may appear as records or substructures of any other structure. Their meaning is defined by their tag, as is discussed more fully in the section [Extension Tags].
 
 Any substructure of a tagged extension structure that uses a tag matching `stdTag` is an **extension-defined substructure**.
-Substructures of an extension-defined substructure that uses a tag matching `stdTag` are also extension-defined substructures.
+Substructures of an extension-defined substructure that uses a tag matching `stdTag` are also extension-defined substructures, but this specification deprecates using a `stdTag` with a definition that does not match any standard type with that tag.
 The meaning and use of each extension-defined substructure is defined by the tagged extension structure it occurs within, not by its tag alone nor by this specification.
 
 :::example
@@ -337,7 +337,8 @@ In the following
 ```
 
 - Both uses of `_LOC` are tagged extension structures, as is `_POP`.
-- `_LOC`.`NAME` and `_LOC`.`NAME`.`DATE` are both extension-defined substructures. Their meaning is defined by the specification defining `_LOC`.
+- `_LOC`.`NAME` and `_LOC`.`NAME`.`DATE` are both extension-defined substructures. Their meaning is defined by the specification defining `_LOC`, but since no standard definition of `NAME` permits `DATE` as a substructure, such use is
+deprecated.
 - `_POP`.`DATE` is an extension-defined substructure. Its meaning is defined by the specification defining `_POP`.
 - Even though both `DATE`s appear to have `g7:type-DATE` payloads, we can't know that is the intended data type without consulting the defining specifications of `_LOC` and `_POP`, respectively. The first might be a `g7:type-DATE#period` and the second a `g7:type-DATE#exact`, for example.
 :::
diff --git a/specification/gedcom-2-data-types.md b/specification/gedcom-2-data-types.md
index 0546f98e..b8ff31c7 100644
--- a/specification/gedcom-2-data-types.md
+++ b/specification/gedcom-2-data-types.md
@@ -225,6 +225,12 @@ Because numbers are rounded down, `>` effectively includes its endpoint; that is
 
 Different cultures count ages differently. Some increment years on the anniversary of birth and others at particular seasons. Some round to the nearest year, others round years down, others round years up. Because users may be unaware of these traditions or may fail to convert them to the round-down convention, errors in age of up to a year are common.
 
+:::note
+Because age payloads are intended to allow recording the age as it was recorded in records that could contain errors,
+odd ages such as `8w 30d`, `1y 400d`, `1y 30m`, etc. are permitted.  Some applications might convert these to more
+standard forms; if so, it is recommended that they use a `PHRASE` substructure to hold the original form.
+:::
+
 Age payloads may also be omitted entirely if no suitable form is known but a substructure (such as a `PHRASE`) is desired.
 
 :::note
@@ -304,13 +310,14 @@ registered values and extension values.
 MediaType = type "/" subtype parameters
 ```
 where:
-* `type` and `subtype` are defined in [RFC 2045](https://www.rfc-editor.org/info/rfc2045)
+
+- `type` and `subtype` are defined in [RFC 2045](https://www.rfc-editor.org/info/rfc2045)
   section 5.1, and registered values (i.e., those not beginning with "x-") are further
   constrained by the definitions in
   [RFC 6838](https://www.rfc-editor.org/info/rfc6838), section 4.2.
   A [registry of media types](https://www.iana.org/assignments/media-types/media-types.xhtml)
   is maintained publicly by the IANA.
-* `parameters` is defined in [RFC 9110](https://www.rfc-editor.org/info/rfc9110),
+- `parameters` is defined in [RFC 9110](https://www.rfc-editor.org/info/rfc9110),
   section 5.6.6.  Note that the `parameters` definition in GEDCOM matches that used by HTTP
   headers which permit whitespace around the ";" delimiter, whereas email headers in
   RFC 2045 do not.
diff --git a/specification/gedcom-3-structures-1-organization.md b/specification/gedcom-3-structures-1-organization.md
index 7d0a4355..7b059eb4 100644
--- a/specification/gedcom-3-structures-1-organization.md
+++ b/specification/gedcom-3-structures-1-organization.md
@@ -145,11 +145,11 @@ n HEAD                                     {1:1}  g7:HEAD
         +3 WWW <Special>                   {0:M}  g7:WWW
      +2 DATA <Text>                        {0:1}  g7:HEAD-SOUR-DATA
         +3 DATE <DateExact>                {0:1}  g7:DATE-exact
-           +4 TIME <Time>                  {0:1}  g7:TIME
+           +4 TIME <Time>                  {0:1}  g7:TIME-exact
         +3 COPR <Text>                     {0:1}  g7:COPR
   +1 DEST <Special>                        {0:1}  g7:DEST
   +1 DATE <DateExact>                      {0:1}  g7:HEAD-DATE
-     +2 TIME <Time>                        {0:1}  g7:TIME
+     +2 TIME <Time>                        {0:1}  g7:TIME-exact
   +1 SUBM @<XREF:SUBM>@                    {0:1}  g7:SUBM
   +1 COPR <Text>                           {0:1}  g7:COPR
   +1 LANG <Language>                       {0:1}  g7:HEAD-LANG
@@ -179,7 +179,7 @@ n @XREF:FAM@ FAM                           {1:1}  g7:record-FAM
   +1 RESN <List:Enum>                      {0:1}  g7:RESN
   +1 <<FAMILY_ATTRIBUTE_STRUCTURE>>        {0:M}
   +1 <<FAMILY_EVENT_STRUCTURE>>            {0:M}
-  +1 <<NON_EVENT_STRUCTURE>>               {0:M}
+  +1 <<NEGATIVE_ASSERTION>>                {0:M}
   +1 HUSB @<XREF:INDI>@                    {0:1}  g7:FAM-HUSB
      +2 PHRASE <Text>                      {0:1}  g7:PHRASE
   +1 WIFE @<XREF:INDI>@                    {0:1}  g7:FAM-WIFE
@@ -237,16 +237,21 @@ n @XREF:INDI@ INDI                         {1:1}  g7:record-INDI
   +1 RESN <List:Enum>                      {0:1}  g7:RESN
   +1 <<PERSONAL_NAME_STRUCTURE>>           {0:M}
   +1 SEX <Enum>                            {0:1}  g7:SEX
+     +2 EXID <Special>                     {0:M}  g7:EXID
+        +3 TYPE <Special>                  {0:1}  g7:EXID-TYPE
   +1 <<INDIVIDUAL_ATTRIBUTE_STRUCTURE>>    {0:M}
   +1 <<INDIVIDUAL_EVENT_STRUCTURE>>        {0:M}
-  +1 <<NON_EVENT_STRUCTURE>>               {0:M}
+  +1 <<NEGATIVE_ASSERTION>>                {0:M}
   +1 <<LDS_INDIVIDUAL_ORDINANCE>>          {0:M}
   +1 FAMC @<XREF:FAM>@                     {0:M}  g7:INDI-FAMC
-     +2 PEDI <Enum>                        {0:1}  g7:PEDI
+     +2 PEDI <Enum>                        {0:M}  g7:PEDI
         +3 PHRASE <Text>                   {0:1}  g7:PHRASE
+        +3 DATE <DateValue>                {0:1}  g7:DATE
      +2 STAT <Enum>                        {0:1}  g7:FAMC-STAT
         +3 PHRASE <Text>                   {0:1}  g7:PHRASE
      +2 <<NOTE_STRUCTURE>>                 {0:M}
+     +2 EXID <Special>                     {0:M}  g7:EXID
+        +3 TYPE <Special>                  {0:1}  g7:EXID-TYPE
   +1 FAMS @<XREF:FAM>@                     {0:M}  g7:FAMS
      +2 <<NOTE_STRUCTURE>>                 {0:M}
   +1 SUBM @<XREF:SUBM>@                    {0:M}  g7:SUBM
@@ -330,6 +335,7 @@ not the underlying files.
 
 ```gedstruct
 n @XREF:REPO@ REPO                         {1:1}  g7:record-REPO
+  +1 RESN <List:Enum>                      {0:1}  g7:RESN
   +1 NAME <Text>                           {1:1}  g7:NAME
   +1 <<ADDRESS_STRUCTURE>>                 {0:1}
   +1 PHON <Special>                        {0:M}  g7:PHON
@@ -355,6 +361,7 @@ Until such time, it is recommended that the repository record store current cont
 
 ```gedstruct
 n @XREF:SNOTE@ SNOTE <Text>                {1:1}  g7:record-SNOTE
+  +1 RESN <List:Enum>                      {0:1}  g7:RESN
   +1 MIME <MediaType>                      {0:1}  g7:MIME
   +1 LANG <Language>                       {0:1}  g7:LANG
   +1 TRAN <Text>                           {0:M}  g7:NOTE-TRAN
@@ -369,9 +376,8 @@ n @XREF:SNOTE@ SNOTE <Text>                {1:1}  g7:record-SNOTE
 A catch-all location for information that does not fully fit within other structures.
 It may include research notes, additional context, alternative interpretations, reasoning, and so forth.
 
-A shared note record may be pointed to by multiple other structures. Shared notes should only be used if editing the note in one place should edit it in all other places
-or if the note itself requires an `IDENTIFIER_STRUCTURE`.
-If each instance of the note may be edited separately and no identifier is needed, a `NOTE` should be used instead.
+A shared note record may be pointed to by multiple other structures. Shared notes should only be used if editing the note in one place should edit it in all other places.
+If any instance of the note is edited separately from the others, a `NOTE` should be used instead.
 
 Each [`SNOTE`.`TRAN`](#NOTE-TRAN) must have either a `MIME` or `LANG` substructure or both.
 
@@ -400,6 +406,7 @@ A `SHARED_NOTE_RECORD` may contain a pointer to a `SOURCE_RECORD` and vice versa
 
 ```gedstruct
 n @XREF:SOUR@ SOUR                         {1:1}  g7:record-SOUR
+  +1 RESN <List:Enum>                      {0:1}  g7:RESN
   +1 DATA                                  {0:1}  g7:DATA
      +2 EVEN <List:Enum>                   {0:M}  g7:DATA-EVEN
         +3 DATE <DatePeriod>               {0:1}  g7:DATA-EVEN-DATE
@@ -417,6 +424,7 @@ n @XREF:SOUR@ SOUR                         {1:1}  g7:record-SOUR
   +1 <<SOURCE_REPOSITORY_CITATION>>        {0:M}
   +1 <<IDENTIFIER_STRUCTURE>>              {0:M}
   +1 <<NOTE_STRUCTURE>>                    {0:M}
+  +1 <<SOURCE_CITATION>>                   {0:M}
   +1 <<MULTIMEDIA_LINK>>                   {0:M}
   +1 <<CHANGE_DATE>>                       {0:1}
   +1 <<CREATION_DATE>>                     {0:1}
@@ -426,6 +434,10 @@ A source record describes an entire source.
 A source may also point to `REPO`s to describe repositories or archives where the source document may be found.
 The part of a source relevant to a specific fact, such as a specific page or entry, is indicated in a `SOURCE_CITATION` that points to the source record.
 
+The source record may itself contain a `SOURCE_CITATION` for a source from which the present
+source was derived.  For example, if the source is a translation of another source, then the
+`SOURCE_CITATION` might reference the original source.
+
 :::note
 This sourcing model is known to be insufficient for some use cases and may be refined in a future version of this specification.
 :::
@@ -436,6 +448,7 @@ A `SOURCE_RECORD` may contain a pointer to a `SHARED_NOTE_RECORD` and vice versa
 
 ```gedstruct
 n @XREF:SUBM@ SUBM                         {1:1}  g7:record-SUBM
+  +1 RESN <List:Enum>                      {0:1}  g7:RESN
   +1 NAME <Text>                           {1:1}  g7:NAME
   +1 <<ADDRESS_STRUCTURE>>                 {0:1}
   +1 PHON <Special>                        {0:M}  g7:PHON
@@ -444,6 +457,7 @@ n @XREF:SUBM@ SUBM                         {1:1}  g7:record-SUBM
   +1 WWW <Special>                         {0:M}  g7:WWW
   +1 <<MULTIMEDIA_LINK>>                   {0:M}
   +1 LANG <Language>                       {0:M}  g7:SUBM-LANG
+  +1 ALIA @<XREF:INDI>@                    {0:1}  g7:SUBM-ALIA
   +1 <<IDENTIFIER_STRUCTURE>>              {0:M}
   +1 <<NOTE_STRUCTURE>>                    {0:M}
   +1 <<CHANGE_DATE>>                       {0:1}
@@ -527,7 +541,7 @@ and that individual `@I2@` was the clergy officiating at their baptism.
 ```gedstruct
 n CHAN                                     {1:1}  g7:CHAN
   +1 DATE <DateExact>                      {1:1}  g7:DATE-exact
-     +2 TIME <Time>                        {0:1}  g7:TIME
+     +2 TIME <Time>                        {0:1}  g7:TIME-exact
   +1 <<NOTE_STRUCTURE>>                    {0:M}
 ```
 
@@ -540,7 +554,7 @@ The `NOTE` substructure may describe previous changes as well as the most recent
 ```gedstruct
 n CREA                                     {1:1}  g7:CREA
   +1 DATE <DateExact>                      {1:1}  g7:DATE-exact
-     +2 TIME <Time>                        {0:1}  g7:TIME
+     +2 TIME <Time>                        {0:1}  g7:TIME-exact
 ```
 
 The date of the initial creation of the superstructure.
@@ -551,6 +565,7 @@ Because this refers to the initial creation, it should not be modified after the
 ```gedstruct
 n DATE <DateValue>                         {1:1}  g7:DATE
   +1 TIME <Time>                           {0:1}  g7:TIME
+     +2 PHRASE <Text>                      {0:1}  g7:PHRASE
   +1 PHRASE <Text>                         {0:1}  g7:PHRASE
 ```
 
@@ -579,12 +594,15 @@ n CAUS <Text>                              {0:1}  g7:CAUS
 n RESN <List:Enum>                         {0:1}  g7:RESN
 n SDATE <DateValue>                        {0:1}  g7:SDATE
   +1 TIME <Time>                           {0:1}  g7:TIME
+     +2 PHRASE <Text>                      {0:1}  g7:PHRASE
   +1 PHRASE <Text>                         {0:1}  g7:PHRASE
 n <<ASSOCIATION_STRUCTURE>>                {0:M}
 n <<NOTE_STRUCTURE>>                       {0:M}
 n <<SOURCE_CITATION>>                      {0:M}
 n <<MULTIMEDIA_LINK>>                      {0:M}
 n UID <Special>                            {0:M}  g7:UID
+n EXID <Special>                           {0:M}  g7:EXID
+  +1 TYPE <Special>                        {0:1}  g7:EXID-TYPE
 ```
 
 Substructures that may be shared by most individual and family events and attributes.
@@ -672,6 +690,7 @@ n MARL [Y|<NULL>]                          {1:1}  g7:MARL
 |
 n MARR [Y|<NULL>]                          {1:1}  g7:MARR
   +1 TYPE <Text>                           {0:1}  g7:TYPE
+  +1 KIND <Enum>                           {0:1}  g7:MARR-KIND
   +1 <<FAMILY_EVENT_DETAIL>>               {0:1}
 |
 n MARS [Y|<NULL>]                          {1:1}  g7:MARS
@@ -688,7 +707,7 @@ Family events; see [Family Events](#family-events) for descriptions of each fami
 
 An event structure may be used to discuss an event even if the event is not known to have occurred.
 See [Events] for a discussion of how `DATE`, `PLAC`, and the optional `Y` payload indicate whether the structure is asserting the event occurred.
-See the `NON_EVENT_STRUCTURE` for how to state an event did not occur.
+See the `NEGATIVE_ASSERTION` for how to state an event did not occur.
 
 :::note
 Family event structures vary as follows:
@@ -802,9 +821,9 @@ Individual attribute structures vary as follows:
 #### `INDIVIDUAL_EVENT_DETAIL` :=
 
 ```gedstruct
-n <<EVENT_DETAIL>>                         {1:1}
 n AGE <Age>                                {0:1}  g7:AGE
   +1 PHRASE <Text>                         {0:1}  g7:PHRASE
+n <<EVENT_DETAIL>>                         {1:1}
 ```
 
 Substructures shared by most individual events and attributes.
@@ -843,6 +862,7 @@ n BLES [Y|<NULL>]                          {1:1}  g7:BLES
 |
 n BURI [Y|<NULL>]                          {1:1}  g7:BURI
   +1 TYPE <Text>                           {0:1}  g7:TYPE
+  +1 KIND <Enum>                           {0:1}  g7:BURI-KIND
   +1 <<INDIVIDUAL_EVENT_DETAIL>>           {0:1}
 |
 n CENS [Y|<NULL>]                          {1:1}  g7:INDI-CENS
@@ -916,7 +936,7 @@ Individual events; see [Individual Events](#individual-events) for descriptions
 
 An event structure may be used to discuss an event even if the event is not known to have occurred.
 See [Events] for a discussion of how `DATE`, `PLAC`, and the optional `Y` payload indicate whether the structure is asserting the event occurred.
-See the `NON_EVENT_STRUCTURE` for how to state an event did not occur.
+See the `NEGATIVE_ASSERTION` for how to state an event did not occur.
 
 :::note
 Individual event structures vary as follows:
@@ -960,7 +980,7 @@ n TEMP <Text>                            {0:1}  g7:TEMP
 n <<PLACE_STRUCTURE>>                    {0:1}
 n STAT <Enum>                            {0:1}  g7:ord-STAT
   +1 DATE <DateExact>                    {1:1}  g7:DATE-exact
-     +2 TIME <Time>                      {0:1}  g7:TIME
+     +2 TIME <Time>                      {0:1}  g7:TIME-exact
 n <<NOTE_STRUCTURE>>                     {0:M}
 n <<SOURCE_CITATION>>                    {0:M}
 ```
@@ -994,7 +1014,7 @@ The optional `CROP` substructure indicates that a subregion of an image represen
 
 The optional `TITL` substructure supersedes any `OBJE.FILE.TITL` substructures included in the `MULTIMEDIA_RECORD`.
 
-#### `NON_EVENT_STRUCTURE` :=
+#### `NEGATIVE_ASSERTION` :=
 
 ```gedstruct
 n NO <Enum>                                {1:1}  g7:NO
@@ -1033,6 +1053,8 @@ n NOTE <Text>                              {1:1}  g7:NOTE
   +1 TRAN <Text>                           {0:M}  g7:NOTE-TRAN
      +2 MIME <MediaType>                   {0:1}  g7:MIME
      +2 LANG <Language>                    {0:1}  g7:LANG
+  +1 RESN <List:Enum>                      {0:1}  g7:RESN
+  +1 <<IDENTIFIER_STRUCTURE>>              {0:M}
   +1 <<SOURCE_CITATION>>                   {0:M}
 |
 n SNOTE @<XREF:SNOTE>@                     {1:1}  g7:SNOTE
@@ -1083,14 +1105,19 @@ Even when multiple `SURN` tags are used, the `PersonalName` data type identifies
 
 ```gedstruct
 n NAME <PersonalName>                      {1:1}  g7:INDI-NAME
+  +1 RESN <List:Enum>                      {0:1}  g7:RESN
   +1 TYPE <Enum>                           {0:1}  g7:NAME-TYPE
      +2 PHRASE <Text>                      {0:1}  g7:PHRASE
   +1 <<PERSONAL_NAME_PIECES>>              {0:1}
+  +1 LANG <Language>                       {0:1}  g7:LANG
   +1 TRAN <PersonalName>                   {0:M}  g7:NAME-TRAN
      +2 LANG <Language>                    {1:1}  g7:LANG
      +2 <<PERSONAL_NAME_PIECES>>           {0:1}
+  +1 <<NEGATIVE_ASSERTION>>                {0:M}
   +1 <<NOTE_STRUCTURE>>                    {0:M}
   +1 <<SOURCE_CITATION>>                   {0:M}
+  +1 EXID <Special>                        {0:M}  g7:EXID
+     +2 TYPE <Special>                     {0:1}  g7:EXID-TYPE
 ```
 
 Names of individuals are represented in the manner the name is normally spoken, with the family name, surname, or nearest cultural parallel thereunto separated by slashes (U+002F `/`). Based on the dynamic nature or unknown compositions of naming conventions, it is difficult to provide a more detailed name piece structure to handle every case. The `PERSONAL_NAME_PIECES` are provided optionally for systems that cannot operate effectively with less structured information. The Personal Name payload shall be seen as the primary name representation, with name pieces as optional auxiliary information; in particular it is recommended that all name parts in `PERSONAL_NAME_PIECES` appear within the `PersonalName` payload in some form, possibly adjusted for gender-specific suffixes or the like.
@@ -1165,6 +1192,8 @@ This specification does not support places where a region name contains a comma.
 
 ```gedstruct
 n SOUR @<XREF:SOUR>@                       {1:1}  g7:SOUR
+  +1 RESN <List:Enum>                      {0:1}  g7:RESN
+  +1 <<SOURCE_CITATION>>                   {0:M}
   +1 PAGE <Text>                           {0:1}  g7:PAGE
   +1 DATA                                  {0:1}  g7:SOUR-DATA
      +2 <<DATE_VALUE>>                     {0:1}
@@ -1178,6 +1207,8 @@ n SOUR @<XREF:SOUR>@                       {1:1}  g7:SOUR
   +1 QUAY <Enum>                           {0:1}  g7:QUAY
   +1 <<MULTIMEDIA_LINK>>                   {0:M}
   +1 <<NOTE_STRUCTURE>>                    {0:M}
+  +1 EXID <Special>                        {0:M}  g7:EXID
+     +2 TYPE <Special>                     {0:1}  g7:EXID-TYPE
 ```
 
 A citation indicating that the pointed-to source record supports the claims made in the superstructure.
@@ -1194,6 +1225,10 @@ However, a `voidPtr` can be used with the citation text in a `PAGE` substructure
 The `PAGE` is defined to express a "specific location within the information referenced;"
 with a `voidPtr` there is no information referenced, so the `PAGE` may describe the entire source.
 
+A `SOUR`.`SOUR` allows indicating a source citation for a cited source from which the
+present information was derived. For example, if the source is an index that cites where
+the original record is located, then the `SOUR`.`SOUR` would contain the location cited by the index.
+
 A `SOURCE_CITATION` can contain a `NOTE_STRUCTURE`, which in turn can contain a `SOURCE_CITATION`, allowing potentially unbounded nesting of structures. Because each dataset is finite, this nesting is also guaranteed to be finite.
 
 
@@ -1205,6 +1240,7 @@ n REPO @<XREF:REPO>@                       {1:1}  g7:REPO
   +1 CALN <Special>                        {0:M}  g7:CALN
      +2 MEDI <Enum>                        {0:1}  g7:MEDI
         +3 PHRASE <Text>                   {0:1}  g7:PHRASE
+  +1 DATE <DateValue>                      {0:1}  g7:DATE
 ```
 
 This structure is used within a source record to point to a name and address record of the holder of the source document.
@@ -1213,3 +1249,7 @@ Formal and informal repository name and addresses are stored in the
 More formal repositories, such as the Family History Library, should show a call number of the source at that repository.
 The call number of that source should be recorded using a `CALN` substructure.
 
+A `DATE` substructure can be used to denote the date when the source was known to be held by the
+specific holder.  For example, if a Family Bible was passed from one person to another over time, a
+`SOURCE_REPOSITORY_CITATION` with a `DATE` substructure can be used to track the provenance as it was handed down.
+
diff --git a/specification/gedcom-3-structures-3-meaning.md b/specification/gedcom-3-structures-3-meaning.md
index 49232b8b..620414ce 100644
--- a/specification/gedcom-3-structures-3-meaning.md
+++ b/specification/gedcom-3-structures-3-meaning.md
@@ -245,6 +245,17 @@ Others distribute events and attributes between `INDI` records mutually linked b
 A future version of this specification may adjust the definition of `ALIA`.
 :::
 
+#### `ALIA` (Alias) `g7:SUBM-ALIA`
+
+Indicates that the user described by the superstructure
+is the same person as the individual described by the referenced `INDI`.
+
+A `SUBM` may only have a single `INDI` linked in this way
+to simplify implementation of algorithms that depend on the `INDI` representing a particular user.
+Applications using `g7:ALIA` to represent a person with multiple `INDI` records
+should select or generate a representative `INDI` for the `SUBM`.`ALIA`.
+
+
 #### `ANCI` (Ancestor interest) `g7:ANCI`
 
 Indicates an interest in additional research for ancestors of this individual.
@@ -730,6 +741,18 @@ A [Latter-Day Saint Ordinance](#latter-day-saint-ordinances).
 See also `LDS_INDIVIDUAL_ORDINANCE`.  Previously, GEDCOM versions 3.0 through 5.3 called this `WAC`; it was not part of 5.4 through 5.5.1.
 FamilySearch GEDCOM 7.0 reintroduced it with the name `INIL` for consistency with `BAPL`, `CONL`, and `ENDL`.
 
+#### `KIND` (Kind) `g7:BURI-KIND`
+
+An enumerated value from set `g7:enumset-BURI-KIND` indicating what was done with the remains of the deceased.
+
+Note `KIND` does not have a `g7:PHRASE` substructure; the `g7:TYPE` substructure of the `KIND`'s superstructure should be used for that purpose instead.
+
+#### `KIND` (Kind) `g7:MARR-KIND`
+
+An enumerated value from set `g7:enumset-MARR-KIND` indicating what kind of marriage the superstructure describes.
+
+Note `KIND` does not have a `g7:PHRASE` substructure; the `g7:TYPE` substructure of the `KIND`'s superstructure should be used for that purpose instead.
+
 #### `LANG` (Language) `g7:LANG`
 
 The primary human language of the superstructure.
@@ -746,6 +769,7 @@ If the text is primarily in one language with a few parts in a different languag
 it is recommended that a language tag identifying the primary language be used.
 If no one language is primary, the language tag `mul` (meaning "multiple") may be used,
 but most language-specific algorithms will treat `mul` the same way they do `und`.
+Multi-language text can be handled more robustly using [the `text/html` MediaType](#MIME).
 
 :::note
 Conversations are ongoing about adding part-of-payload language tagging in a future version of the specification
@@ -868,8 +892,8 @@ An enumerated value from set `g7:enumset-MEDI` providing information about the m
 When `MEDI` is a substructure of a `g7:CALN`, it is recommended that its payload describes the medium directly found at that call number rather than a medium from which it was derived.
 
 :::example
-Consider an asset in a repository that is a digital scan of a book of compiled newspapers;
-for this asset, the `CALN`.`MEDI` is recommended to be `ELECTRONIC` rather than `BOOK` or `NEWSPAPER`.
+Consider an asset in an online repository that is a digital scan of a book of compiled newspapers;
+for this asset, the `CALN`.`MEDI` is recommended to be `ONLINE` rather than `BOOK` or `NEWSPAPER`.
 :::
 
 #### `MIME` (Media type) `g7:MIME`
@@ -886,6 +910,7 @@ As of version 7.0, only 2 media types are supported by this structure:
     - `p` and `br` elements for paragraphing and line breaks.
     - `b`, `i`, `u`, and `s` elements for bold, italic, underlined, and strike-through text (or corresponding display in other locales; see [HTML §4.5](https://html.spec.whatwg.org/multipage/text-level-semantics.html) for more).
     - `sup` and `sub` elements for super- and sub-script.
+    - `span` with a `lang` attribute for marking part of text in a different human language than the rest.
     - The 3 XML entities that appear in text: `&amp;`, `&lt;` `&gt;`.
         Note that `&quote;` and `&apos;` are only needed in attributes.
         Other entities should be represented as their respective Unicode characters instead.
@@ -953,10 +978,16 @@ A descriptive or familiar name that is used instead of, or in addition to, one
 An [Individual Attribute](#individual-attributes).
 See also `INDIVIDUAL_ATTRIBUTE_STRUCTURE`.
 
-#### `NO` (Did not happen) `g7:NO`
+#### `NO` (Negative assertion) `g7:NO`
 
-An enumerated value from set `g7:enumset-EVEN` identifying an event type which did not occur to the superstructure's subject.
-See `NON_EVENT_STRUCTURE` for more details.
+An enumerated value from set `g7:enumset-NO` identifying something that was not part of the superstructure:
+an event type which did not occur to the superstructure's subject,
+that the superstructure's subject did not have an name
+or name part,
+etc.
+A specific payload `NO XYZ` should only appear where `XYZ` would be legal.
+
+See `NEGATIVE_ASSERTION` for more.
 
 #### `NOTE` (Note) `g7:NOTE`
 
@@ -1161,6 +1192,11 @@ The `RESN` structure is provided to assist software in filtering data that shoul
 such that certain `RESN` structure payload entries result in the `RESN` structure and its superstructure being removed from the export.
 Such removal must abide by some constraints: see [Removing data](#removing-data) for more details.
 
+A structure that points to a record that is being removed due to `RESN` processing will have its pointer replaced by a `voidPtr`,
+preserving the structure's substructures.
+That might be desirable, but could cause accidental information leakage; for example, if a `g7:ADOP-FAMC` points to a restricted `FAMC` it may contain `FAMC`-identifying information in its substructures that the user also wishes to treat as restricted.
+Applications are encouraged to prompt the user when a pointer becomes void during `RESN` processing and give them the option of additional data removal.
+
 This is metadata about the structure itself, not data about its subject.
 
 #### `REPO` (Repository) `g7:REPO`
@@ -1355,6 +1391,12 @@ This should be, from the evidence point of view, "what the original record keepe
 
 A `Time` value in a 24-hour clock format.
 
+#### `TIME` (Time) `g7:TIME-exact`
+
+A `Time` value in a 24-hour clock format.
+The time should be presented in UTC and indicate that with a `Z` in the time payload.
+Unlike a `g7:TIME`, no `g7:PHRASE` is permitted under a `g7:TIME-exact`.
+
 #### `TITL` (Title) `g7:TITL`
 
 The title, formal or informal, of the superstructure.
@@ -1415,6 +1457,7 @@ The following presents a name in Mandarin, transliterated using Pinyin
 
 ```gedcom
 1 NAME /孔/德庸
+2 LANG zh
 2 GIVN 德庸
 2 SURN 孔
 2 TRAN /Kǒng/ Déyōng
diff --git a/specification/gedcom-3-structures-4-enumerations.md b/specification/gedcom-3-structures-4-enumerations.md
index bf70b9a4..e1b558ca 100644
--- a/specification/gedcom-3-structures-4-enumerations.md
+++ b/specification/gedcom-3-structures-4-enumerations.md
@@ -15,20 +15,15 @@ Each set of enumeration values has its own URI.
 | `WIFE` | Adopted by the `WIFE` of the `FAM` pointed to by `FAMC`.<br/>The URI of this value is `g7:enum-ADOP-WIFE` |
 | `BOTH` | Adopted by both `HUSB` and `WIFE` of the `FAM` pointed to by `FAMC` |
 
-### `g7:enumset-EVEN`
-
-An event-type tag name, but not the generic `EVEN` tag.
-See [Events].
-
-Most values in this enumeration set use the same tag and URI as the corresponding event,
-except for tags used with different URIs for `FAM` vs `INDI`;
-these are given generic definitions with URIs constructed by concatenating
-`g7:enum-` to the enumeration value:
-
-| Value  | Meaning                                                |
-| :----- | :----------------------------------------------------- |
-| `CENS` | A census event; either `g7:INDI-CENS` or `g7:FAM-CENS` |
+### `g7:enumset-BURI-KIND`
 
+| Value | Meaning |
+| :---- | :------ |
+| `GRAVE` | Buried under the ground |
+| `VAULT` | Placed in a tomb or crypt |
+| `SEA` | Deposited in an ocean, lake, or other body of water |
+| `SKY` | Placed on a burial tree, mountain, or other open place to be excarnated |
+| `OTHER` | A value not listed here; should be paired with a `TYPE` structure |
 
 ### `g7:enumset-EVENATTR`
 
@@ -48,6 +43,15 @@ these are given generic definitions with URIs constructed by concatenating
 | `FACT` | A generic attribute; either `g7:INDI-FACT` or `g7:FAM-FACT` |
 | `EVEN` | A generic event; either `g7:INDI-EVEN` or `g7:FAM-EVEN` |
 
+### `g7:enumset-MARR-KIND`
+
+| Value | Meaning |
+| :---- | :------ |
+| `CIVIL`      | A civil marriage event, creating a state of marriage via a civil ceremony or registration process |
+| `COMMON_LAW` | Civil or religious recognition of a preexisting informal marriage |
+| `INFORMAL`   | An informal or de facto marriage, creating a state of marriage by mutual agreement without civil or religious involvement |
+| `RELIGIOUS`  | A religious marriage event, creating a state of marriage via a religious ceremony or registration process  |
+| `OTHER` | A value not listed here; should be paired with a `TYPE` structure |
 
 ### `g7:enumset-MEDI`
 
@@ -56,18 +60,51 @@ these are given generic definitions with URIs constructed by concatenating
 | `AUDIO`      | An audio recording                |
 | `BOOK`       | A bound book                      |
 | `CARD`       | A card or file entry              |
-| `ELECTRONIC` | A digital artifact                |
+| `DIGITAL`    | Digital storage medium            |
+| `ELECTRONIC` | A digital artifact (deprecated)   |
 | `FICHE`      | Microfiche                        |
 | `FILM`       | Microfilm                         |
 | `MAGAZINE`   | Printed periodical                |
 | `MANUSCRIPT` | Written pages                     |
 | `MAP`        | Cartographic map                  |
 | `NEWSPAPER`  | Printed newspaper                 |
+| `ONLINE`     | Online digital artifact           |
 | `PHOTO`      | Photograph                        |
 | `TOMBSTONE`  | Burial marker or related memorial |
 | `VIDEO`      | Motion picture recording          |
 | `OTHER` | A value not listed here; should have a `PHRASE` substructure |
 
+:::note
+The value `ELECTRONIC` is deprecated and kept for backwards compatibility, but might be removed in the future.
+Applications should instead use `ONLINE` for online content, or `DIGITAL` for offline content such as a CD-ROM
+or other digital storage medium.
+:::
+
+
+
+### `g7:enumset-NO` {.unlisted .unnumbered}
+
+This set contains various structure types, with the same tags and URIs used by the structure types:
+
+- All individual and family event types except `EVEN`
+
+- The personal name type `g7:INDI-NAME`
+
+- The name parts `g7:GIVN` and `g7:SURN`
+
+Values should be appropriate to the context of the containing structure,
+as described under `g7:NO`.
+
+Most values in this enumeration set use the same tag and URI as the corresponding event,
+except for tags used with different URIs for `FAM` vs `INDI`;
+these are given generic definitions with URIs constructed by concatenating
+`g7:enum-` to the enumeration value:
+
+| Value  | Meaning                                                |
+| :----- | :----------------------------------------------------- |
+| `CENS` | A census event; either `g7:INDI-CENS` or `g7:FAM-CENS` |
+
+
 ### `g7:enumset-PEDI`
 
 | Value     | Meaning                                                   |
@@ -234,6 +271,7 @@ and applications should be prepared to encounter non-current values.
 
 | Value | Meaning                       |
 | ----- | :---------------------------- |
+| `ADOPTED` | Name given at the time of adoption. |
 | `AKA` | Also known as, alias, etc. |
 | `BIRTH` | Name given at or near birth. |
 | `IMMIGRANT` | Name assumed at the time of immigration. |
diff --git a/specification/gedcom-6-appendix-calendars.md b/specification/gedcom-6-appendix-calendars.md
index 62548506..3425a53d 100644
--- a/specification/gedcom-6-appendix-calendars.md
+++ b/specification/gedcom-6-appendix-calendars.md
@@ -58,21 +58,21 @@ The French Republican calendar or French Revolutionary calendar are the names gi
 
 Permitted months are
 
-|Code  |Name                |
-|:-----|:-------------------|
-|`VEND`|Vendémiaire         |
-|`BRUM`|Brumaire            |
-|`FRIM`|Frimaire            |
-|`NIVO`|Nivôse              |
-|`PLUV`|Pluviôse            |
-|`VENT`|Ventôse             |
-|`GERM`|Germinal            |
-|`FLOR`|Floréal             |
-|`PRAI`|Prairial            |
-|`MESS`|Messidor            |
-|`THER`|Thermidor           |
-|`FRUC`|Fructidor           |
-|`COMP`|Jour Complémentaires|
+|Code  |Name                 |
+|:-----|:--------------------|
+|`VEND`|Vendémiaire          |
+|`BRUM`|Brumaire             |
+|`FRIM`|Frimaire             |
+|`NIVO`|Nivôse               |
+|`PLUV`|Pluviôse             |
+|`VENT`|Ventôse              |
+|`GERM`|Germinal             |
+|`FLOR`|Floréal              |
+|`PRAI`|Prairial             |
+|`MESS`|Messidor             |
+|`THER`|Thermidor            |
+|`FRUC`|Fructidor            |
+|`COMP`|Jours complémentaires|
 
 No epoch marker is permitted in this calendar.
 
diff --git a/task-queue.md b/task-queue.md
new file mode 100644
index 00000000..b71a0de2
--- /dev/null
+++ b/task-queue.md
@@ -0,0 +1,13 @@
+Changes deferred to the 7.1 release:
+
+- [ ] Add additional calendars (see issues [#38](https://github.com/FamilySearch/GEDCOM/issues/38), the meta-issue; also [#1](https://github.com/FamilySearch/GEDCOM/issues/1), [#28](https://github.com/FamilySearch/GEDCOM/issues/28), [#29](https://github.com/FamilySearch/GEDCOM/issues/29), [#34](https://github.com/FamilySearch/GEDCOM/issues/34), [#35](https://github.com/FamilySearch/GEDCOM/issues/35), [#36](https://github.com/FamilySearch/GEDCOM/issues/36))
+- [ ] Add NAME.LANG, to match 7.0.2's examples and to mirror other structures with a TRAN substructure. (see issue [#21](https://github.com/FamilySearch/GEDCOM/issues/21) and discussion [#108](https://github.com/FamilySearch/GEDCOM/issues/108))
+- [ ] Add display-name for extension tags and enumerations (see issue [#23](https://github.com/FamilySearch/GEDCOM/issues/23))
+- [ ] Consider "original date" (see issue [#49](https://github.com/FamilySearch/GEDCOM/issues/49))
+- [ ] Add EXID to notes (see issue [#64](https://github.com/FamilySearch/GEDCOM/issues/64))
+- [ ] Add language-tagged HTML (see issue [#83](https://github.com/FamilySearch/GEDCOM/issues/83))
+- [ ] Add "legitimization" event (see issue [#84](https://github.com/FamilySearch/GEDCOM/issues/84))
+- [ ] Add SOUR.PHRASE (see issue [#97](https://github.com/FamilySearch/GEDCOM/issues/97))
+- [ ] Add stillbirth attribute and enumeration (see issue [#106](https://github.com/FamilySearch/GEDCOM/issues/106))
+- [ ] Ban nonsensical dates like `2022 FEB 3` (see issue [#113](https://github.com/FamilySearch/GEDCOM/issues/113))
+- [ ] Add EXID to SOURCE_CITATION (as well as SOURCE_RECORD) (See issue [#114](https://github.com/FamilySearch/GEDCOM/issues/114))