diff --git a/extracted-files/cardinalities.tsv b/extracted-files/cardinalities.tsv
index e8e04f92..a3e814d8 100644
--- a/extracted-files/cardinalities.tsv
+++ b/extracted-files/cardinalities.tsv
@@ -593,8 +593,10 @@ https://gedcom.io/terms/v7.1/GRAD	https://gedcom.io/terms/v7/SDATE	{0:1}
 https://gedcom.io/terms/v7.1/GRAD	https://gedcom.io/terms/v7/TYPE	{0:1}
 https://gedcom.io/terms/v7.1/GRAD	https://gedcom.io/terms/v7/UID	{0:M}
 https://gedcom.io/terms/v7.1/GRAD	https://gedcom.io/terms/v7/WWW	{0:M}
-https://gedcom.io/terms/v7.1/HEAD	https://gedcom.io/terms/v7.1/NOTE	{0:1}
-https://gedcom.io/terms/v7.1/HEAD	https://gedcom.io/terms/v7.1/SNOTE	{0:1}
+https://gedcom.io/terms/v7.1/HEAD	https://gedcom.io/terms/v7.1/HEAD-DESC	{0:1}
+https://gedcom.io/terms/v7.1/HEAD	https://gedcom.io/terms/v7.1/HEAD-TITL	{0:1}
+https://gedcom.io/terms/v7.1/HEAD	https://gedcom.io/terms/v7.1/NOTE	{0:M}
+https://gedcom.io/terms/v7.1/HEAD	https://gedcom.io/terms/v7.1/SNOTE	{0:M}
 https://gedcom.io/terms/v7.1/HEAD	https://gedcom.io/terms/v7.1/SUBM	{0:1}
 https://gedcom.io/terms/v7.1/HEAD	https://gedcom.io/terms/v7/COPR	{0:1}
 https://gedcom.io/terms/v7.1/HEAD	https://gedcom.io/terms/v7/DEST	{0:1}
@@ -604,6 +606,10 @@ https://gedcom.io/terms/v7.1/HEAD	https://gedcom.io/terms/v7/HEAD-LANG	{0:1}
 https://gedcom.io/terms/v7.1/HEAD	https://gedcom.io/terms/v7/HEAD-PLAC	{0:1}
 https://gedcom.io/terms/v7.1/HEAD	https://gedcom.io/terms/v7/HEAD-SOUR	{0:1}
 https://gedcom.io/terms/v7.1/HEAD	https://gedcom.io/terms/v7/SCHMA	{0:1}
+https://gedcom.io/terms/v7.1/HEAD-DESC	https://gedcom.io/terms/v7.1/TEXT-TRAN	{0:M}
+https://gedcom.io/terms/v7.1/HEAD-DESC	https://gedcom.io/terms/v7/LANG	{0:1}
+https://gedcom.io/terms/v7.1/HEAD-TITL	https://gedcom.io/terms/v7.1/TEXT-TRAN	{0:M}
+https://gedcom.io/terms/v7.1/HEAD-TITL	https://gedcom.io/terms/v7/LANG	{0:1}
 https://gedcom.io/terms/v7.1/IDNO	https://gedcom.io/terms/v7.1/ASSO	{0:M}
 https://gedcom.io/terms/v7.1/IDNO	https://gedcom.io/terms/v7.1/NOTE	{0:M}
 https://gedcom.io/terms/v7.1/IDNO	https://gedcom.io/terms/v7.1/OBJE	{0:M}
@@ -975,10 +981,12 @@ https://gedcom.io/terms/v7.1/NO	https://gedcom.io/terms/v7.1/NOTE	{0:M}
 https://gedcom.io/terms/v7.1/NO	https://gedcom.io/terms/v7.1/SNOTE	{0:M}
 https://gedcom.io/terms/v7.1/NO	https://gedcom.io/terms/v7.1/SOUR	{0:M}
 https://gedcom.io/terms/v7.1/NO	https://gedcom.io/terms/v7/NO-DATE	{0:1}
+https://gedcom.io/terms/v7.1/NOTE	https://gedcom.io/terms/v7.1/NOTE-KIND	{0:M}
 https://gedcom.io/terms/v7.1/NOTE	https://gedcom.io/terms/v7.1/SOUR	{0:M}
 https://gedcom.io/terms/v7.1/NOTE	https://gedcom.io/terms/v7/LANG	{0:1}
 https://gedcom.io/terms/v7.1/NOTE	https://gedcom.io/terms/v7/MIME	{0:1}
 https://gedcom.io/terms/v7.1/NOTE	https://gedcom.io/terms/v7/NOTE-TRAN	{0:M}
+https://gedcom.io/terms/v7.1/NOTE-KIND	https://gedcom.io/terms/v7/PHRASE	{0:1}
 https://gedcom.io/terms/v7.1/OBJE	https://gedcom.io/terms/v7/CROP	{0:1}
 https://gedcom.io/terms/v7.1/OBJE	https://gedcom.io/terms/v7/TITL	{0:1}
 https://gedcom.io/terms/v7.1/OCCU	https://gedcom.io/terms/v7.1/ASSO	{0:M}
@@ -1135,6 +1143,7 @@ https://gedcom.io/terms/v7.1/SSN	https://gedcom.io/terms/v7/SDATE	{0:1}
 https://gedcom.io/terms/v7.1/SSN	https://gedcom.io/terms/v7/TYPE	{0:1}
 https://gedcom.io/terms/v7.1/SSN	https://gedcom.io/terms/v7/UID	{0:M}
 https://gedcom.io/terms/v7.1/SSN	https://gedcom.io/terms/v7/WWW	{0:M}
+https://gedcom.io/terms/v7.1/TEXT-TRAN	https://gedcom.io/terms/v7/LANG	{1:1}
 https://gedcom.io/terms/v7.1/WILL	https://gedcom.io/terms/v7.1/ASSO	{0:M}
 https://gedcom.io/terms/v7.1/WILL	https://gedcom.io/terms/v7.1/NOTE	{0:M}
 https://gedcom.io/terms/v7.1/WILL	https://gedcom.io/terms/v7.1/OBJE	{0:M}
@@ -1273,6 +1282,7 @@ https://gedcom.io/terms/v7.1/record-REPO	https://gedcom.io/terms/v7/RESN	{0:1}
 https://gedcom.io/terms/v7.1/record-REPO	https://gedcom.io/terms/v7/UID	{0:M}
 https://gedcom.io/terms/v7.1/record-REPO	https://gedcom.io/terms/v7/WWW	{0:M}
 https://gedcom.io/terms/v7.1/record-SNOTE	https://gedcom.io/terms/v7.1/CHAN	{0:1}
+https://gedcom.io/terms/v7.1/record-SNOTE	https://gedcom.io/terms/v7.1/NOTE-KIND	{0:M}
 https://gedcom.io/terms/v7.1/record-SNOTE	https://gedcom.io/terms/v7.1/SOUR	{0:M}
 https://gedcom.io/terms/v7.1/record-SNOTE	https://gedcom.io/terms/v7/CREA	{0:1}
 https://gedcom.io/terms/v7.1/record-SNOTE	https://gedcom.io/terms/v7/EXID	{0:M}
diff --git a/extracted-files/enumerations.tsv b/extracted-files/enumerations.tsv
index dbc7bb5b..3a720d21 100644
--- a/extracted-files/enumerations.tsv
+++ b/extracted-files/enumerations.tsv
@@ -1,6 +1,7 @@
 https://gedcom.io/terms/v7.1/BIRT-KIND	https://gedcom.io/terms/v7.1/enumset-BIRT-KIND
 https://gedcom.io/terms/v7.1/DATA-EVEN	https://gedcom.io/terms/v7.1/enumset-EVENATTR
 https://gedcom.io/terms/v7.1/NO	https://gedcom.io/terms/v7.1/enumset-EVEN
+https://gedcom.io/terms/v7.1/NOTE-KIND	https://gedcom.io/terms/v7.1/enumset-NOTE-KIND
 https://gedcom.io/terms/v7.1/SOUR-EVEN	https://gedcom.io/terms/v7.1/enumset-EVENATTR
 https://gedcom.io/terms/v7/FAMC-ADOP	https://gedcom.io/terms/v7/enumset-ADOP
 https://gedcom.io/terms/v7/FAMC-STAT	https://gedcom.io/terms/v7/enumset-FAMC-STAT
diff --git a/extracted-files/enumerationsets.tsv b/extracted-files/enumerationsets.tsv
index f2739ef1..14015120 100644
--- a/extracted-files/enumerationsets.tsv
+++ b/extracted-files/enumerationsets.tsv
@@ -77,6 +77,13 @@ https://gedcom.io/terms/v7.1/enumset-EVENATTR	https://gedcom.io/terms/v7.1/enum-
 https://gedcom.io/terms/v7.1/enumset-EVENATTR	https://gedcom.io/terms/v7.1/enum-FACT
 https://gedcom.io/terms/v7.1/enumset-EVENATTR	https://gedcom.io/terms/v7.1/enum-NCHI
 https://gedcom.io/terms/v7.1/enumset-EVENATTR	https://gedcom.io/terms/v7.1/enum-RESI
+https://gedcom.io/terms/v7.1/enumset-NOTE-KIND	https://gedcom.io/terms/v7.1/enum-DATA
+https://gedcom.io/terms/v7.1/enumset-NOTE-KIND	https://gedcom.io/terms/v7.1/enum-REASONING
+https://gedcom.io/terms/v7.1/enumset-NOTE-KIND	https://gedcom.io/terms/v7.1/enum-RESEARCH
+https://gedcom.io/terms/v7.1/enumset-NOTE-KIND	https://gedcom.io/terms/v7.1/enum-SCOPE
+https://gedcom.io/terms/v7.1/enumset-NOTE-KIND	https://gedcom.io/terms/v7.1/enum-STORY
+https://gedcom.io/terms/v7.1/enumset-NOTE-KIND	https://gedcom.io/terms/v7.1/enum-TODO
+https://gedcom.io/terms/v7.1/enumset-NOTE-KIND	https://gedcom.io/terms/v7/enum-OTHER
 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
diff --git a/extracted-files/grammar.gedstruct b/extracted-files/grammar.gedstruct
index 212fde88..7af8fa1e 100644
--- a/extracted-files/grammar.gedstruct
+++ b/extracted-files/grammar.gedstruct
@@ -49,7 +49,15 @@ n HEAD                                     {1:1}  g7.1:HEAD
   +1 LANG <Language>                       {0:1}  g7:HEAD-LANG
   +1 PLAC                                  {0:1}  g7:HEAD-PLAC
      +2 FORM <List:Text>                   {1:1}  g7:HEAD-PLAC-FORM
-  +1 <<NOTE_STRUCTURE>>                    {0:1}
+  +1 TITL <Text>                           {0:1}  g7.1:HEAD-TITL
+     +2 LANG <Language>                    {0:1}  g7:LANG
+     +2 TRAN <Text>                        {0:M}  g7.1:TEXT-TRAN
+        +3 LANG <Language>                 {1:1}  g7:LANG
+  +1 DESC <Text>                           {0:1}  g7.1:HEAD-DESC
+     +2 LANG <Language>                    {0:1}  g7:LANG
+     +2 TRAN <Text>                        {0:M}  g7.1:TEXT-TRAN
+        +3 LANG <Language>                 {1:1}  g7:LANG
+  +1 <<NOTE_STRUCTURE>>                    {0:M}
 
 
 FAMILY_RECORD :=
@@ -146,6 +154,8 @@ n @XREF:SNOTE@ SNOTE <Text>                {1:1}  g7.1:record-SNOTE
   +1 TRAN <Text>                           {0:M}  g7:NOTE-TRAN
      +2 MIME <MediaType>                   {0:1}  g7:MIME
      +2 LANG <Language>                    {0:1}  g7:LANG
+  +1 KIND <Enum>                           {0:M}  g7.1:NOTE-KIND
+     +2 PHRASE <Text>                      {0:1}  g7:PHRASE
   +1 <<SOURCE_CITATION>>                   {0:M}
   +1 <<IDENTIFIER_STRUCTURE>>              {0:M}
   +1 <<CHANGE_DATE>>                       {0:1}
@@ -571,6 +581,8 @@ n NOTE <Text>                              {1:1}  g7.1:NOTE
   +1 TRAN <Text>                           {0:M}  g7:NOTE-TRAN
      +2 MIME <MediaType>                   {0:1}  g7:MIME
      +2 LANG <Language>                    {0:1}  g7:LANG
+  +1 KIND <Enum>                           {0:M}  g7.1:NOTE-KIND
+     +2 PHRASE <Text>                      {0:1}  g7:PHRASE
   +1 <<SOURCE_CITATION>>                   {0:M}
 |
 n SNOTE @<XREF:SNOTE>@                     {1:1}  g7.1:SNOTE
diff --git a/extracted-files/payloads.tsv b/extracted-files/payloads.tsv
index 6eb4f5a6..37bf5262 100644
--- a/extracted-files/payloads.tsv
+++ b/extracted-files/payloads.tsv
@@ -43,6 +43,8 @@ https://gedcom.io/terms/v7.1/FAMS	@<https://gedcom.io/terms/v7.1/record-FAM>@
 https://gedcom.io/terms/v7.1/FCOM	Y|<NULL>
 https://gedcom.io/terms/v7.1/GRAD	Y|<NULL>
 https://gedcom.io/terms/v7.1/HEAD	
+https://gedcom.io/terms/v7.1/HEAD-DESC	http://www.w3.org/2001/XMLSchema#string
+https://gedcom.io/terms/v7.1/HEAD-TITL	http://www.w3.org/2001/XMLSchema#string
 https://gedcom.io/terms/v7.1/IDNO	http://www.w3.org/2001/XMLSchema#string
 https://gedcom.io/terms/v7.1/IMMI	Y|<NULL>
 https://gedcom.io/terms/v7.1/INDI-CENS	Y|<NULL>
@@ -65,6 +67,7 @@ https://gedcom.io/terms/v7.1/NATU	Y|<NULL>
 https://gedcom.io/terms/v7.1/NMR	http://www.w3.org/2001/XMLSchema#nonNegativeInteger
 https://gedcom.io/terms/v7.1/NO	https://gedcom.io/terms/v7/type-Enum
 https://gedcom.io/terms/v7.1/NOTE	http://www.w3.org/2001/XMLSchema#string
+https://gedcom.io/terms/v7.1/NOTE-KIND	https://gedcom.io/terms/v7/type-Enum
 https://gedcom.io/terms/v7.1/OBJE	@<https://gedcom.io/terms/v7.1/record-OBJE>@
 https://gedcom.io/terms/v7.1/OCCU	http://www.w3.org/2001/XMLSchema#string
 https://gedcom.io/terms/v7.1/ORDN	Y|<NULL>
@@ -80,6 +83,7 @@ https://gedcom.io/terms/v7.1/SOUR	@<https://gedcom.io/terms/v7.1/record-SOUR>@
 https://gedcom.io/terms/v7.1/SOUR-EVEN	https://gedcom.io/terms/v7/type-Enum
 https://gedcom.io/terms/v7.1/SSN	http://www.w3.org/2001/XMLSchema#string
 https://gedcom.io/terms/v7.1/SUBM	@<https://gedcom.io/terms/v7.1/record-SUBM>@
+https://gedcom.io/terms/v7.1/TEXT-TRAN	http://www.w3.org/2001/XMLSchema#string
 https://gedcom.io/terms/v7.1/WILL	Y|<NULL>
 https://gedcom.io/terms/v7.1/record-FAM	
 https://gedcom.io/terms/v7.1/record-INDI	
diff --git a/extracted-files/substructures.tsv b/extracted-files/substructures.tsv
index 7701d0b2..9461d203 100644
--- a/extracted-files/substructures.tsv
+++ b/extracted-files/substructures.tsv
@@ -605,6 +605,7 @@ https://gedcom.io/terms/v7.1/GRAD	UID	https://gedcom.io/terms/v7/UID
 https://gedcom.io/terms/v7.1/GRAD	WWW	https://gedcom.io/terms/v7/WWW
 https://gedcom.io/terms/v7.1/HEAD	COPR	https://gedcom.io/terms/v7/COPR
 https://gedcom.io/terms/v7.1/HEAD	DATE	https://gedcom.io/terms/v7/HEAD-DATE
+https://gedcom.io/terms/v7.1/HEAD	DESC	https://gedcom.io/terms/v7.1/HEAD-DESC
 https://gedcom.io/terms/v7.1/HEAD	DEST	https://gedcom.io/terms/v7/DEST
 https://gedcom.io/terms/v7.1/HEAD	GEDC	https://gedcom.io/terms/v7/GEDC
 https://gedcom.io/terms/v7.1/HEAD	LANG	https://gedcom.io/terms/v7/HEAD-LANG
@@ -614,6 +615,11 @@ https://gedcom.io/terms/v7.1/HEAD	SCHMA	https://gedcom.io/terms/v7/SCHMA
 https://gedcom.io/terms/v7.1/HEAD	SNOTE	https://gedcom.io/terms/v7.1/SNOTE
 https://gedcom.io/terms/v7.1/HEAD	SOUR	https://gedcom.io/terms/v7/HEAD-SOUR
 https://gedcom.io/terms/v7.1/HEAD	SUBM	https://gedcom.io/terms/v7.1/SUBM
+https://gedcom.io/terms/v7.1/HEAD	TITL	https://gedcom.io/terms/v7.1/HEAD-TITL
+https://gedcom.io/terms/v7.1/HEAD-DESC	LANG	https://gedcom.io/terms/v7/LANG
+https://gedcom.io/terms/v7.1/HEAD-DESC	TRAN	https://gedcom.io/terms/v7.1/TEXT-TRAN
+https://gedcom.io/terms/v7.1/HEAD-TITL	LANG	https://gedcom.io/terms/v7/LANG
+https://gedcom.io/terms/v7.1/HEAD-TITL	TRAN	https://gedcom.io/terms/v7.1/TEXT-TRAN
 https://gedcom.io/terms/v7.1/IDNO	ADDR	https://gedcom.io/terms/v7/ADDR
 https://gedcom.io/terms/v7.1/IDNO	AGE	https://gedcom.io/terms/v7/AGE
 https://gedcom.io/terms/v7.1/IDNO	AGNC	https://gedcom.io/terms/v7/AGNC
@@ -985,10 +991,12 @@ https://gedcom.io/terms/v7.1/NO	DATE	https://gedcom.io/terms/v7/NO-DATE
 https://gedcom.io/terms/v7.1/NO	NOTE	https://gedcom.io/terms/v7.1/NOTE
 https://gedcom.io/terms/v7.1/NO	SNOTE	https://gedcom.io/terms/v7.1/SNOTE
 https://gedcom.io/terms/v7.1/NO	SOUR	https://gedcom.io/terms/v7.1/SOUR
+https://gedcom.io/terms/v7.1/NOTE	KIND	https://gedcom.io/terms/v7.1/NOTE-KIND
 https://gedcom.io/terms/v7.1/NOTE	LANG	https://gedcom.io/terms/v7/LANG
 https://gedcom.io/terms/v7.1/NOTE	MIME	https://gedcom.io/terms/v7/MIME
 https://gedcom.io/terms/v7.1/NOTE	SOUR	https://gedcom.io/terms/v7.1/SOUR
 https://gedcom.io/terms/v7.1/NOTE	TRAN	https://gedcom.io/terms/v7/NOTE-TRAN
+https://gedcom.io/terms/v7.1/NOTE-KIND	PHRASE	https://gedcom.io/terms/v7/PHRASE
 https://gedcom.io/terms/v7.1/OBJE	CROP	https://gedcom.io/terms/v7/CROP
 https://gedcom.io/terms/v7.1/OBJE	TITL	https://gedcom.io/terms/v7/TITL
 https://gedcom.io/terms/v7.1/OCCU	ADDR	https://gedcom.io/terms/v7/ADDR
@@ -1145,6 +1153,7 @@ https://gedcom.io/terms/v7.1/SSN	SOUR	https://gedcom.io/terms/v7.1/SOUR
 https://gedcom.io/terms/v7.1/SSN	TYPE	https://gedcom.io/terms/v7/TYPE
 https://gedcom.io/terms/v7.1/SSN	UID	https://gedcom.io/terms/v7/UID
 https://gedcom.io/terms/v7.1/SSN	WWW	https://gedcom.io/terms/v7/WWW
+https://gedcom.io/terms/v7.1/TEXT-TRAN	LANG	https://gedcom.io/terms/v7/LANG
 https://gedcom.io/terms/v7.1/WILL	ADDR	https://gedcom.io/terms/v7/ADDR
 https://gedcom.io/terms/v7.1/WILL	AGE	https://gedcom.io/terms/v7/AGE
 https://gedcom.io/terms/v7.1/WILL	AGNC	https://gedcom.io/terms/v7/AGNC
@@ -1285,6 +1294,7 @@ https://gedcom.io/terms/v7.1/record-REPO	WWW	https://gedcom.io/terms/v7/WWW
 https://gedcom.io/terms/v7.1/record-SNOTE	CHAN	https://gedcom.io/terms/v7.1/CHAN
 https://gedcom.io/terms/v7.1/record-SNOTE	CREA	https://gedcom.io/terms/v7/CREA
 https://gedcom.io/terms/v7.1/record-SNOTE	EXID	https://gedcom.io/terms/v7/EXID
+https://gedcom.io/terms/v7.1/record-SNOTE	KIND	https://gedcom.io/terms/v7.1/NOTE-KIND
 https://gedcom.io/terms/v7.1/record-SNOTE	LANG	https://gedcom.io/terms/v7/LANG
 https://gedcom.io/terms/v7.1/record-SNOTE	MIME	https://gedcom.io/terms/v7/MIME
 https://gedcom.io/terms/v7.1/record-SNOTE	REFN	https://gedcom.io/terms/v7/REFN
diff --git a/extracted-files/tags/ADOP b/extracted-files/tags/ADOP
index 141eb6ff..8ab6d992 100644
--- a/extracted-files/tags/ADOP
+++ b/extracted-files/tags/ADOP
@@ -68,9 +68,6 @@ substructures:
 superstructures:
   "https://gedcom.io/terms/v7.1/record-INDI": "{0:M}"
 
-subsumes:
-  - "https://gedcom.io/terms/v7/ADOP"
-
 value of:
   - "https://gedcom.io/terms/v7.1/enumset-EVEN"
   - "https://gedcom.io/terms/v7.1/enumset-EVENATTR"
diff --git a/extracted-files/tags/ADOP-FAMC b/extracted-files/tags/ADOP-FAMC
index 76238d75..b651820c 100644
--- a/extracted-files/tags/ADOP-FAMC
+++ b/extracted-files/tags/ADOP-FAMC
@@ -29,9 +29,6 @@ substructures:
 superstructures:
   "https://gedcom.io/terms/v7.1/ADOP": "{0:1}"
 
-subsumes:
-  - "https://gedcom.io/terms/v7/ADOP-FAMC"
-
 prerelease: true
 
 contact: "https://gedcom.io/community/"
diff --git a/extracted-files/tags/ALIA b/extracted-files/tags/ALIA
index cc09e4ac..ff0c5dac 100644
--- a/extracted-files/tags/ALIA
+++ b/extracted-files/tags/ALIA
@@ -47,9 +47,6 @@ substructures:
 superstructures:
   "https://gedcom.io/terms/v7.1/record-INDI": "{0:M}"
 
-subsumes:
-  - "https://gedcom.io/terms/v7/ALIA"
-
 prerelease: true
 
 contact: "https://gedcom.io/community/"
diff --git a/extracted-files/tags/ANCI b/extracted-files/tags/ANCI
index edf2fc38..cde6a7af 100644
--- a/extracted-files/tags/ANCI
+++ b/extracted-files/tags/ANCI
@@ -22,9 +22,6 @@ substructures: {}
 superstructures:
   "https://gedcom.io/terms/v7.1/record-INDI": "{0:M}"
 
-subsumes:
-  - "https://gedcom.io/terms/v7/ANCI"
-
 prerelease: true
 
 contact: "https://gedcom.io/community/"
diff --git a/extracted-files/tags/ANUL b/extracted-files/tags/ANUL
index 583fb5f3..9d6851de 100644
--- a/extracted-files/tags/ANUL
+++ b/extracted-files/tags/ANUL
@@ -61,9 +61,6 @@ substructures:
 superstructures:
   "https://gedcom.io/terms/v7.1/record-FAM": "{0:M}"
 
-subsumes:
-  - "https://gedcom.io/terms/v7/ANUL"
-
 value of:
   - "https://gedcom.io/terms/v7.1/enumset-EVEN"
   - "https://gedcom.io/terms/v7.1/enumset-EVENATTR"
diff --git a/extracted-files/tags/ASSO b/extracted-files/tags/ASSO
index 1dfd0f5f..64fd94ec 100644
--- a/extracted-files/tags/ASSO
+++ b/extracted-files/tags/ASSO
@@ -104,9 +104,6 @@ superstructures:
   "https://gedcom.io/terms/v7.1/record-FAM": "{0:M}"
   "https://gedcom.io/terms/v7.1/record-INDI": "{0:M}"
 
-subsumes:
-  - "https://gedcom.io/terms/v7/ASSO"
-
 prerelease: true
 
 contact: "https://gedcom.io/community/"
diff --git a/extracted-files/tags/BAPL b/extracted-files/tags/BAPL
index c220c8d2..2ccd0b12 100644
--- a/extracted-files/tags/BAPL
+++ b/extracted-files/tags/BAPL
@@ -34,9 +34,6 @@ substructures:
 superstructures:
   "https://gedcom.io/terms/v7.1/record-INDI": "{0:M}"
 
-subsumes:
-  - "https://gedcom.io/terms/v7/BAPL"
-
 prerelease: true
 
 contact: "https://gedcom.io/community/"
diff --git a/extracted-files/tags/BAPM b/extracted-files/tags/BAPM
index f44f094e..84045645 100644
--- a/extracted-files/tags/BAPM
+++ b/extracted-files/tags/BAPM
@@ -66,9 +66,6 @@ substructures:
 superstructures:
   "https://gedcom.io/terms/v7.1/record-INDI": "{0:M}"
 
-subsumes:
-  - "https://gedcom.io/terms/v7/BAPM"
-
 value of:
   - "https://gedcom.io/terms/v7.1/enumset-EVEN"
   - "https://gedcom.io/terms/v7.1/enumset-EVENATTR"
diff --git a/extracted-files/tags/BARM b/extracted-files/tags/BARM
index b497fbe3..75d05172 100644
--- a/extracted-files/tags/BARM
+++ b/extracted-files/tags/BARM
@@ -65,9 +65,6 @@ substructures:
 superstructures:
   "https://gedcom.io/terms/v7.1/record-INDI": "{0:M}"
 
-subsumes:
-  - "https://gedcom.io/terms/v7/BARM"
-
 value of:
   - "https://gedcom.io/terms/v7.1/enumset-EVEN"
   - "https://gedcom.io/terms/v7.1/enumset-EVENATTR"
diff --git a/extracted-files/tags/BASM b/extracted-files/tags/BASM
index f154fda7..723fd166 100644
--- a/extracted-files/tags/BASM
+++ b/extracted-files/tags/BASM
@@ -66,9 +66,6 @@ substructures:
 superstructures:
   "https://gedcom.io/terms/v7.1/record-INDI": "{0:M}"
 
-subsumes:
-  - "https://gedcom.io/terms/v7/BASM"
-
 value of:
   - "https://gedcom.io/terms/v7.1/enumset-EVEN"
   - "https://gedcom.io/terms/v7.1/enumset-EVENATTR"
diff --git a/extracted-files/tags/BIRT b/extracted-files/tags/BIRT
index 46fa2cb0..4d74290d 100644
--- a/extracted-files/tags/BIRT
+++ b/extracted-files/tags/BIRT
@@ -68,9 +68,6 @@ substructures:
 superstructures:
   "https://gedcom.io/terms/v7.1/record-INDI": "{0:M}"
 
-subsumes:
-  - "https://gedcom.io/terms/v7/BIRT"
-
 value of:
   - "https://gedcom.io/terms/v7.1/enumset-EVEN"
   - "https://gedcom.io/terms/v7.1/enumset-EVENATTR"
diff --git a/extracted-files/tags/BLES b/extracted-files/tags/BLES
index 1e40c4a0..afefee9b 100644
--- a/extracted-files/tags/BLES
+++ b/extracted-files/tags/BLES
@@ -67,9 +67,6 @@ substructures:
 superstructures:
   "https://gedcom.io/terms/v7.1/record-INDI": "{0:M}"
 
-subsumes:
-  - "https://gedcom.io/terms/v7/BLES"
-
 value of:
   - "https://gedcom.io/terms/v7.1/enumset-EVEN"
   - "https://gedcom.io/terms/v7.1/enumset-EVENATTR"
diff --git a/extracted-files/tags/BURI b/extracted-files/tags/BURI
index 90bc6b41..5b2ba1ca 100644
--- a/extracted-files/tags/BURI
+++ b/extracted-files/tags/BURI
@@ -74,9 +74,6 @@ substructures:
 superstructures:
   "https://gedcom.io/terms/v7.1/record-INDI": "{0:M}"
 
-subsumes:
-  - "https://gedcom.io/terms/v7/BURI"
-
 value of:
   - "https://gedcom.io/terms/v7.1/enumset-EVEN"
   - "https://gedcom.io/terms/v7.1/enumset-EVENATTR"
diff --git a/extracted-files/tags/CAST b/extracted-files/tags/CAST
index 4b997d5a..d9e0f30f 100644
--- a/extracted-files/tags/CAST
+++ b/extracted-files/tags/CAST
@@ -58,9 +58,6 @@ substructures:
 superstructures:
   "https://gedcom.io/terms/v7.1/record-INDI": "{0:M}"
 
-subsumes:
-  - "https://gedcom.io/terms/v7/CAST"
-
 value of:
   - "https://gedcom.io/terms/v7.1/enumset-EVENATTR"
 
diff --git a/extracted-files/tags/CHAN b/extracted-files/tags/CHAN
index 6bffe1f9..0149e1ca 100644
--- a/extracted-files/tags/CHAN
+++ b/extracted-files/tags/CHAN
@@ -39,9 +39,6 @@ superstructures:
   "https://gedcom.io/terms/v7.1/record-SOUR": "{0:1}"
   "https://gedcom.io/terms/v7.1/record-SUBM": "{0:1}"
 
-subsumes:
-  - "https://gedcom.io/terms/v7/CHAN"
-
 prerelease: true
 
 contact: "https://gedcom.io/community/"
diff --git a/extracted-files/tags/CHIL b/extracted-files/tags/CHIL
index 9bcbfe10..a5a178cd 100644
--- a/extracted-files/tags/CHIL
+++ b/extracted-files/tags/CHIL
@@ -23,9 +23,6 @@ substructures:
 superstructures:
   "https://gedcom.io/terms/v7.1/record-FAM": "{0:M}"
 
-subsumes:
-  - "https://gedcom.io/terms/v7/CHIL"
-
 prerelease: true
 
 contact: "https://gedcom.io/community/"
diff --git a/extracted-files/tags/CHR b/extracted-files/tags/CHR
index e296a347..99372ad5 100644
--- a/extracted-files/tags/CHR
+++ b/extracted-files/tags/CHR
@@ -67,9 +67,6 @@ substructures:
 superstructures:
   "https://gedcom.io/terms/v7.1/record-INDI": "{0:M}"
 
-subsumes:
-  - "https://gedcom.io/terms/v7/CHR"
-
 value of:
   - "https://gedcom.io/terms/v7.1/enumset-EVEN"
   - "https://gedcom.io/terms/v7.1/enumset-EVENATTR"
diff --git a/extracted-files/tags/CHRA b/extracted-files/tags/CHRA
index aa9d0af5..eb49ca70 100644
--- a/extracted-files/tags/CHRA
+++ b/extracted-files/tags/CHRA
@@ -66,9 +66,6 @@ substructures:
 superstructures:
   "https://gedcom.io/terms/v7.1/record-INDI": "{0:M}"
 
-subsumes:
-  - "https://gedcom.io/terms/v7/CHRA"
-
 value of:
   - "https://gedcom.io/terms/v7.1/enumset-EVEN"
   - "https://gedcom.io/terms/v7.1/enumset-EVENATTR"
diff --git a/extracted-files/tags/CONF b/extracted-files/tags/CONF
index d1146667..9d337c26 100644
--- a/extracted-files/tags/CONF
+++ b/extracted-files/tags/CONF
@@ -66,9 +66,6 @@ substructures:
 superstructures:
   "https://gedcom.io/terms/v7.1/record-INDI": "{0:M}"
 
-subsumes:
-  - "https://gedcom.io/terms/v7/CONF"
-
 value of:
   - "https://gedcom.io/terms/v7.1/enumset-EVEN"
   - "https://gedcom.io/terms/v7.1/enumset-EVENATTR"
diff --git a/extracted-files/tags/CONL b/extracted-files/tags/CONL
index d8a59d0a..08def4aa 100644
--- a/extracted-files/tags/CONL
+++ b/extracted-files/tags/CONL
@@ -34,9 +34,6 @@ substructures:
 superstructures:
   "https://gedcom.io/terms/v7.1/record-INDI": "{0:M}"
 
-subsumes:
-  - "https://gedcom.io/terms/v7/CONL"
-
 prerelease: true
 
 contact: "https://gedcom.io/community/"
diff --git a/extracted-files/tags/CREM b/extracted-files/tags/CREM
index a29310df..602c63bc 100644
--- a/extracted-files/tags/CREM
+++ b/extracted-files/tags/CREM
@@ -66,9 +66,6 @@ substructures:
 superstructures:
   "https://gedcom.io/terms/v7.1/record-INDI": "{0:M}"
 
-subsumes:
-  - "https://gedcom.io/terms/v7/CREM"
-
 value of:
   - "https://gedcom.io/terms/v7.1/enumset-EVEN"
   - "https://gedcom.io/terms/v7.1/enumset-EVENATTR"
diff --git a/extracted-files/tags/DATA b/extracted-files/tags/DATA
index aeb435b5..413cc1fa 100644
--- a/extracted-files/tags/DATA
+++ b/extracted-files/tags/DATA
@@ -27,9 +27,6 @@ substructures:
 superstructures:
   "https://gedcom.io/terms/v7.1/record-SOUR": "{0:1}"
 
-subsumes:
-  - "https://gedcom.io/terms/v7/DATA"
-
 prerelease: true
 
 contact: "https://gedcom.io/community/"
diff --git a/extracted-files/tags/DATA-EVEN b/extracted-files/tags/DATA-EVEN
index 52bcd878..76cd02d3 100644
--- a/extracted-files/tags/DATA-EVEN
+++ b/extracted-files/tags/DATA-EVEN
@@ -29,9 +29,6 @@ substructures:
 superstructures:
   "https://gedcom.io/terms/v7.1/DATA": "{0:M}"
 
-subsumes:
-  - "https://gedcom.io/terms/v7/DATA-EVEN"
-
 prerelease: true
 
 contact: "https://gedcom.io/community/"
diff --git a/extracted-files/tags/DEAT b/extracted-files/tags/DEAT
index 9c2e131d..1000cdca 100644
--- a/extracted-files/tags/DEAT
+++ b/extracted-files/tags/DEAT
@@ -66,9 +66,6 @@ substructures:
 superstructures:
   "https://gedcom.io/terms/v7.1/record-INDI": "{0:M}"
 
-subsumes:
-  - "https://gedcom.io/terms/v7/DEAT"
-
 value of:
   - "https://gedcom.io/terms/v7.1/enumset-EVEN"
   - "https://gedcom.io/terms/v7.1/enumset-EVENATTR"
diff --git a/extracted-files/tags/DESI b/extracted-files/tags/DESI
index bfe6577f..b699075c 100644
--- a/extracted-files/tags/DESI
+++ b/extracted-files/tags/DESI
@@ -22,9 +22,6 @@ substructures: {}
 superstructures:
   "https://gedcom.io/terms/v7.1/record-INDI": "{0:M}"
 
-subsumes:
-  - "https://gedcom.io/terms/v7/DESI"
-
 prerelease: true
 
 contact: "https://gedcom.io/community/"
diff --git a/extracted-files/tags/DIV b/extracted-files/tags/DIV
index 37228edc..86f70b86 100644
--- a/extracted-files/tags/DIV
+++ b/extracted-files/tags/DIV
@@ -61,9 +61,6 @@ substructures:
 superstructures:
   "https://gedcom.io/terms/v7.1/record-FAM": "{0:M}"
 
-subsumes:
-  - "https://gedcom.io/terms/v7/DIV"
-
 value of:
   - "https://gedcom.io/terms/v7.1/enumset-EVEN"
   - "https://gedcom.io/terms/v7.1/enumset-EVENATTR"
diff --git a/extracted-files/tags/DIVF b/extracted-files/tags/DIVF
index f692ea3c..cbe220b1 100644
--- a/extracted-files/tags/DIVF
+++ b/extracted-files/tags/DIVF
@@ -61,9 +61,6 @@ substructures:
 superstructures:
   "https://gedcom.io/terms/v7.1/record-FAM": "{0:M}"
 
-subsumes:
-  - "https://gedcom.io/terms/v7/DIVF"
-
 value of:
   - "https://gedcom.io/terms/v7.1/enumset-EVEN"
   - "https://gedcom.io/terms/v7.1/enumset-EVENATTR"
diff --git a/extracted-files/tags/DSCR b/extracted-files/tags/DSCR
index 624c13ac..ce25f8f8 100644
--- a/extracted-files/tags/DSCR
+++ b/extracted-files/tags/DSCR
@@ -56,9 +56,6 @@ substructures:
 superstructures:
   "https://gedcom.io/terms/v7.1/record-INDI": "{0:M}"
 
-subsumes:
-  - "https://gedcom.io/terms/v7/DSCR"
-
 value of:
   - "https://gedcom.io/terms/v7.1/enumset-EVENATTR"
 
diff --git a/extracted-files/tags/EDUC b/extracted-files/tags/EDUC
index 96a904d6..9007cccc 100644
--- a/extracted-files/tags/EDUC
+++ b/extracted-files/tags/EDUC
@@ -56,9 +56,6 @@ substructures:
 superstructures:
   "https://gedcom.io/terms/v7.1/record-INDI": "{0:M}"
 
-subsumes:
-  - "https://gedcom.io/terms/v7/EDUC"
-
 value of:
   - "https://gedcom.io/terms/v7.1/enumset-EVENATTR"
 
diff --git a/extracted-files/tags/EMIG b/extracted-files/tags/EMIG
index 1d569788..f25591e9 100644
--- a/extracted-files/tags/EMIG
+++ b/extracted-files/tags/EMIG
@@ -66,9 +66,6 @@ substructures:
 superstructures:
   "https://gedcom.io/terms/v7.1/record-INDI": "{0:M}"
 
-subsumes:
-  - "https://gedcom.io/terms/v7/EMIG"
-
 value of:
   - "https://gedcom.io/terms/v7.1/enumset-EVEN"
   - "https://gedcom.io/terms/v7.1/enumset-EVENATTR"
diff --git a/extracted-files/tags/ENDL b/extracted-files/tags/ENDL
index a784e699..167021ae 100644
--- a/extracted-files/tags/ENDL
+++ b/extracted-files/tags/ENDL
@@ -35,9 +35,6 @@ substructures:
 superstructures:
   "https://gedcom.io/terms/v7.1/record-INDI": "{0:M}"
 
-subsumes:
-  - "https://gedcom.io/terms/v7/ENDL"
-
 prerelease: true
 
 contact: "https://gedcom.io/community/"
diff --git a/extracted-files/tags/ENGA b/extracted-files/tags/ENGA
index 3e5aeb41..a393c5ba 100644
--- a/extracted-files/tags/ENGA
+++ b/extracted-files/tags/ENGA
@@ -61,9 +61,6 @@ substructures:
 superstructures:
   "https://gedcom.io/terms/v7.1/record-FAM": "{0:M}"
 
-subsumes:
-  - "https://gedcom.io/terms/v7/ENGA"
-
 value of:
   - "https://gedcom.io/terms/v7.1/enumset-EVEN"
   - "https://gedcom.io/terms/v7.1/enumset-EVENATTR"
diff --git a/extracted-files/tags/FAM-CENS b/extracted-files/tags/FAM-CENS
index b7dd38ca..59a1731f 100644
--- a/extracted-files/tags/FAM-CENS
+++ b/extracted-files/tags/FAM-CENS
@@ -62,9 +62,6 @@ substructures:
 superstructures:
   "https://gedcom.io/terms/v7.1/record-FAM": "{0:M}"
 
-subsumes:
-  - "https://gedcom.io/terms/v7/FAM-CENS"
-
 prerelease: true
 
 contact: "https://gedcom.io/community/"
diff --git a/extracted-files/tags/FAM-EVEN b/extracted-files/tags/FAM-EVEN
index 557a7af3..5c124112 100644
--- a/extracted-files/tags/FAM-EVEN
+++ b/extracted-files/tags/FAM-EVEN
@@ -59,9 +59,6 @@ substructures:
 superstructures:
   "https://gedcom.io/terms/v7.1/record-FAM": "{0:M}"
 
-subsumes:
-  - "https://gedcom.io/terms/v7/FAM-EVEN"
-
 prerelease: true
 
 contact: "https://gedcom.io/community/"
diff --git a/extracted-files/tags/FAM-FACT b/extracted-files/tags/FAM-FACT
index a3ab6b81..6f3539a1 100644
--- a/extracted-files/tags/FAM-FACT
+++ b/extracted-files/tags/FAM-FACT
@@ -54,9 +54,6 @@ substructures:
 superstructures:
   "https://gedcom.io/terms/v7.1/record-FAM": "{0:M}"
 
-subsumes:
-  - "https://gedcom.io/terms/v7/FAM-FACT"
-
 prerelease: true
 
 contact: "https://gedcom.io/community/"
diff --git a/extracted-files/tags/FAM-HUSB b/extracted-files/tags/FAM-HUSB
index 7da3c94b..a0f5b031 100644
--- a/extracted-files/tags/FAM-HUSB
+++ b/extracted-files/tags/FAM-HUSB
@@ -22,9 +22,6 @@ substructures:
 superstructures:
   "https://gedcom.io/terms/v7.1/record-FAM": "{0:1}"
 
-subsumes:
-  - "https://gedcom.io/terms/v7/FAM-HUSB"
-
 prerelease: true
 
 contact: "https://gedcom.io/community/"
diff --git a/extracted-files/tags/FAM-NCHI b/extracted-files/tags/FAM-NCHI
index 0bddcab9..597d0759 100644
--- a/extracted-files/tags/FAM-NCHI
+++ b/extracted-files/tags/FAM-NCHI
@@ -56,9 +56,6 @@ substructures:
 superstructures:
   "https://gedcom.io/terms/v7.1/record-FAM": "{0:M}"
 
-subsumes:
-  - "https://gedcom.io/terms/v7/FAM-NCHI"
-
 prerelease: true
 
 contact: "https://gedcom.io/community/"
diff --git a/extracted-files/tags/FAM-RESI b/extracted-files/tags/FAM-RESI
index b624ac9e..cadcbe23 100644
--- a/extracted-files/tags/FAM-RESI
+++ b/extracted-files/tags/FAM-RESI
@@ -60,9 +60,6 @@ substructures:
 superstructures:
   "https://gedcom.io/terms/v7.1/record-FAM": "{0:M}"
 
-subsumes:
-  - "https://gedcom.io/terms/v7/FAM-RESI"
-
 prerelease: true
 
 contact: "https://gedcom.io/community/"
diff --git a/extracted-files/tags/FAM-WIFE b/extracted-files/tags/FAM-WIFE
index 6d66987f..18038727 100644
--- a/extracted-files/tags/FAM-WIFE
+++ b/extracted-files/tags/FAM-WIFE
@@ -22,9 +22,6 @@ substructures:
 superstructures:
   "https://gedcom.io/terms/v7.1/record-FAM": "{0:1}"
 
-subsumes:
-  - "https://gedcom.io/terms/v7/FAM-WIFE"
-
 prerelease: true
 
 contact: "https://gedcom.io/community/"
diff --git a/extracted-files/tags/FAMC b/extracted-files/tags/FAMC
index 06639d17..6156bc30 100644
--- a/extracted-files/tags/FAMC
+++ b/extracted-files/tags/FAMC
@@ -23,9 +23,6 @@ superstructures:
   "https://gedcom.io/terms/v7.1/CHR": "{0:1}"
   "https://gedcom.io/terms/v7.1/SLGC": "{1:1}"
 
-subsumes:
-  - "https://gedcom.io/terms/v7/FAMC"
-
 prerelease: true
 
 contact: "https://gedcom.io/community/"
diff --git a/extracted-files/tags/FAMS b/extracted-files/tags/FAMS
index 54042be1..a646be95 100644
--- a/extracted-files/tags/FAMS
+++ b/extracted-files/tags/FAMS
@@ -24,9 +24,6 @@ substructures:
 superstructures:
   "https://gedcom.io/terms/v7.1/record-INDI": "{0:M}"
 
-subsumes:
-  - "https://gedcom.io/terms/v7/FAMS"
-
 prerelease: true
 
 contact: "https://gedcom.io/community/"
diff --git a/extracted-files/tags/FCOM b/extracted-files/tags/FCOM
index 00ca5560..a02e6d3e 100644
--- a/extracted-files/tags/FCOM
+++ b/extracted-files/tags/FCOM
@@ -66,9 +66,6 @@ substructures:
 superstructures:
   "https://gedcom.io/terms/v7.1/record-INDI": "{0:M}"
 
-subsumes:
-  - "https://gedcom.io/terms/v7/FCOM"
-
 value of:
   - "https://gedcom.io/terms/v7.1/enumset-EVEN"
   - "https://gedcom.io/terms/v7.1/enumset-EVENATTR"
diff --git a/extracted-files/tags/GRAD b/extracted-files/tags/GRAD
index fca82988..7c020f3e 100644
--- a/extracted-files/tags/GRAD
+++ b/extracted-files/tags/GRAD
@@ -66,9 +66,6 @@ substructures:
 superstructures:
   "https://gedcom.io/terms/v7.1/record-INDI": "{0:M}"
 
-subsumes:
-  - "https://gedcom.io/terms/v7/GRAD"
-
 value of:
   - "https://gedcom.io/terms/v7.1/enumset-EVEN"
   - "https://gedcom.io/terms/v7.1/enumset-EVENATTR"
diff --git a/extracted-files/tags/HEAD b/extracted-files/tags/HEAD
index 028cab5c..4b967eb3 100644
--- a/extracted-files/tags/HEAD
+++ b/extracted-files/tags/HEAD
@@ -38,8 +38,10 @@ label: 'Header'
 payload: null
 
 substructures:
-  "https://gedcom.io/terms/v7.1/NOTE": "{0:1}"
-  "https://gedcom.io/terms/v7.1/SNOTE": "{0:1}"
+  "https://gedcom.io/terms/v7.1/HEAD-DESC": "{0:1}"
+  "https://gedcom.io/terms/v7.1/HEAD-TITL": "{0:1}"
+  "https://gedcom.io/terms/v7.1/NOTE": "{0:M}"
+  "https://gedcom.io/terms/v7.1/SNOTE": "{0:M}"
   "https://gedcom.io/terms/v7.1/SUBM": "{0:1}"
   "https://gedcom.io/terms/v7/COPR": "{0:1}"
   "https://gedcom.io/terms/v7/DEST": "{0:1}"
@@ -52,9 +54,6 @@ substructures:
 
 superstructures: {}
 
-subsumes:
-  - "https://gedcom.io/terms/v7/HEAD"
-
 prerelease: true
 
 contact: "https://gedcom.io/community/"
diff --git a/extracted-files/tags/HEAD-DESC b/extracted-files/tags/HEAD-DESC
new file mode 100644
index 00000000..b48bcaec
--- /dev/null
+++ b/extracted-files/tags/HEAD-DESC
@@ -0,0 +1,29 @@
+%YAML 1.2
+---
+lang: en-US
+
+type: structure
+
+uri: https://gedcom.io/terms/v7.1/HEAD-DESC
+
+standard tag: 'DESC'
+
+specification:
+  - Description
+  - A description of the entire dataset.
+
+label: 'Description'
+
+payload: http://www.w3.org/2001/XMLSchema#string
+
+substructures:
+  "https://gedcom.io/terms/v7.1/TEXT-TRAN": "{0:M}"
+  "https://gedcom.io/terms/v7/LANG": "{0:1}"
+
+superstructures:
+  "https://gedcom.io/terms/v7.1/HEAD": "{0:1}"
+
+prerelease: true
+
+contact: "https://gedcom.io/community/"
+...
diff --git a/extracted-files/tags/HEAD-TITL b/extracted-files/tags/HEAD-TITL
new file mode 100644
index 00000000..21a043ad
--- /dev/null
+++ b/extracted-files/tags/HEAD-TITL
@@ -0,0 +1,29 @@
+%YAML 1.2
+---
+lang: en-US
+
+type: structure
+
+uri: https://gedcom.io/terms/v7.1/HEAD-TITL
+
+standard tag: 'TITL'
+
+specification:
+  - Title
+  - A descriptive title for the entire dataset.
+
+label: 'Title'
+
+payload: http://www.w3.org/2001/XMLSchema#string
+
+substructures:
+  "https://gedcom.io/terms/v7.1/TEXT-TRAN": "{0:M}"
+  "https://gedcom.io/terms/v7/LANG": "{0:1}"
+
+superstructures:
+  "https://gedcom.io/terms/v7.1/HEAD": "{0:1}"
+
+prerelease: true
+
+contact: "https://gedcom.io/community/"
+...
diff --git a/extracted-files/tags/IDNO b/extracted-files/tags/IDNO
index be604b20..69fe4b4b 100644
--- a/extracted-files/tags/IDNO
+++ b/extracted-files/tags/IDNO
@@ -58,9 +58,6 @@ substructures:
 superstructures:
   "https://gedcom.io/terms/v7.1/record-INDI": "{0:M}"
 
-subsumes:
-  - "https://gedcom.io/terms/v7/IDNO"
-
 value of:
   - "https://gedcom.io/terms/v7.1/enumset-EVENATTR"
 
diff --git a/extracted-files/tags/IMMI b/extracted-files/tags/IMMI
index 0a9f0d86..2c3776d9 100644
--- a/extracted-files/tags/IMMI
+++ b/extracted-files/tags/IMMI
@@ -66,9 +66,6 @@ substructures:
 superstructures:
   "https://gedcom.io/terms/v7.1/record-INDI": "{0:M}"
 
-subsumes:
-  - "https://gedcom.io/terms/v7/IMMI"
-
 value of:
   - "https://gedcom.io/terms/v7.1/enumset-EVEN"
   - "https://gedcom.io/terms/v7.1/enumset-EVENATTR"
diff --git a/extracted-files/tags/INDI-CENS b/extracted-files/tags/INDI-CENS
index 951be1fc..da7091e2 100644
--- a/extracted-files/tags/INDI-CENS
+++ b/extracted-files/tags/INDI-CENS
@@ -67,9 +67,6 @@ substructures:
 superstructures:
   "https://gedcom.io/terms/v7.1/record-INDI": "{0:M}"
 
-subsumes:
-  - "https://gedcom.io/terms/v7/INDI-CENS"
-
 prerelease: true
 
 contact: "https://gedcom.io/community/"
diff --git a/extracted-files/tags/INDI-EVEN b/extracted-files/tags/INDI-EVEN
index 1e0e131e..e2f75f86 100644
--- a/extracted-files/tags/INDI-EVEN
+++ b/extracted-files/tags/INDI-EVEN
@@ -85,9 +85,6 @@ substructures:
 superstructures:
   "https://gedcom.io/terms/v7.1/record-INDI": "{0:M}"
 
-subsumes:
-  - "https://gedcom.io/terms/v7/INDI-EVEN"
-
 prerelease: true
 
 contact: "https://gedcom.io/community/"
diff --git a/extracted-files/tags/INDI-FACT b/extracted-files/tags/INDI-FACT
index 680c19e9..2e474024 100644
--- a/extracted-files/tags/INDI-FACT
+++ b/extracted-files/tags/INDI-FACT
@@ -72,9 +72,6 @@ substructures:
 superstructures:
   "https://gedcom.io/terms/v7.1/record-INDI": "{0:M}"
 
-subsumes:
-  - "https://gedcom.io/terms/v7/INDI-FACT"
-
 prerelease: true
 
 contact: "https://gedcom.io/community/"
diff --git a/extracted-files/tags/INDI-FAMC b/extracted-files/tags/INDI-FAMC
index 34839bf1..14e49c58 100644
--- a/extracted-files/tags/INDI-FAMC
+++ b/extracted-files/tags/INDI-FAMC
@@ -27,9 +27,6 @@ substructures:
 superstructures:
   "https://gedcom.io/terms/v7.1/record-INDI": "{0:M}"
 
-subsumes:
-  - "https://gedcom.io/terms/v7/INDI-FAMC"
-
 prerelease: true
 
 contact: "https://gedcom.io/community/"
diff --git a/extracted-files/tags/INDI-NAME b/extracted-files/tags/INDI-NAME
index da9b49dd..bd0e8fb9 100644
--- a/extracted-files/tags/INDI-NAME
+++ b/extracted-files/tags/INDI-NAME
@@ -62,9 +62,6 @@ substructures:
 superstructures:
   "https://gedcom.io/terms/v7.1/record-INDI": "{0:M}"
 
-subsumes:
-  - "https://gedcom.io/terms/v7/INDI-NAME"
-
 prerelease: true
 
 contact: "https://gedcom.io/community/"
diff --git a/extracted-files/tags/INDI-NCHI b/extracted-files/tags/INDI-NCHI
index b17a187a..50ec8277 100644
--- a/extracted-files/tags/INDI-NCHI
+++ b/extracted-files/tags/INDI-NCHI
@@ -57,9 +57,6 @@ substructures:
 superstructures:
   "https://gedcom.io/terms/v7.1/record-INDI": "{0:M}"
 
-subsumes:
-  - "https://gedcom.io/terms/v7/INDI-NCHI"
-
 prerelease: true
 
 contact: "https://gedcom.io/community/"
diff --git a/extracted-files/tags/INDI-RELI b/extracted-files/tags/INDI-RELI
index 60790ba6..73b3506d 100644
--- a/extracted-files/tags/INDI-RELI
+++ b/extracted-files/tags/INDI-RELI
@@ -57,9 +57,6 @@ substructures:
 superstructures:
   "https://gedcom.io/terms/v7.1/record-INDI": "{0:M}"
 
-subsumes:
-  - "https://gedcom.io/terms/v7/INDI-RELI"
-
 value of:
   - "https://gedcom.io/terms/v7.1/enumset-EVENATTR"
 
diff --git a/extracted-files/tags/INDI-RESI b/extracted-files/tags/INDI-RESI
index 9fc2816b..610be21d 100644
--- a/extracted-files/tags/INDI-RESI
+++ b/extracted-files/tags/INDI-RESI
@@ -80,9 +80,6 @@ substructures:
 superstructures:
   "https://gedcom.io/terms/v7.1/record-INDI": "{0:M}"
 
-subsumes:
-  - "https://gedcom.io/terms/v7/INDI-RESI"
-
 prerelease: true
 
 contact: "https://gedcom.io/community/"
diff --git a/extracted-files/tags/INDI-TITL b/extracted-files/tags/INDI-TITL
index e69a8620..ceb546f5 100644
--- a/extracted-files/tags/INDI-TITL
+++ b/extracted-files/tags/INDI-TITL
@@ -57,9 +57,6 @@ substructures:
 superstructures:
   "https://gedcom.io/terms/v7.1/record-INDI": "{0:M}"
 
-subsumes:
-  - "https://gedcom.io/terms/v7/INDI-TITL"
-
 value of:
   - "https://gedcom.io/terms/v7.1/enumset-EVENATTR"
 
diff --git a/extracted-files/tags/INIL b/extracted-files/tags/INIL
index e20c90f6..3a1989cb 100644
--- a/extracted-files/tags/INIL
+++ b/extracted-files/tags/INIL
@@ -38,9 +38,6 @@ substructures:
 superstructures:
   "https://gedcom.io/terms/v7.1/record-INDI": "{0:M}"
 
-subsumes:
-  - "https://gedcom.io/terms/v7/INIL"
-
 prerelease: true
 
 contact: "https://gedcom.io/community/"
diff --git a/extracted-files/tags/LANG b/extracted-files/tags/LANG
index 5c329cd4..378a1aaf 100644
--- a/extracted-files/tags/LANG
+++ b/extracted-files/tags/LANG
@@ -72,8 +72,11 @@ payload: http://www.w3.org/2001/XMLSchema#Language
 substructures: {}
 
 superstructures:
+  "https://gedcom.io/terms/v7.1/HEAD-DESC": "{0:1}"
+  "https://gedcom.io/terms/v7.1/HEAD-TITL": "{0:1}"
   "https://gedcom.io/terms/v7.1/NOTE": "{0:1}"
   "https://gedcom.io/terms/v7.1/PLAC": "{0:1}"
+  "https://gedcom.io/terms/v7.1/TEXT-TRAN": "{1:1}"
   "https://gedcom.io/terms/v7.1/record-SNOTE": "{0:1}"
   "https://gedcom.io/terms/v7/NAME-TRAN": "{1:1}"
   "https://gedcom.io/terms/v7/NOTE-TRAN": "{0:1}"
diff --git a/extracted-files/tags/MARB b/extracted-files/tags/MARB
index cfe19a95..f941fba7 100644
--- a/extracted-files/tags/MARB
+++ b/extracted-files/tags/MARB
@@ -61,9 +61,6 @@ substructures:
 superstructures:
   "https://gedcom.io/terms/v7.1/record-FAM": "{0:M}"
 
-subsumes:
-  - "https://gedcom.io/terms/v7/MARB"
-
 value of:
   - "https://gedcom.io/terms/v7.1/enumset-EVEN"
   - "https://gedcom.io/terms/v7.1/enumset-EVENATTR"
diff --git a/extracted-files/tags/MARC b/extracted-files/tags/MARC
index d1b00d52..375fb3de 100644
--- a/extracted-files/tags/MARC
+++ b/extracted-files/tags/MARC
@@ -63,9 +63,6 @@ substructures:
 superstructures:
   "https://gedcom.io/terms/v7.1/record-FAM": "{0:M}"
 
-subsumes:
-  - "https://gedcom.io/terms/v7/MARC"
-
 value of:
   - "https://gedcom.io/terms/v7.1/enumset-EVEN"
   - "https://gedcom.io/terms/v7.1/enumset-EVENATTR"
diff --git a/extracted-files/tags/MARL b/extracted-files/tags/MARL
index dfef3d66..95e9b3cc 100644
--- a/extracted-files/tags/MARL
+++ b/extracted-files/tags/MARL
@@ -61,9 +61,6 @@ substructures:
 superstructures:
   "https://gedcom.io/terms/v7.1/record-FAM": "{0:M}"
 
-subsumes:
-  - "https://gedcom.io/terms/v7/MARL"
-
 value of:
   - "https://gedcom.io/terms/v7.1/enumset-EVEN"
   - "https://gedcom.io/terms/v7.1/enumset-EVENATTR"
diff --git a/extracted-files/tags/MARR b/extracted-files/tags/MARR
index fccf5aab..c0d48fb0 100644
--- a/extracted-files/tags/MARR
+++ b/extracted-files/tags/MARR
@@ -62,9 +62,6 @@ substructures:
 superstructures:
   "https://gedcom.io/terms/v7.1/record-FAM": "{0:M}"
 
-subsumes:
-  - "https://gedcom.io/terms/v7/MARR"
-
 value of:
   - "https://gedcom.io/terms/v7.1/enumset-EVEN"
   - "https://gedcom.io/terms/v7.1/enumset-EVENATTR"
diff --git a/extracted-files/tags/MARS b/extracted-files/tags/MARS
index c48186e2..358a1d7e 100644
--- a/extracted-files/tags/MARS
+++ b/extracted-files/tags/MARS
@@ -63,9 +63,6 @@ substructures:
 superstructures:
   "https://gedcom.io/terms/v7.1/record-FAM": "{0:M}"
 
-subsumes:
-  - "https://gedcom.io/terms/v7/MARS"
-
 value of:
   - "https://gedcom.io/terms/v7.1/enumset-EVEN"
   - "https://gedcom.io/terms/v7.1/enumset-EVENATTR"
diff --git a/extracted-files/tags/NATI b/extracted-files/tags/NATI
index 1ecf877d..326048a7 100644
--- a/extracted-files/tags/NATI
+++ b/extracted-files/tags/NATI
@@ -57,9 +57,6 @@ substructures:
 superstructures:
   "https://gedcom.io/terms/v7.1/record-INDI": "{0:M}"
 
-subsumes:
-  - "https://gedcom.io/terms/v7/NATI"
-
 value of:
   - "https://gedcom.io/terms/v7.1/enumset-EVENATTR"
 
diff --git a/extracted-files/tags/NATU b/extracted-files/tags/NATU
index 1b5636c1..62fda445 100644
--- a/extracted-files/tags/NATU
+++ b/extracted-files/tags/NATU
@@ -66,9 +66,6 @@ substructures:
 superstructures:
   "https://gedcom.io/terms/v7.1/record-INDI": "{0:M}"
 
-subsumes:
-  - "https://gedcom.io/terms/v7/NATU"
-
 value of:
   - "https://gedcom.io/terms/v7.1/enumset-EVEN"
   - "https://gedcom.io/terms/v7.1/enumset-EVENATTR"
diff --git a/extracted-files/tags/NMR b/extracted-files/tags/NMR
index a0b6a539..be317cf8 100644
--- a/extracted-files/tags/NMR
+++ b/extracted-files/tags/NMR
@@ -57,9 +57,6 @@ substructures:
 superstructures:
   "https://gedcom.io/terms/v7.1/record-INDI": "{0:M}"
 
-subsumes:
-  - "https://gedcom.io/terms/v7/NMR"
-
 value of:
   - "https://gedcom.io/terms/v7.1/enumset-EVENATTR"
 
diff --git a/extracted-files/tags/NO b/extracted-files/tags/NO
index f9b363e2..2a9a8e71 100644
--- a/extracted-files/tags/NO
+++ b/extracted-files/tags/NO
@@ -58,9 +58,6 @@ superstructures:
   "https://gedcom.io/terms/v7.1/record-FAM": "{0:M}"
   "https://gedcom.io/terms/v7.1/record-INDI": "{0:M}"
 
-subsumes:
-  - "https://gedcom.io/terms/v7/NO"
-
 prerelease: true
 
 contact: "https://gedcom.io/community/"
diff --git a/extracted-files/tags/NOTE b/extracted-files/tags/NOTE
index dc6abde9..f36f82f0 100644
--- a/extracted-files/tags/NOTE
+++ b/extracted-files/tags/NOTE
@@ -36,6 +36,7 @@ label: 'Note'
 payload: http://www.w3.org/2001/XMLSchema#string
 
 substructures:
+  "https://gedcom.io/terms/v7.1/NOTE-KIND": "{0:M}"
   "https://gedcom.io/terms/v7.1/SOUR": "{0:M}"
   "https://gedcom.io/terms/v7/LANG": "{0:1}"
   "https://gedcom.io/terms/v7/MIME": "{0:1}"
@@ -76,7 +77,7 @@ superstructures:
   "https://gedcom.io/terms/v7.1/FAMS": "{0:M}"
   "https://gedcom.io/terms/v7.1/FCOM": "{0:M}"
   "https://gedcom.io/terms/v7.1/GRAD": "{0:M}"
-  "https://gedcom.io/terms/v7.1/HEAD": "{0:1}"
+  "https://gedcom.io/terms/v7.1/HEAD": "{0:M}"
   "https://gedcom.io/terms/v7.1/IDNO": "{0:M}"
   "https://gedcom.io/terms/v7.1/IMMI": "{0:M}"
   "https://gedcom.io/terms/v7.1/INDI-CENS": "{0:M}"
@@ -117,9 +118,6 @@ superstructures:
   "https://gedcom.io/terms/v7.1/record-SOUR": "{0:M}"
   "https://gedcom.io/terms/v7.1/record-SUBM": "{0:M}"
 
-subsumes:
-  - "https://gedcom.io/terms/v7/NOTE"
-
 prerelease: true
 
 contact: "https://gedcom.io/community/"
diff --git a/extracted-files/tags/NOTE-KIND b/extracted-files/tags/NOTE-KIND
new file mode 100644
index 00000000..150666d6
--- /dev/null
+++ b/extracted-files/tags/NOTE-KIND
@@ -0,0 +1,37 @@
+%YAML 1.2
+---
+lang: en-US
+
+type: structure
+
+uri: https://gedcom.io/terms/v7.1/NOTE-KIND
+
+standard tag: 'KIND'
+
+specification:
+  - Type
+  - |
+    An enumerated value from set `https://gedcom.io/terms/v7.1/enumset-NOTE-KIND`
+    indicating the type of the note.
+    
+    When there are multiple `https://gedcom.io/terms/v7.1/NOTE-KIND` substructures
+    to a note, all apply equally to the note; there is no notion of a preferred or
+    primary note type.
+
+label: 'Type'
+
+payload: https://gedcom.io/terms/v7/type-Enum
+
+enumeration set: "https://gedcom.io/terms/v7.1/enumset-NOTE-KIND"
+
+substructures:
+  "https://gedcom.io/terms/v7/PHRASE": "{0:1}"
+
+superstructures:
+  "https://gedcom.io/terms/v7.1/NOTE": "{0:M}"
+  "https://gedcom.io/terms/v7.1/record-SNOTE": "{0:M}"
+
+prerelease: true
+
+contact: "https://gedcom.io/community/"
+...
diff --git a/extracted-files/tags/OBJE b/extracted-files/tags/OBJE
index 697fd829..d32ab99c 100644
--- a/extracted-files/tags/OBJE
+++ b/extracted-files/tags/OBJE
@@ -86,9 +86,6 @@ superstructures:
   "https://gedcom.io/terms/v7.1/record-SOUR": "{0:M}"
   "https://gedcom.io/terms/v7.1/record-SUBM": "{0:M}"
 
-subsumes:
-  - "https://gedcom.io/terms/v7/OBJE"
-
 prerelease: true
 
 contact: "https://gedcom.io/community/"
diff --git a/extracted-files/tags/OCCU b/extracted-files/tags/OCCU
index a459e817..b99bee93 100644
--- a/extracted-files/tags/OCCU
+++ b/extracted-files/tags/OCCU
@@ -56,9 +56,6 @@ substructures:
 superstructures:
   "https://gedcom.io/terms/v7.1/record-INDI": "{0:M}"
 
-subsumes:
-  - "https://gedcom.io/terms/v7/OCCU"
-
 value of:
   - "https://gedcom.io/terms/v7.1/enumset-EVENATTR"
 
diff --git a/extracted-files/tags/ORDN b/extracted-files/tags/ORDN
index 3a9908d5..272888cd 100644
--- a/extracted-files/tags/ORDN
+++ b/extracted-files/tags/ORDN
@@ -66,9 +66,6 @@ substructures:
 superstructures:
   "https://gedcom.io/terms/v7.1/record-INDI": "{0:M}"
 
-subsumes:
-  - "https://gedcom.io/terms/v7/ORDN"
-
 value of:
   - "https://gedcom.io/terms/v7.1/enumset-EVEN"
   - "https://gedcom.io/terms/v7.1/enumset-EVENATTR"
diff --git a/extracted-files/tags/PHRASE b/extracted-files/tags/PHRASE
index 1160487b..e11c9a47 100644
--- a/extracted-files/tags/PHRASE
+++ b/extracted-files/tags/PHRASE
@@ -112,6 +112,7 @@ superstructures:
   "https://gedcom.io/terms/v7.1/CHIL": "{0:1}"
   "https://gedcom.io/terms/v7.1/FAM-HUSB": "{0:1}"
   "https://gedcom.io/terms/v7.1/FAM-WIFE": "{0:1}"
+  "https://gedcom.io/terms/v7.1/NOTE-KIND": "{0:1}"
   "https://gedcom.io/terms/v7.1/SOUR-EVEN": "{0:1}"
   "https://gedcom.io/terms/v7/AGE": "{0:1}"
   "https://gedcom.io/terms/v7/DATA-EVEN-DATE": "{0:1}"
diff --git a/extracted-files/tags/PLAC b/extracted-files/tags/PLAC
index dd9b5f3c..e1f0f222 100644
--- a/extracted-files/tags/PLAC
+++ b/extracted-files/tags/PLAC
@@ -150,9 +150,6 @@ superstructures:
   "https://gedcom.io/terms/v7.1/SSN": "{0:1}"
   "https://gedcom.io/terms/v7.1/WILL": "{0:1}"
 
-subsumes:
-  - "https://gedcom.io/terms/v7/PLAC"
-
 prerelease: true
 
 contact: "https://gedcom.io/community/"
diff --git a/extracted-files/tags/PROB b/extracted-files/tags/PROB
index c98c2967..3ac47fa7 100644
--- a/extracted-files/tags/PROB
+++ b/extracted-files/tags/PROB
@@ -67,9 +67,6 @@ substructures:
 superstructures:
   "https://gedcom.io/terms/v7.1/record-INDI": "{0:M}"
 
-subsumes:
-  - "https://gedcom.io/terms/v7/PROB"
-
 value of:
   - "https://gedcom.io/terms/v7.1/enumset-EVEN"
   - "https://gedcom.io/terms/v7.1/enumset-EVENATTR"
diff --git a/extracted-files/tags/PROP b/extracted-files/tags/PROP
index 9b0fcdf2..9a3ce5d8 100644
--- a/extracted-files/tags/PROP
+++ b/extracted-files/tags/PROP
@@ -56,9 +56,6 @@ substructures:
 superstructures:
   "https://gedcom.io/terms/v7.1/record-INDI": "{0:M}"
 
-subsumes:
-  - "https://gedcom.io/terms/v7/PROP"
-
 value of:
   - "https://gedcom.io/terms/v7.1/enumset-EVENATTR"
 
diff --git a/extracted-files/tags/REPO b/extracted-files/tags/REPO
index 2454a1c5..e716bc69 100644
--- a/extracted-files/tags/REPO
+++ b/extracted-files/tags/REPO
@@ -30,9 +30,6 @@ substructures:
 superstructures:
   "https://gedcom.io/terms/v7.1/record-SOUR": "{0:M}"
 
-subsumes:
-  - "https://gedcom.io/terms/v7/REPO"
-
 prerelease: true
 
 contact: "https://gedcom.io/community/"
diff --git a/extracted-files/tags/RETI b/extracted-files/tags/RETI
index 15cd1a4d..e6345c2b 100644
--- a/extracted-files/tags/RETI
+++ b/extracted-files/tags/RETI
@@ -67,9 +67,6 @@ substructures:
 superstructures:
   "https://gedcom.io/terms/v7.1/record-INDI": "{0:M}"
 
-subsumes:
-  - "https://gedcom.io/terms/v7/RETI"
-
 value of:
   - "https://gedcom.io/terms/v7.1/enumset-EVEN"
   - "https://gedcom.io/terms/v7.1/enumset-EVENATTR"
diff --git a/extracted-files/tags/SLGC b/extracted-files/tags/SLGC
index 848216fd..7a6609e4 100644
--- a/extracted-files/tags/SLGC
+++ b/extracted-files/tags/SLGC
@@ -35,9 +35,6 @@ substructures:
 superstructures:
   "https://gedcom.io/terms/v7.1/record-INDI": "{0:M}"
 
-subsumes:
-  - "https://gedcom.io/terms/v7/SLGC"
-
 prerelease: true
 
 contact: "https://gedcom.io/community/"
diff --git a/extracted-files/tags/SLGS b/extracted-files/tags/SLGS
index 5375ce93..7d8aaa41 100644
--- a/extracted-files/tags/SLGS
+++ b/extracted-files/tags/SLGS
@@ -35,9 +35,6 @@ substructures:
 superstructures:
   "https://gedcom.io/terms/v7.1/record-FAM": "{0:M}"
 
-subsumes:
-  - "https://gedcom.io/terms/v7/SLGS"
-
 prerelease: true
 
 contact: "https://gedcom.io/community/"
diff --git a/extracted-files/tags/SNOTE b/extracted-files/tags/SNOTE
index f71c2c5b..7045fb48 100644
--- a/extracted-files/tags/SNOTE
+++ b/extracted-files/tags/SNOTE
@@ -67,7 +67,7 @@ superstructures:
   "https://gedcom.io/terms/v7.1/FAMS": "{0:M}"
   "https://gedcom.io/terms/v7.1/FCOM": "{0:M}"
   "https://gedcom.io/terms/v7.1/GRAD": "{0:M}"
-  "https://gedcom.io/terms/v7.1/HEAD": "{0:1}"
+  "https://gedcom.io/terms/v7.1/HEAD": "{0:M}"
   "https://gedcom.io/terms/v7.1/IDNO": "{0:M}"
   "https://gedcom.io/terms/v7.1/IMMI": "{0:M}"
   "https://gedcom.io/terms/v7.1/INDI-CENS": "{0:M}"
@@ -108,9 +108,6 @@ superstructures:
   "https://gedcom.io/terms/v7.1/record-SOUR": "{0:M}"
   "https://gedcom.io/terms/v7.1/record-SUBM": "{0:M}"
 
-subsumes:
-  - "https://gedcom.io/terms/v7/SNOTE"
-
 prerelease: true
 
 contact: "https://gedcom.io/community/"
diff --git a/extracted-files/tags/SOUR b/extracted-files/tags/SOUR
index 37f335d0..b57906ba 100644
--- a/extracted-files/tags/SOUR
+++ b/extracted-files/tags/SOUR
@@ -114,9 +114,6 @@ superstructures:
   "https://gedcom.io/terms/v7.1/record-OBJE": "{0:M}"
   "https://gedcom.io/terms/v7.1/record-SNOTE": "{0:M}"
 
-subsumes:
-  - "https://gedcom.io/terms/v7/SOUR"
-
 prerelease: true
 
 contact: "https://gedcom.io/community/"
diff --git a/extracted-files/tags/SOUR-EVEN b/extracted-files/tags/SOUR-EVEN
index eb3a8bbe..95377e99 100644
--- a/extracted-files/tags/SOUR-EVEN
+++ b/extracted-files/tags/SOUR-EVEN
@@ -29,9 +29,6 @@ substructures:
 superstructures:
   "https://gedcom.io/terms/v7.1/SOUR": "{0:1}"
 
-subsumes:
-  - "https://gedcom.io/terms/v7/SOUR-EVEN"
-
 prerelease: true
 
 contact: "https://gedcom.io/community/"
diff --git a/extracted-files/tags/SSN b/extracted-files/tags/SSN
index a652fd84..11ceb754 100644
--- a/extracted-files/tags/SSN
+++ b/extracted-files/tags/SSN
@@ -57,9 +57,6 @@ substructures:
 superstructures:
   "https://gedcom.io/terms/v7.1/record-INDI": "{0:M}"
 
-subsumes:
-  - "https://gedcom.io/terms/v7/SSN"
-
 value of:
   - "https://gedcom.io/terms/v7.1/enumset-EVENATTR"
 
diff --git a/extracted-files/tags/SUBM b/extracted-files/tags/SUBM
index efd86494..8b4f81af 100644
--- a/extracted-files/tags/SUBM
+++ b/extracted-files/tags/SUBM
@@ -24,9 +24,6 @@ superstructures:
   "https://gedcom.io/terms/v7.1/record-FAM": "{0:M}"
   "https://gedcom.io/terms/v7.1/record-INDI": "{0:M}"
 
-subsumes:
-  - "https://gedcom.io/terms/v7/SUBM"
-
 prerelease: true
 
 contact: "https://gedcom.io/community/"
diff --git a/extracted-files/tags/TEXT-TRAN b/extracted-files/tags/TEXT-TRAN
new file mode 100644
index 00000000..672b9f26
--- /dev/null
+++ b/extracted-files/tags/TEXT-TRAN
@@ -0,0 +1,51 @@
+%YAML 1.2
+---
+lang: en-US
+
+type: structure
+
+uri: https://gedcom.io/terms/v7.1/TEXT-TRAN
+
+standard tag: 'TRAN'
+
+specification:
+  - Translation
+  - A type of `TRAN` for unstructured human-readable text without a media type,
+    such as is found in `HEAD`.`DESC` and `HEAD`.`TITL` payloads. Each
+    `https://gedcom.io/terms/v7/NOTE-TRAN` must have a `LANG` substructure. A
+    superstructure of a `https://gedcom.io/terms/v7/TEXT-TRAN` should also have a
+    `LANG` substructure.
+  - |
+    A representation of the superstructure's data in a different format.
+    
+    In some situations it is desirable to provide the same semantic content in
+    multiple formats. Where this is desirable, a `TRAN` substructure is used, where
+    the specific format is given in its language tag substructure, media type
+    substructure, or both.
+    
+    Different `TRAN` structures are used in different contexts to fully capture the
+    structure of the information being presented in multiple formats. In all cases,
+    a `TRAN` structure's payload and substructures should provide only information
+    also contained in the `TRAN` structures' superstructure, but provide it in a
+    new language, script, or media type.
+    
+    Each `TRAN` substructure must have either a language tag or a media type or
+    both. Each `TRAN` structure must differ from its superstructure and from every
+    other `TRAN` substructure of its superstructure in either its language tag or
+    its media type or both.
+
+label: 'Translation'
+
+payload: http://www.w3.org/2001/XMLSchema#string
+
+substructures:
+  "https://gedcom.io/terms/v7/LANG": "{1:1}"
+
+superstructures:
+  "https://gedcom.io/terms/v7.1/HEAD-DESC": "{0:M}"
+  "https://gedcom.io/terms/v7.1/HEAD-TITL": "{0:M}"
+
+prerelease: true
+
+contact: "https://gedcom.io/community/"
+...
diff --git a/extracted-files/tags/WILL b/extracted-files/tags/WILL
index 38d6516a..3e2c521a 100644
--- a/extracted-files/tags/WILL
+++ b/extracted-files/tags/WILL
@@ -68,9 +68,6 @@ substructures:
 superstructures:
   "https://gedcom.io/terms/v7.1/record-INDI": "{0:M}"
 
-subsumes:
-  - "https://gedcom.io/terms/v7/WILL"
-
 value of:
   - "https://gedcom.io/terms/v7.1/enumset-EVEN"
   - "https://gedcom.io/terms/v7.1/enumset-EVENATTR"
diff --git a/extracted-files/tags/enum-CENS b/extracted-files/tags/enum-CENS
index 1b53cce2..380339b3 100644
--- a/extracted-files/tags/enum-CENS
+++ b/extracted-files/tags/enum-CENS
@@ -12,9 +12,6 @@ specification:
   - A census event; either `https://gedcom.io/terms/v7.1/INDI-CENS` or
     `https://gedcom.io/terms/v7.1/FAM-CENS`
 
-subsumes:
-  - "https://gedcom.io/terms/v7/enum-CENS"
-
 value of:
   - "https://gedcom.io/terms/v7.1/enumset-EVEN"
   - "https://gedcom.io/terms/v7.1/enumset-EVENATTR"
diff --git a/extracted-files/tags/enum-DATA b/extracted-files/tags/enum-DATA
new file mode 100644
index 00000000..06887aea
--- /dev/null
+++ b/extracted-files/tags/enum-DATA
@@ -0,0 +1,20 @@
+%YAML 1.2
+---
+lang: en-US
+
+type: enumeration
+
+uri: https://gedcom.io/terms/v7.1/enum-DATA
+
+standard tag: 'DATA'
+
+specification:
+  - Historical data that is not present in other structures
+
+value of:
+  - "https://gedcom.io/terms/v7.1/enumset-NOTE-KIND"
+
+prerelease: true
+
+contact: "https://gedcom.io/community/"
+...
diff --git a/extracted-files/tags/enum-EVEN b/extracted-files/tags/enum-EVEN
index 039b17b0..4ba0e672 100644
--- a/extracted-files/tags/enum-EVEN
+++ b/extracted-files/tags/enum-EVEN
@@ -12,9 +12,6 @@ specification:
   - A generic event; either `https://gedcom.io/terms/v7.1/INDI-EVEN` or
     `https://gedcom.io/terms/v7.1/FAM-EVEN`
 
-subsumes:
-  - "https://gedcom.io/terms/v7/enum-EVEN"
-
 value of:
   - "https://gedcom.io/terms/v7.1/enumset-EVENATTR"
 
diff --git a/extracted-files/tags/enum-FACT b/extracted-files/tags/enum-FACT
index 8355d1bc..cdc98d06 100644
--- a/extracted-files/tags/enum-FACT
+++ b/extracted-files/tags/enum-FACT
@@ -12,9 +12,6 @@ specification:
   - A generic attribute; either `https://gedcom.io/terms/v7.1/INDI-FACT` or
     `https://gedcom.io/terms/v7.1/FAM-FACT`
 
-subsumes:
-  - "https://gedcom.io/terms/v7/enum-FACT"
-
 value of:
   - "https://gedcom.io/terms/v7.1/enumset-EVENATTR"
 
diff --git a/extracted-files/tags/enum-NCHI b/extracted-files/tags/enum-NCHI
index 6797eda2..2d302342 100644
--- a/extracted-files/tags/enum-NCHI
+++ b/extracted-files/tags/enum-NCHI
@@ -12,9 +12,6 @@ specification:
   - A count of children; either `https://gedcom.io/terms/v7.1/INDI-NCHI` or
     `https://gedcom.io/terms/v7.1/FAM-NCHI`
 
-subsumes:
-  - "https://gedcom.io/terms/v7/enum-NCHI"
-
 value of:
   - "https://gedcom.io/terms/v7.1/enumset-EVENATTR"
 
diff --git a/extracted-files/tags/enum-OTHER b/extracted-files/tags/enum-OTHER
index 6ae47240..aa4f21a2 100644
--- a/extracted-files/tags/enum-OTHER
+++ b/extracted-files/tags/enum-OTHER
@@ -12,10 +12,13 @@ specification:
   - A value not listed here; should have a `PHRASE` substructure
 
 value of:
+  - "https://gedcom.io/terms/v7.1/enumset-NOTE-KIND"
   - "https://gedcom.io/terms/v7/enumset-MEDI"
   - "https://gedcom.io/terms/v7/enumset-NAME-TYPE"
   - "https://gedcom.io/terms/v7/enumset-PEDI"
   - "https://gedcom.io/terms/v7/enumset-ROLE"
 
+prerelease: true
+
 contact: "https://gedcom.io/community/"
 ...
diff --git a/extracted-files/tags/enum-REASONING b/extracted-files/tags/enum-REASONING
new file mode 100644
index 00000000..9dce2f07
--- /dev/null
+++ b/extracted-files/tags/enum-REASONING
@@ -0,0 +1,20 @@
+%YAML 1.2
+---
+lang: en-US
+
+type: enumeration
+
+uri: https://gedcom.io/terms/v7.1/enum-REASONING
+
+standard tag: 'REASONING'
+
+specification:
+  - Descriptions of why the data is (or is not) believed to be accurate
+
+value of:
+  - "https://gedcom.io/terms/v7.1/enumset-NOTE-KIND"
+
+prerelease: true
+
+contact: "https://gedcom.io/community/"
+...
diff --git a/extracted-files/tags/enum-RESEARCH b/extracted-files/tags/enum-RESEARCH
new file mode 100644
index 00000000..2f5cc0a5
--- /dev/null
+++ b/extracted-files/tags/enum-RESEARCH
@@ -0,0 +1,20 @@
+%YAML 1.2
+---
+lang: en-US
+
+type: enumeration
+
+uri: https://gedcom.io/terms/v7.1/enum-RESEARCH
+
+standard tag: 'RESEARCH'
+
+specification:
+  - Notes about research performed
+
+value of:
+  - "https://gedcom.io/terms/v7.1/enumset-NOTE-KIND"
+
+prerelease: true
+
+contact: "https://gedcom.io/community/"
+...
diff --git a/extracted-files/tags/enum-RESI b/extracted-files/tags/enum-RESI
index 493755de..f28f34e0 100644
--- a/extracted-files/tags/enum-RESI
+++ b/extracted-files/tags/enum-RESI
@@ -12,9 +12,6 @@ specification:
   - A residence attribute; either `https://gedcom.io/terms/v7.1/INDI-RESI` or
     `https://gedcom.io/terms/v7.1/FAM-RESI`
 
-subsumes:
-  - "https://gedcom.io/terms/v7/enum-RESI"
-
 value of:
   - "https://gedcom.io/terms/v7.1/enumset-EVENATTR"
 
diff --git a/extracted-files/tags/enum-SCOPE b/extracted-files/tags/enum-SCOPE
new file mode 100644
index 00000000..7bb0cf6b
--- /dev/null
+++ b/extracted-files/tags/enum-SCOPE
@@ -0,0 +1,21 @@
+%YAML 1.2
+---
+lang: en-US
+
+type: enumeration
+
+uri: https://gedcom.io/terms/v7.1/enum-SCOPE
+
+standard tag: 'SCOPE'
+
+specification:
+  - A description of what data is or should be included in the given dataset (if
+    `HEAD`.`NOTE`), persona (if `INDI`.`NOTE`) or the like
+
+value of:
+  - "https://gedcom.io/terms/v7.1/enumset-NOTE-KIND"
+
+prerelease: true
+
+contact: "https://gedcom.io/community/"
+...
diff --git a/extracted-files/tags/enum-STORY b/extracted-files/tags/enum-STORY
new file mode 100644
index 00000000..644d6ee3
--- /dev/null
+++ b/extracted-files/tags/enum-STORY
@@ -0,0 +1,20 @@
+%YAML 1.2
+---
+lang: en-US
+
+type: enumeration
+
+uri: https://gedcom.io/terms/v7.1/enum-STORY
+
+standard tag: 'STORY'
+
+specification:
+  - Text presenting a story about or history of the subject the note is attached to
+
+value of:
+  - "https://gedcom.io/terms/v7.1/enumset-NOTE-KIND"
+
+prerelease: true
+
+contact: "https://gedcom.io/community/"
+...
diff --git a/extracted-files/tags/enum-TODO b/extracted-files/tags/enum-TODO
new file mode 100644
index 00000000..e7a26135
--- /dev/null
+++ b/extracted-files/tags/enum-TODO
@@ -0,0 +1,20 @@
+%YAML 1.2
+---
+lang: en-US
+
+type: enumeration
+
+uri: https://gedcom.io/terms/v7.1/enum-TODO
+
+standard tag: 'TODO'
+
+specification:
+  - Notes about things the researcher wishes or hopes to do in the future
+
+value of:
+  - "https://gedcom.io/terms/v7.1/enumset-NOTE-KIND"
+
+prerelease: true
+
+contact: "https://gedcom.io/community/"
+...
diff --git a/extracted-files/tags/enumset-EVEN b/extracted-files/tags/enumset-EVEN
index e4d3ce9a..a5fdb722 100644
--- a/extracted-files/tags/enumset-EVEN
+++ b/extracted-files/tags/enumset-EVEN
@@ -49,9 +49,6 @@ enumeration values:
 
 standard: true
 
-subsumes:
-  - "https://gedcom.io/terms/v7/enumset-EVEN"
-
 prerelease: true
 
 contact: "https://gedcom.io/community/"
diff --git a/extracted-files/tags/enumset-EVENATTR b/extracted-files/tags/enumset-EVENATTR
index 37d7ef63..81744390 100644
--- a/extracted-files/tags/enumset-EVENATTR
+++ b/extracted-files/tags/enumset-EVENATTR
@@ -64,9 +64,6 @@ enumeration values:
 
 standard: true
 
-subsumes:
-  - "https://gedcom.io/terms/v7/enumset-EVENATTR"
-
 prerelease: true
 
 contact: "https://gedcom.io/community/"
diff --git a/extracted-files/tags/enumset-NOTE-KIND b/extracted-files/tags/enumset-NOTE-KIND
new file mode 100644
index 00000000..6c1535c3
--- /dev/null
+++ b/extracted-files/tags/enumset-NOTE-KIND
@@ -0,0 +1,23 @@
+%YAML 1.2
+---
+lang: en-US
+
+type: enumeration set
+
+uri: https://gedcom.io/terms/v7.1/enumset-NOTE-KIND
+
+enumeration values:
+  - "https://gedcom.io/terms/v7.1/enum-DATA"
+  - "https://gedcom.io/terms/v7.1/enum-REASONING"
+  - "https://gedcom.io/terms/v7.1/enum-RESEARCH"
+  - "https://gedcom.io/terms/v7.1/enum-SCOPE"
+  - "https://gedcom.io/terms/v7.1/enum-STORY"
+  - "https://gedcom.io/terms/v7.1/enum-TODO"
+  - "https://gedcom.io/terms/v7/enum-OTHER"
+
+standard: true
+
+prerelease: true
+
+contact: "https://gedcom.io/community/"
+...
diff --git a/extracted-files/tags/record-FAM b/extracted-files/tags/record-FAM
index fcf93081..8afb3d32 100644
--- a/extracted-files/tags/record-FAM
+++ b/extracted-files/tags/record-FAM
@@ -126,9 +126,6 @@ substructures:
 
 superstructures: {}
 
-subsumes:
-  - "https://gedcom.io/terms/v7/record-FAM"
-
 prerelease: true
 
 contact: "https://gedcom.io/community/"
diff --git a/extracted-files/tags/record-INDI b/extracted-files/tags/record-INDI
index a28f370f..7de336be 100644
--- a/extracted-files/tags/record-INDI
+++ b/extracted-files/tags/record-INDI
@@ -134,9 +134,6 @@ substructures:
 
 superstructures: {}
 
-subsumes:
-  - "https://gedcom.io/terms/v7/record-INDI"
-
 prerelease: true
 
 contact: "https://gedcom.io/community/"
diff --git a/extracted-files/tags/record-OBJE b/extracted-files/tags/record-OBJE
index c75fc04f..169d69f8 100644
--- a/extracted-files/tags/record-OBJE
+++ b/extracted-files/tags/record-OBJE
@@ -45,9 +45,6 @@ substructures:
 
 superstructures: {}
 
-subsumes:
-  - "https://gedcom.io/terms/v7/record-OBJE"
-
 prerelease: true
 
 contact: "https://gedcom.io/community/"
diff --git a/extracted-files/tags/record-REPO b/extracted-files/tags/record-REPO
index 9074477a..d05560f5 100644
--- a/extracted-files/tags/record-REPO
+++ b/extracted-files/tags/record-REPO
@@ -47,9 +47,6 @@ substructures:
 
 superstructures: {}
 
-subsumes:
-  - "https://gedcom.io/terms/v7/record-REPO"
-
 prerelease: true
 
 contact: "https://gedcom.io/community/"
diff --git a/extracted-files/tags/record-SNOTE b/extracted-files/tags/record-SNOTE
index 285ec8d0..451a956a 100644
--- a/extracted-files/tags/record-SNOTE
+++ b/extracted-files/tags/record-SNOTE
@@ -62,6 +62,7 @@ payload: http://www.w3.org/2001/XMLSchema#string
 
 substructures:
   "https://gedcom.io/terms/v7.1/CHAN": "{0:1}"
+  "https://gedcom.io/terms/v7.1/NOTE-KIND": "{0:M}"
   "https://gedcom.io/terms/v7.1/SOUR": "{0:M}"
   "https://gedcom.io/terms/v7/CREA": "{0:1}"
   "https://gedcom.io/terms/v7/EXID": "{0:M}"
@@ -74,9 +75,6 @@ substructures:
 
 superstructures: {}
 
-subsumes:
-  - "https://gedcom.io/terms/v7/record-SNOTE"
-
 prerelease: true
 
 contact: "https://gedcom.io/community/"
diff --git a/extracted-files/tags/record-SOUR b/extracted-files/tags/record-SOUR
index e4e41389..8b7ec6be 100644
--- a/extracted-files/tags/record-SOUR
+++ b/extracted-files/tags/record-SOUR
@@ -58,9 +58,6 @@ substructures:
 
 superstructures: {}
 
-subsumes:
-  - "https://gedcom.io/terms/v7/record-SOUR"
-
 prerelease: true
 
 contact: "https://gedcom.io/community/"
diff --git a/extracted-files/tags/record-SUBM b/extracted-files/tags/record-SUBM
index bd6e9624..c569fe5d 100644
--- a/extracted-files/tags/record-SUBM
+++ b/extracted-files/tags/record-SUBM
@@ -41,9 +41,6 @@ substructures:
 
 superstructures: {}
 
-subsumes:
-  - "https://gedcom.io/terms/v7/record-SUBM"
-
 prerelease: true
 
 contact: "https://gedcom.io/community/"