Refactor Translator and dictionary entry format (#1553)

* Update test data

* Move translator.js

* Create new version of Translator

* Update Backend

* Update DictionaryDataUtil

* Update DisplayGenerator

* Create AnkiNoteDataCreator

* Replace AnkiNoteData with AnkiNoteDataCreator

* Update tests

* Remove AnkiNoteData

* Update test data

* Remove translator-old.js

* Add TypeScript interface definitions for the new translator data format

1 files changed, 7404 insertions, 18916 deletions

diff --git a/test/data/translator-test-results.json b/test/data/translator-test-results.json
index 5fb72a75..597926fb 100644
--- a/test/data/translator-test-results.json
+++ b/test/data/translator-test-results.json
@@ -1,7 +1,7 @@
 [
   {
     "name": "Basic kanji test 1",
-    "definitions": [
+    "dictionaryEntries": [
       {
         "type": "kanji",
         "character": "打",
@@ -15,30 +15,31 @@
           "う.ち-",
           "ぶ.つ"
         ],
-        "glossary": [
-          "meaning1",
-          "meaning2",
-          "meaning3",
-          "meaning4",
-          "meaning5"
-        ],
         "tags": [
           {
             "name": "ktag1",
             "category": "kcategory1",
-            "notes": "ktag1 notes",
             "order": 0,
             "score": 0,
-            "dictionary": "Test Dictionary 2",
+            "content": [
+              "ktag1 notes"
+            ],
+            "dictionaries": [
+              "Test Dictionary 2"
+            ],
             "redundant": false
           },
           {
             "name": "ktag2",
             "category": "kcategory2",
-            "notes": "ktag2 notes",
             "order": 0,
             "score": 0,
-            "dictionary": "Test Dictionary 2",
+            "content": [
+              "ktag2 notes"
+            ],
+            "dictionaries": [
+              "Test Dictionary 2"
+            ],
             "redundant": false
           }
         ],
@@ -47,7 +48,7 @@
             {
               "name": "kstat1",
               "category": "kcategory3",
-              "notes": "kstat1 notes",
+              "content": "kstat1 notes",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
@@ -58,7 +59,7 @@
             {
               "name": "kstat2",
               "category": "kcategory4",
-              "notes": "kstat2 notes",
+              "content": "kstat2 notes",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
@@ -69,7 +70,7 @@
             {
               "name": "kstat3",
               "category": "kcategory5",
-              "notes": "kstat3 notes",
+              "content": "kstat3 notes",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
@@ -80,7 +81,7 @@
             {
               "name": "kstat4",
               "category": "kcategory6",
-              "notes": "kstat4 notes",
+              "content": "kstat4 notes",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
@@ -91,7 +92,7 @@
             {
               "name": "kstat5",
               "category": "kcategory7",
-              "notes": "kstat5 notes",
+              "content": "kstat5 notes",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
@@ -99,14 +100,19 @@
             }
           ]
         },
+        "definitions": [
+          "meaning1",
+          "meaning2",
+          "meaning3",
+          "meaning4",
+          "meaning5"
+        ],
         "frequencies": [
           {
             "index": 0,
             "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
+            "dictionaryIndex": 0,
+            "dictionaryPriority": 0,
             "character": "打",
             "frequency": 1
           }
@@ -116,7 +122,7 @@
   },
   {
     "name": "Basic kanji test 2",
-    "definitions": [
+    "dictionaryEntries": [
       {
         "type": "kanji",
         "character": "込",
@@ -129,30 +135,31 @@
           "-こ.み",
           "こ.める"
         ],
-        "glossary": [
-          "meaning1",
-          "meaning2",
-          "meaning3",
-          "meaning4",
-          "meaning5"
-        ],
         "tags": [
           {
             "name": "ktag1",
             "category": "kcategory1",
-            "notes": "ktag1 notes",
             "order": 0,
             "score": 0,
-            "dictionary": "Test Dictionary 2",
+            "content": [
+              "ktag1 notes"
+            ],
+            "dictionaries": [
+              "Test Dictionary 2"
+            ],
             "redundant": false
           },
           {
             "name": "ktag2",
             "category": "kcategory2",
-            "notes": "ktag2 notes",
             "order": 0,
             "score": 0,
-            "dictionary": "Test Dictionary 2",
+            "content": [
+              "ktag2 notes"
+            ],
+            "dictionaries": [
+              "Test Dictionary 2"
+            ],
             "redundant": false
           }
         ],
@@ -161,7 +168,7 @@
             {
               "name": "kstat1",
               "category": "kcategory3",
-              "notes": "kstat1 notes",
+              "content": "kstat1 notes",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
@@ -172,7 +179,7 @@
             {
               "name": "kstat2",
               "category": "kcategory4",
-              "notes": "kstat2 notes",
+              "content": "kstat2 notes",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
@@ -183,7 +190,7 @@
             {
               "name": "kstat3",
               "category": "kcategory5",
-              "notes": "kstat3 notes",
+              "content": "kstat3 notes",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
@@ -194,7 +201,7 @@
             {
               "name": "kstat4",
               "category": "kcategory6",
-              "notes": "kstat4 notes",
+              "content": "kstat4 notes",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
@@ -205,7 +212,7 @@
             {
               "name": "kstat5",
               "category": "kcategory7",
-              "notes": "kstat5 notes",
+              "content": "kstat5 notes",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
@@ -213,14 +220,19 @@
             }
           ]
         },
+        "definitions": [
+          "meaning1",
+          "meaning2",
+          "meaning3",
+          "meaning4",
+          "meaning5"
+        ],
         "frequencies": [
           {
             "index": 0,
             "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
+            "dictionaryIndex": 0,
+            "dictionaryPriority": 0,
             "character": "込",
             "frequency": 2
           }
@@ -230,12034 +242,6406 @@
   },
   {
     "name": "Missing kanji test",
-    "definitions": []
+    "dictionaryEntries": []
   },
   {
     "name": "Find term using expression text 1",
-    "length": 1,
-    "definitions": [
+    "originalTextLength": 1,
+    "dictionaryEntries": [
       {
         "type": "term",
         "id": 1,
-        "source": "打",
-        "rawSource": "打",
-        "sourceTerm": "打",
-        "reasons": [],
-        "score": 1,
         "isPrimary": true,
         "sequence": 1,
-        "dictionary": "Test Dictionary 2",
-        "dictionaryOrder": {
-          "index": 0,
-          "priority": 0
-        },
-        "dictionaryNames": [
-          "Test Dictionary 2"
-        ],
-        "expression": "打",
-        "reading": "だ",
-        "expressions": [
+        "inflections": [],
+        "score": 1,
+        "dictionaryIndex": 0,
+        "dictionaryPriority": 0,
+        "sourceTermExactMatchCount": 1,
+        "maxDeinflectedTextLength": 1,
+        "headwords": [
           {
-            "sourceTerm": "打",
-            "expression": "打",
+            "index": 0,
+            "term": "打",
             "reading": "だ",
-            "termTags": [
+            "sources": [
+              {
+                "originalText": "打",
+                "transformedText": "打",
+                "deinflectedText": "打",
+                "isPrimary": true
+              }
+            ],
+            "tags": [
               {
                 "name": "tag3",
                 "category": "category3",
-                "notes": "tag3 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag3 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag4",
                 "category": "category4",
-                "notes": "tag4 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag4 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag5",
                 "category": "category5",
-                "notes": "tag5 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag5 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               }
+            ]
+          }
+        ],
+        "definitions": [
+          {
+            "index": 0,
+            "headwordIndices": [
+              0
             ],
-            "frequencies": [
+            "dictionary": "Test Dictionary 2",
+            "tags": [
               {
-                "index": 0,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打",
-                "reading": "だ",
-                "hasReading": false,
-                "frequency": 1
+                "name": "tag1",
+                "category": "category1",
+                "order": 0,
+                "score": 0,
+                "content": [
+                  "tag1 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
+                "redundant": false
               },
               {
-                "index": 1,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打",
-                "reading": "だ",
-                "hasReading": true,
-                "frequency": 4
+                "name": "tag2",
+                "category": "category2",
+                "order": 0,
+                "score": 0,
+                "content": [
+                  "tag2 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
+                "redundant": false
               }
             ],
-            "pitches": []
-          }
-        ],
-        "glossary": [
-          "definition1",
-          "definition2"
-        ],
-        "definitionTags": [
-          {
-            "name": "tag1",
-            "category": "category1",
-            "notes": "tag1 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag2",
-            "category": "category2",
-            "notes": "tag2 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          }
-        ],
-        "termTags": [
-          {
-            "name": "tag3",
-            "category": "category3",
-            "notes": "tag3 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag4",
-            "category": "category4",
-            "notes": "tag4 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag5",
-            "category": "category5",
-            "notes": "tag5 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
+            "entries": [
+              "definition1",
+              "definition2"
+            ]
           }
         ],
+        "pronunciations": [],
         "frequencies": [
           {
             "index": 0,
-            "expressionIndex": 0,
+            "headwordIndex": 0,
             "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "expression": "打",
-            "reading": "だ",
+            "dictionaryIndex": 0,
+            "dictionaryPriority": 0,
             "hasReading": false,
             "frequency": 1
           },
           {
             "index": 1,
-            "expressionIndex": 0,
+            "headwordIndex": 0,
             "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "expression": "打",
-            "reading": "だ",
+            "dictionaryIndex": 0,
+            "dictionaryPriority": 0,
             "hasReading": true,
             "frequency": 4
           }
-        ],
-        "pitches": [],
-        "sourceTermExactMatchCount": 1
+        ]
       },
       {
         "type": "term",
         "id": 2,
-        "source": "打",
-        "rawSource": "打",
-        "sourceTerm": "打",
-        "reasons": [],
-        "score": 1,
         "isPrimary": true,
         "sequence": 2,
-        "dictionary": "Test Dictionary 2",
-        "dictionaryOrder": {
-          "index": 0,
-          "priority": 0
-        },
-        "dictionaryNames": [
-          "Test Dictionary 2"
-        ],
-        "expression": "打",
-        "reading": "ダース",
-        "expressions": [
+        "inflections": [],
+        "score": 1,
+        "dictionaryIndex": 0,
+        "dictionaryPriority": 0,
+        "sourceTermExactMatchCount": 1,
+        "maxDeinflectedTextLength": 1,
+        "headwords": [
           {
-            "sourceTerm": "打",
-            "expression": "打",
+            "index": 0,
+            "term": "打",
             "reading": "ダース",
-            "termTags": [
+            "sources": [
+              {
+                "originalText": "打",
+                "transformedText": "打",
+                "deinflectedText": "打",
+                "isPrimary": true
+              }
+            ],
+            "tags": [
               {
                 "name": "tag3",
                 "category": "category3",
-                "notes": "tag3 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag3 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag4",
                 "category": "category4",
-                "notes": "tag4 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag4 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag5",
                 "category": "category5",
-                "notes": "tag5 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag5 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               }
+            ]
+          }
+        ],
+        "definitions": [
+          {
+            "index": 0,
+            "headwordIndices": [
+              0
             ],
-            "frequencies": [
+            "dictionary": "Test Dictionary 2",
+            "tags": [
               {
-                "index": 0,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打",
-                "reading": "ダース",
-                "hasReading": false,
-                "frequency": 1
+                "name": "tag1",
+                "category": "category1",
+                "order": 0,
+                "score": 0,
+                "content": [
+                  "tag1 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
+                "redundant": false
               },
               {
-                "index": 1,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打",
-                "reading": "ダース",
-                "hasReading": true,
-                "frequency": 5
+                "name": "tag2",
+                "category": "category2",
+                "order": 0,
+                "score": 0,
+                "content": [
+                  "tag2 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
+                "redundant": false
               }
             ],
-            "pitches": []
-          }
-        ],
-        "glossary": [
-          "definition3",
-          "definition4"
-        ],
-        "definitionTags": [
-          {
-            "name": "tag1",
-            "category": "category1",
-            "notes": "tag1 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag2",
-            "category": "category2",
-            "notes": "tag2 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          }
-        ],
-        "termTags": [
-          {
-            "name": "tag3",
-            "category": "category3",
-            "notes": "tag3 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag4",
-            "category": "category4",
-            "notes": "tag4 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag5",
-            "category": "category5",
-            "notes": "tag5 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
+            "entries": [
+              "definition3",
+              "definition4"
+            ]
           }
         ],
+        "pronunciations": [],
         "frequencies": [
           {
             "index": 0,
-            "expressionIndex": 0,
+            "headwordIndex": 0,
             "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "expression": "打",
-            "reading": "ダース",
+            "dictionaryIndex": 0,
+            "dictionaryPriority": 0,
             "hasReading": false,
             "frequency": 1
           },
           {
             "index": 1,
-            "expressionIndex": 0,
+            "headwordIndex": 0,
             "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "expression": "打",
-            "reading": "ダース",
+            "dictionaryIndex": 0,
+            "dictionaryPriority": 0,
             "hasReading": true,
             "frequency": 5
           }
-        ],
-        "pitches": [],
-        "sourceTermExactMatchCount": 1
+        ]
       }
     ]
   },
   {
     "name": "Find term using expression text 2",
-    "length": 2,
-    "definitions": [
+    "originalTextLength": 2,
+    "dictionaryEntries": [
       {
         "type": "term",
         "id": 3,
-        "source": "打つ",
-        "rawSource": "打つ",
-        "sourceTerm": "打つ",
-        "reasons": [],
-        "score": 10,
         "isPrimary": true,
         "sequence": 3,
-        "dictionary": "Test Dictionary 2",
-        "dictionaryOrder": {
-          "index": 0,
-          "priority": 0
-        },
-        "dictionaryNames": [
-          "Test Dictionary 2"
-        ],
-        "expression": "打つ",
-        "reading": "うつ",
-        "expressions": [
+        "inflections": [],
+        "score": 10,
+        "dictionaryIndex": 0,
+        "dictionaryPriority": 0,
+        "sourceTermExactMatchCount": 1,
+        "maxDeinflectedTextLength": 2,
+        "headwords": [
           {
-            "sourceTerm": "打つ",
-            "expression": "打つ",
+            "index": 0,
+            "term": "打つ",
             "reading": "うつ",
-            "termTags": [
+            "sources": [
+              {
+                "originalText": "打つ",
+                "transformedText": "打つ",
+                "deinflectedText": "打つ",
+                "isPrimary": true
+              }
+            ],
+            "tags": [
               {
                 "name": "tag3",
                 "category": "category3",
-                "notes": "tag3 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag3 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag4",
                 "category": "category4",
-                "notes": "tag4 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag4 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag5",
                 "category": "category5",
-                "notes": "tag5 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag5 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               }
+            ]
+          }
+        ],
+        "definitions": [
+          {
+            "index": 0,
+            "headwordIndices": [
+              0
             ],
-            "frequencies": [
+            "dictionary": "Test Dictionary 2",
+            "tags": [
               {
-                "index": 0,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打つ",
-                "reading": "うつ",
-                "hasReading": false,
-                "frequency": 2
+                "name": "tag1",
+                "category": "category1",
+                "order": 0,
+                "score": 0,
+                "content": [
+                  "tag1 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
+                "redundant": false
               },
               {
-                "index": 1,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打つ",
-                "reading": "うつ",
-                "hasReading": true,
-                "frequency": 6
+                "name": "tag2",
+                "category": "category2",
+                "order": 0,
+                "score": 0,
+                "content": [
+                  "tag2 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
+                "redundant": false
               }
             ],
-            "pitches": []
-          }
-        ],
-        "glossary": [
-          "definition5",
-          "definition6"
-        ],
-        "definitionTags": [
-          {
-            "name": "tag1",
-            "category": "category1",
-            "notes": "tag1 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag2",
-            "category": "category2",
-            "notes": "tag2 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          }
-        ],
-        "termTags": [
-          {
-            "name": "tag3",
-            "category": "category3",
-            "notes": "tag3 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag4",
-            "category": "category4",
-            "notes": "tag4 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag5",
-            "category": "category5",
-            "notes": "tag5 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
+            "entries": [
+              "definition5",
+              "definition6"
+            ]
           }
         ],
+        "pronunciations": [],
         "frequencies": [
           {
             "index": 0,
-            "expressionIndex": 0,
+            "headwordIndex": 0,
             "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "expression": "打つ",
-            "reading": "うつ",
+            "dictionaryIndex": 0,
+            "dictionaryPriority": 0,
             "hasReading": false,
             "frequency": 2
           },
           {
             "index": 1,
-            "expressionIndex": 0,
+            "headwordIndex": 0,
             "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "expression": "打つ",
-            "reading": "うつ",
+            "dictionaryIndex": 0,
+            "dictionaryPriority": 0,
             "hasReading": true,
             "frequency": 6
           }
-        ],
-        "pitches": [],
-        "sourceTermExactMatchCount": 1
+        ]
       },
       {
         "type": "term",
         "id": 5,
-        "source": "打つ",
-        "rawSource": "打つ",
-        "sourceTerm": "打つ",
-        "reasons": [],
-        "score": 10,
         "isPrimary": true,
         "sequence": 3,
-        "dictionary": "Test Dictionary 2",
-        "dictionaryOrder": {
-          "index": 0,
-          "priority": 0
-        },
-        "dictionaryNames": [
-          "Test Dictionary 2"
-        ],
-        "expression": "打つ",
-        "reading": "ぶつ",
-        "expressions": [
+        "inflections": [],
+        "score": 10,
+        "dictionaryIndex": 0,
+        "dictionaryPriority": 0,
+        "sourceTermExactMatchCount": 1,
+        "maxDeinflectedTextLength": 2,
+        "headwords": [
           {
-            "sourceTerm": "打つ",
-            "expression": "打つ",
+            "index": 0,
+            "term": "打つ",
             "reading": "ぶつ",
-            "termTags": [
+            "sources": [
+              {
+                "originalText": "打つ",
+                "transformedText": "打つ",
+                "deinflectedText": "打つ",
+                "isPrimary": true
+              }
+            ],
+            "tags": [
               {
                 "name": "tag3",
                 "category": "category3",
-                "notes": "tag3 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag3 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag4",
                 "category": "category4",
-                "notes": "tag4 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag4 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag5",
                 "category": "category5",
-                "notes": "tag5 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag5 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               }
+            ]
+          }
+        ],
+        "definitions": [
+          {
+            "index": 0,
+            "headwordIndices": [
+              0
             ],
-            "frequencies": [
+            "dictionary": "Test Dictionary 2",
+            "tags": [
               {
-                "index": 0,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打つ",
-                "reading": "ぶつ",
-                "hasReading": false,
-                "frequency": 2
+                "name": "tag1",
+                "category": "category1",
+                "order": 0,
+                "score": 0,
+                "content": [
+                  "tag1 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
+                "redundant": false
               },
               {
-                "index": 1,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打つ",
-                "reading": "ぶつ",
-                "hasReading": true,
-                "frequency": 7
+                "name": "tag2",
+                "category": "category2",
+                "order": 0,
+                "score": 0,
+                "content": [
+                  "tag2 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
+                "redundant": false
               }
             ],
-            "pitches": []
-          }
-        ],
-        "glossary": [
-          "definition9",
-          "definition10"
-        ],
-        "definitionTags": [
-          {
-            "name": "tag1",
-            "category": "category1",
-            "notes": "tag1 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag2",
-            "category": "category2",
-            "notes": "tag2 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          }
-        ],
-        "termTags": [
-          {
-            "name": "tag3",
-            "category": "category3",
-            "notes": "tag3 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag4",
-            "category": "category4",
-            "notes": "tag4 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag5",
-            "category": "category5",
-            "notes": "tag5 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
+            "entries": [
+              "definition9",
+              "definition10"
+            ]
           }
         ],
+        "pronunciations": [],
         "frequencies": [
           {
             "index": 0,
-            "expressionIndex": 0,
+            "headwordIndex": 0,
             "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "expression": "打つ",
-            "reading": "ぶつ",
+            "dictionaryIndex": 0,
+            "dictionaryPriority": 0,
             "hasReading": false,
             "frequency": 2
           },
           {
             "index": 1,
-            "expressionIndex": 0,
+            "headwordIndex": 0,
             "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "expression": "打つ",
-            "reading": "ぶつ",
+            "dictionaryIndex": 0,
+            "dictionaryPriority": 0,
             "hasReading": true,
             "frequency": 7
           }
-        ],
-        "pitches": [],
-        "sourceTermExactMatchCount": 1
+        ]
       },
       {
         "type": "term",
         "id": 4,
-        "source": "打つ",
-        "rawSource": "打つ",
-        "sourceTerm": "打つ",
-        "reasons": [],
-        "score": 1,
         "isPrimary": true,
         "sequence": 3,
-        "dictionary": "Test Dictionary 2",
-        "dictionaryOrder": {
-          "index": 0,
-          "priority": 0
-        },
-        "dictionaryNames": [
-          "Test Dictionary 2"
-        ],
-        "expression": "打つ",
-        "reading": "うつ",
-        "expressions": [
+        "inflections": [],
+        "score": 1,
+        "dictionaryIndex": 0,
+        "dictionaryPriority": 0,
+        "sourceTermExactMatchCount": 1,
+        "maxDeinflectedTextLength": 2,
+        "headwords": [
           {
-            "sourceTerm": "打つ",
-            "expression": "打つ",
+            "index": 0,
+            "term": "打つ",
             "reading": "うつ",
-            "termTags": [
+            "sources": [
+              {
+                "originalText": "打つ",
+                "transformedText": "打つ",
+                "deinflectedText": "打つ",
+                "isPrimary": true
+              }
+            ],
+            "tags": [
               {
                 "name": "tag3",
                 "category": "category3",
-                "notes": "tag3 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag3 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag4",
                 "category": "category4",
-                "notes": "tag4 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag4 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag5",
                 "category": "category5",
-                "notes": "tag5 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag5 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               }
+            ]
+          }
+        ],
+        "definitions": [
+          {
+            "index": 0,
+            "headwordIndices": [
+              0
             ],
-            "frequencies": [
+            "dictionary": "Test Dictionary 2",
+            "tags": [
               {
-                "index": 0,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打つ",
-                "reading": "うつ",
-                "hasReading": false,
-                "frequency": 2
+                "name": "tag1",
+                "category": "category1",
+                "order": 0,
+                "score": 0,
+                "content": [
+                  "tag1 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
+                "redundant": false
               },
               {
-                "index": 1,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打つ",
-                "reading": "うつ",
-                "hasReading": true,
-                "frequency": 6
+                "name": "tag2",
+                "category": "category2",
+                "order": 0,
+                "score": 0,
+                "content": [
+                  "tag2 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
+                "redundant": false
               }
             ],
-            "pitches": []
-          }
-        ],
-        "glossary": [
-          "definition7",
-          "definition8"
-        ],
-        "definitionTags": [
-          {
-            "name": "tag1",
-            "category": "category1",
-            "notes": "tag1 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag2",
-            "category": "category2",
-            "notes": "tag2 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          }
-        ],
-        "termTags": [
-          {
-            "name": "tag3",
-            "category": "category3",
-            "notes": "tag3 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag4",
-            "category": "category4",
-            "notes": "tag4 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag5",
-            "category": "category5",
-            "notes": "tag5 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
+            "entries": [
+              "definition7",
+              "definition8"
+            ]
           }
         ],
+        "pronunciations": [],
         "frequencies": [
           {
             "index": 0,
-            "expressionIndex": 0,
+            "headwordIndex": 0,
             "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "expression": "打つ",
-            "reading": "うつ",
+            "dictionaryIndex": 0,
+            "dictionaryPriority": 0,
             "hasReading": false,
             "frequency": 2
           },
           {
             "index": 1,
-            "expressionIndex": 0,
+            "headwordIndex": 0,
             "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "expression": "打つ",
-            "reading": "うつ",
+            "dictionaryIndex": 0,
+            "dictionaryPriority": 0,
             "hasReading": true,
             "frequency": 6
           }
-        ],
-        "pitches": [],
-        "sourceTermExactMatchCount": 1
+        ]
       },
       {
         "type": "term",
         "id": 6,
-        "source": "打つ",
-        "rawSource": "打つ",
-        "sourceTerm": "打つ",
-        "reasons": [],
-        "score": 1,
         "isPrimary": true,
         "sequence": 3,
-        "dictionary": "Test Dictionary 2",
-        "dictionaryOrder": {
-          "index": 0,
-          "priority": 0
-        },
-        "dictionaryNames": [
-          "Test Dictionary 2"
-        ],
-        "expression": "打つ",
-        "reading": "ぶつ",
-        "expressions": [
+        "inflections": [],
+        "score": 1,
+        "dictionaryIndex": 0,
+        "dictionaryPriority": 0,
+        "sourceTermExactMatchCount": 1,
+        "maxDeinflectedTextLength": 2,
+        "headwords": [
           {
-            "sourceTerm": "打つ",
-            "expression": "打つ",
+            "index": 0,
+            "term": "打つ",
             "reading": "ぶつ",
-            "termTags": [
+            "sources": [
+              {
+                "originalText": "打つ",
+                "transformedText": "打つ",
+                "deinflectedText": "打つ",
+                "isPrimary": true
+              }
+            ],
+            "tags": [
               {
                 "name": "tag3",
                 "category": "category3",
-                "notes": "tag3 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag3 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag4",
                 "category": "category4",
-                "notes": "tag4 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag4 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag5",
                 "category": "category5",
-                "notes": "tag5 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag5 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               }
+            ]
+          }
+        ],
+        "definitions": [
+          {
+            "index": 0,
+            "headwordIndices": [
+              0
             ],
-            "frequencies": [
+            "dictionary": "Test Dictionary 2",
+            "tags": [
               {
-                "index": 0,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打つ",
-                "reading": "ぶつ",
-                "hasReading": false,
-                "frequency": 2
+                "name": "tag1",
+                "category": "category1",
+                "order": 0,
+                "score": 0,
+                "content": [
+                  "tag1 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
+                "redundant": false
               },
               {
-                "index": 1,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打つ",
-                "reading": "ぶつ",
-                "hasReading": true,
-                "frequency": 7
+                "name": "tag2",
+                "category": "category2",
+                "order": 0,
+                "score": 0,
+                "content": [
+                  "tag2 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
+                "redundant": false
               }
             ],
-            "pitches": []
-          }
-        ],
-        "glossary": [
-          "definition11",
-          "definition12"
-        ],
-        "definitionTags": [
-          {
-            "name": "tag1",
-            "category": "category1",
-            "notes": "tag1 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag2",
-            "category": "category2",
-            "notes": "tag2 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          }
-        ],
-        "termTags": [
-          {
-            "name": "tag3",
-            "category": "category3",
-            "notes": "tag3 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag4",
-            "category": "category4",
-            "notes": "tag4 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag5",
-            "category": "category5",
-            "notes": "tag5 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
+            "entries": [
+              "definition11",
+              "definition12"
+            ]
           }
         ],
+        "pronunciations": [],
         "frequencies": [
           {
             "index": 0,
-            "expressionIndex": 0,
+            "headwordIndex": 0,
             "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "expression": "打つ",
-            "reading": "ぶつ",
+            "dictionaryIndex": 0,
+            "dictionaryPriority": 0,
             "hasReading": false,
             "frequency": 2
           },
           {
             "index": 1,
-            "expressionIndex": 0,
+            "headwordIndex": 0,
             "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "expression": "打つ",
-            "reading": "ぶつ",
+            "dictionaryIndex": 0,
+            "dictionaryPriority": 0,
             "hasReading": true,
             "frequency": 7
           }
-        ],
-        "pitches": [],
-        "sourceTermExactMatchCount": 1
+        ]
       },
       {
         "type": "term",
         "id": 1,
-        "source": "打",
-        "rawSource": "打",
-        "sourceTerm": "打",
-        "reasons": [],
-        "score": 1,
         "isPrimary": true,
         "sequence": 1,
-        "dictionary": "Test Dictionary 2",
-        "dictionaryOrder": {
-          "index": 0,
-          "priority": 0
-        },
-        "dictionaryNames": [
-          "Test Dictionary 2"
-        ],
-        "expression": "打",
-        "reading": "だ",
-        "expressions": [
+        "inflections": [],
+        "score": 1,
+        "dictionaryIndex": 0,
+        "dictionaryPriority": 0,
+        "sourceTermExactMatchCount": 1,
+        "maxDeinflectedTextLength": 1,
+        "headwords": [
           {
-            "sourceTerm": "打",
-            "expression": "打",
+            "index": 0,
+            "term": "打",
             "reading": "だ",
-            "termTags": [
+            "sources": [
+              {
+                "originalText": "打",
+                "transformedText": "打",
+                "deinflectedText": "打",
+                "isPrimary": true
+              }
+            ],
+            "tags": [
               {
                 "name": "tag3",
                 "category": "category3",
-                "notes": "tag3 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag3 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag4",
                 "category": "category4",
-                "notes": "tag4 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag4 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag5",
                 "category": "category5",
-                "notes": "tag5 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag5 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               }
+            ]
+          }
+        ],
+        "definitions": [
+          {
+            "index": 0,
+            "headwordIndices": [
+              0
             ],
-            "frequencies": [
+            "dictionary": "Test Dictionary 2",
+            "tags": [
               {
-                "index": 0,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打",
-                "reading": "だ",
-                "hasReading": false,
-                "frequency": 1
+                "name": "tag1",
+                "category": "category1",
+                "order": 0,
+                "score": 0,
+                "content": [
+                  "tag1 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
+                "redundant": false
               },
               {
-                "index": 1,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打",
-                "reading": "だ",
-                "hasReading": true,
-                "frequency": 4
+                "name": "tag2",
+                "category": "category2",
+                "order": 0,
+                "score": 0,
+                "content": [
+                  "tag2 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
+                "redundant": false
               }
             ],
-            "pitches": []
-          }
-        ],
-        "glossary": [
-          "definition1",
-          "definition2"
-        ],
-        "definitionTags": [
-          {
-            "name": "tag1",
-            "category": "category1",
-            "notes": "tag1 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag2",
-            "category": "category2",
-            "notes": "tag2 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          }
-        ],
-        "termTags": [
-          {
-            "name": "tag3",
-            "category": "category3",
-            "notes": "tag3 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag4",
-            "category": "category4",
-            "notes": "tag4 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag5",
-            "category": "category5",
-            "notes": "tag5 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
+            "entries": [
+              "definition1",
+              "definition2"
+            ]
           }
         ],
+        "pronunciations": [],
         "frequencies": [
           {
             "index": 0,
-            "expressionIndex": 0,
+            "headwordIndex": 0,
             "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "expression": "打",
-            "reading": "だ",
+            "dictionaryIndex": 0,
+            "dictionaryPriority": 0,
             "hasReading": false,
             "frequency": 1
           },
           {
             "index": 1,
-            "expressionIndex": 0,
+            "headwordIndex": 0,
             "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "expression": "打",
-            "reading": "だ",
+            "dictionaryIndex": 0,
+            "dictionaryPriority": 0,
             "hasReading": true,
             "frequency": 4
           }
-        ],
-        "pitches": [],
-        "sourceTermExactMatchCount": 1
+        ]
       },
       {
         "type": "term",
         "id": 2,
-        "source": "打",
-        "rawSource": "打",
-        "sourceTerm": "打",
-        "reasons": [],
-        "score": 1,
         "isPrimary": true,
         "sequence": 2,
-        "dictionary": "Test Dictionary 2",
-        "dictionaryOrder": {
-          "index": 0,
-          "priority": 0
-        },
-        "dictionaryNames": [
-          "Test Dictionary 2"
-        ],
-        "expression": "打",
-        "reading": "ダース",
-        "expressions": [
+        "inflections": [],
+        "score": 1,
+        "dictionaryIndex": 0,
+        "dictionaryPriority": 0,
+        "sourceTermExactMatchCount": 1,
+        "maxDeinflectedTextLength": 1,
+        "headwords": [
           {
-            "sourceTerm": "打",
-            "expression": "打",
+            "index": 0,
+            "term": "打",
             "reading": "ダース",
-            "termTags": [
+            "sources": [
+              {
+                "originalText": "打",
+                "transformedText": "打",
+                "deinflectedText": "打",
+                "isPrimary": true
+              }
+            ],
+            "tags": [
               {
                 "name": "tag3",
                 "category": "category3",
-                "notes": "tag3 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag3 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag4",
                 "category": "category4",
-                "notes": "tag4 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag4 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag5",
                 "category": "category5",
-                "notes": "tag5 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag5 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               }
+            ]
+          }
+        ],
+        "definitions": [
+          {
+            "index": 0,
+            "headwordIndices": [
+              0
             ],
-            "frequencies": [
+            "dictionary": "Test Dictionary 2",
+            "tags": [
               {
-                "index": 0,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打",
-                "reading": "ダース",
-                "hasReading": false,
-                "frequency": 1
+                "name": "tag1",
+                "category": "category1",
+                "order": 0,
+                "score": 0,
+                "content": [
+                  "tag1 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
+                "redundant": false
               },
               {
-                "index": 1,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打",
-                "reading": "ダース",
-                "hasReading": true,
-                "frequency": 5
+                "name": "tag2",
+                "category": "category2",
+                "order": 0,
+                "score": 0,
+                "content": [
+                  "tag2 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
+                "redundant": false
               }
             ],
-            "pitches": []
-          }
-        ],
-        "glossary": [
-          "definition3",
-          "definition4"
-        ],
-        "definitionTags": [
-          {
-            "name": "tag1",
-            "category": "category1",
-            "notes": "tag1 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag2",
-            "category": "category2",
-            "notes": "tag2 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          }
-        ],
-        "termTags": [
-          {
-            "name": "tag3",
-            "category": "category3",
-            "notes": "tag3 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag4",
-            "category": "category4",
-            "notes": "tag4 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag5",
-            "category": "category5",
-            "notes": "tag5 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
+            "entries": [
+              "definition3",
+              "definition4"
+            ]
           }
         ],
+        "pronunciations": [],
         "frequencies": [
           {
             "index": 0,
-            "expressionIndex": 0,
+            "headwordIndex": 0,
             "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "expression": "打",
-            "reading": "ダース",
+            "dictionaryIndex": 0,
+            "dictionaryPriority": 0,
             "hasReading": false,
             "frequency": 1
           },
           {
             "index": 1,
-            "expressionIndex": 0,
+            "headwordIndex": 0,
             "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "expression": "打",
-            "reading": "ダース",
+            "dictionaryIndex": 0,
+            "dictionaryPriority": 0,
             "hasReading": true,
             "frequency": 5
           }
-        ],
-        "pitches": [],
-        "sourceTermExactMatchCount": 1
+        ]
       }
     ]
   },
   {
     "name": "Find term using expression text 3",
-    "length": 4,
-    "definitions": [
+    "originalTextLength": 4,
+    "dictionaryEntries": [
       {
         "type": "term",
         "id": 7,
-        "source": "打ち込む",
-        "rawSource": "打ち込む",
-        "sourceTerm": "打ち込む",
-        "reasons": [],
-        "score": 10,
         "isPrimary": true,
         "sequence": 4,
-        "dictionary": "Test Dictionary 2",
-        "dictionaryOrder": {
-          "index": 0,
-          "priority": 0
-        },
-        "dictionaryNames": [
-          "Test Dictionary 2"
-        ],
-        "expression": "打ち込む",
-        "reading": "うちこむ",
-        "expressions": [
+        "inflections": [],
+        "score": 10,
+        "dictionaryIndex": 0,
+        "dictionaryPriority": 0,
+        "sourceTermExactMatchCount": 1,
+        "maxDeinflectedTextLength": 4,
+        "headwords": [
           {
-            "sourceTerm": "打ち込む",
-            "expression": "打ち込む",
+            "index": 0,
+            "term": "打ち込む",
             "reading": "うちこむ",
-            "termTags": [
+            "sources": [
+              {
+                "originalText": "打ち込む",
+                "transformedText": "打ち込む",
+                "deinflectedText": "打ち込む",
+                "isPrimary": true
+              }
+            ],
+            "tags": [
               {
                 "name": "tag3",
                 "category": "category3",
-                "notes": "tag3 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag3 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag4",
                 "category": "category4",
-                "notes": "tag4 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag4 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag5",
                 "category": "category5",
-                "notes": "tag5 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag5 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               }
+            ]
+          }
+        ],
+        "definitions": [
+          {
+            "index": 0,
+            "headwordIndices": [
+              0
             ],
-            "frequencies": [
+            "dictionary": "Test Dictionary 2",
+            "tags": [
               {
-                "index": 0,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打ち込む",
-                "reading": "うちこむ",
-                "hasReading": false,
-                "frequency": 3
+                "name": "tag1",
+                "category": "category1",
+                "order": 0,
+                "score": 0,
+                "content": [
+                  "tag1 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
+                "redundant": false
               },
               {
-                "index": 1,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打ち込む",
-                "reading": "うちこむ",
-                "hasReading": true,
-                "frequency": 8
+                "name": "tag2",
+                "category": "category2",
+                "order": 0,
+                "score": 0,
+                "content": [
+                  "tag2 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
+                "redundant": false
               }
             ],
-            "pitches": [
-              {
-                "index": 0,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打ち込む",
-                "reading": "うちこむ",
-                "pitches": [
-                  {
-                    "position": 0,
-                    "tags": []
-                  },
-                  {
-                    "position": 3,
-                    "tags": []
-                  }
-                ]
-              }
+            "entries": [
+              "definition13",
+              "definition14"
             ]
           }
         ],
-        "glossary": [
-          "definition13",
-          "definition14"
-        ],
-        "definitionTags": [
+        "pronunciations": [
           {
-            "name": "tag1",
-            "category": "category1",
-            "notes": "tag1 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag2",
-            "category": "category2",
-            "notes": "tag2 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          }
-        ],
-        "termTags": [
-          {
-            "name": "tag3",
-            "category": "category3",
-            "notes": "tag3 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag4",
-            "category": "category4",
-            "notes": "tag4 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag5",
-            "category": "category5",
-            "notes": "tag5 notes",
-            "order": 0,
-            "score": 0,
+            "index": 0,
+            "headwordIndex": 0,
             "dictionary": "Test Dictionary 2",
-            "redundant": false
+            "dictionaryIndex": 0,
+            "dictionaryPriority": 0,
+            "pitches": [
+              {
+                "position": 0,
+                "tags": []
+              },
+              {
+                "position": 3,
+                "tags": []
+              }
+            ]
           }
         ],
         "frequencies": [
           {
             "index": 0,
-            "expressionIndex": 0,
+            "headwordIndex": 0,
             "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "expression": "打ち込む",
-            "reading": "うちこむ",
+            "dictionaryIndex": 0,
+            "dictionaryPriority": 0,
             "hasReading": false,
             "frequency": 3
           },
           {
             "index": 1,
-            "expressionIndex": 0,
+            "headwordIndex": 0,
             "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "expression": "打ち込む",
-            "reading": "うちこむ",
+            "dictionaryIndex": 0,
+            "dictionaryPriority": 0,
             "hasReading": true,
             "frequency": 8
           }
-        ],
-        "pitches": [
-          {
-            "index": 0,
-            "expressionIndex": 0,
-            "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "expression": "打ち込む",
-            "reading": "うちこむ",
-            "pitches": [
-              {
-                "position": 0,
-                "tags": []
-              },
-              {
-                "position": 3,
-                "tags": []
-              }
-            ]
-          }
-        ],
-        "sourceTermExactMatchCount": 1
+        ]
       },
       {
         "type": "term",
         "id": 9,
-        "source": "打ち込む",
-        "rawSource": "打ち込む",
-        "sourceTerm": "打ち込む",
-        "reasons": [],
-        "score": 10,
         "isPrimary": true,
         "sequence": 4,
-        "dictionary": "Test Dictionary 2",
-        "dictionaryOrder": {
-          "index": 0,
-          "priority": 0
-        },
-        "dictionaryNames": [
-          "Test Dictionary 2"
-        ],
-        "expression": "打ち込む",
-        "reading": "ぶちこむ",
-        "expressions": [
+        "inflections": [],
+        "score": 10,
+        "dictionaryIndex": 0,
+        "dictionaryPriority": 0,
+        "sourceTermExactMatchCount": 1,
+        "maxDeinflectedTextLength": 4,
+        "headwords": [
           {
-            "sourceTerm": "打ち込む",
-            "expression": "打ち込む",
+            "index": 0,
+            "term": "打ち込む",
             "reading": "ぶちこむ",
-            "termTags": [
+            "sources": [
+              {
+                "originalText": "打ち込む",
+                "transformedText": "打ち込む",
+                "deinflectedText": "打ち込む",
+                "isPrimary": true
+              }
+            ],
+            "tags": [
               {
                 "name": "tag3",
                 "category": "category3",
-                "notes": "tag3 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag3 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag4",
                 "category": "category4",
-                "notes": "tag4 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag4 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag5",
                 "category": "category5",
-                "notes": "tag5 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag5 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               }
+            ]
+          }
+        ],
+        "definitions": [
+          {
+            "index": 0,
+            "headwordIndices": [
+              0
             ],
-            "frequencies": [
+            "dictionary": "Test Dictionary 2",
+            "tags": [
               {
-                "index": 0,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打ち込む",
-                "reading": "ぶちこむ",
-                "hasReading": false,
-                "frequency": 3
+                "name": "tag1",
+                "category": "category1",
+                "order": 0,
+                "score": 0,
+                "content": [
+                  "tag1 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
+                "redundant": false
               },
               {
-                "index": 1,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打ち込む",
-                "reading": "ぶちこむ",
-                "hasReading": true,
-                "frequency": 9
+                "name": "tag2",
+                "category": "category2",
+                "order": 0,
+                "score": 0,
+                "content": [
+                  "tag2 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
+                "redundant": false
               }
             ],
-            "pitches": [
-              {
-                "index": 0,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打ち込む",
-                "reading": "ぶちこむ",
-                "pitches": [
-                  {
-                    "position": 0,
-                    "tags": []
-                  },
-                  {
-                    "position": 3,
-                    "tags": []
-                  }
-                ]
-              }
+            "entries": [
+              "definition17",
+              "definition18"
             ]
           }
         ],
-        "glossary": [
-          "definition17",
-          "definition18"
-        ],
-        "definitionTags": [
-          {
-            "name": "tag1",
-            "category": "category1",
-            "notes": "tag1 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag2",
-            "category": "category2",
-            "notes": "tag2 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          }
-        ],
-        "termTags": [
-          {
-            "name": "tag3",
-            "category": "category3",
-            "notes": "tag3 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
+        "pronunciations": [
           {
-            "name": "tag4",
-            "category": "category4",
-            "notes": "tag4 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag5",
-            "category": "category5",
-            "notes": "tag5 notes",
-            "order": 0,
-            "score": 0,
+            "index": 0,
+            "headwordIndex": 0,
             "dictionary": "Test Dictionary 2",
-            "redundant": false
+            "dictionaryIndex": 0,
+            "dictionaryPriority": 0,
+            "pitches": [
+              {
+                "position": 0,
+                "tags": []
+              },
+              {
+                "position": 3,
+                "tags": []
+              }
+            ]
           }
         ],
         "frequencies": [
           {
             "index": 0,
-            "expressionIndex": 0,
+            "headwordIndex": 0,
             "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "expression": "打ち込む",
-            "reading": "ぶちこむ",
+            "dictionaryIndex": 0,
+            "dictionaryPriority": 0,
             "hasReading": false,
             "frequency": 3
           },
           {
             "index": 1,
-            "expressionIndex": 0,
+            "headwordIndex": 0,
             "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "expression": "打ち込む",
-            "reading": "ぶちこむ",
+            "dictionaryIndex": 0,
+            "dictionaryPriority": 0,
             "hasReading": true,
             "frequency": 9
           }
-        ],
-        "pitches": [
-          {
-            "index": 0,
-            "expressionIndex": 0,
-            "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "expression": "打ち込む",
-            "reading": "ぶちこむ",
-            "pitches": [
-              {
-                "position": 0,
-                "tags": []
-              },
-              {
-                "position": 3,
-                "tags": []
-              }
-            ]
-          }
-        ],
-        "sourceTermExactMatchCount": 1
+        ]
       },
       {
         "type": "term",
         "id": 8,
-        "source": "打ち込む",
-        "rawSource": "打ち込む",
-        "sourceTerm": "打ち込む",
-        "reasons": [],
-        "score": 1,
         "isPrimary": true,
         "sequence": 4,
-        "dictionary": "Test Dictionary 2",
-        "dictionaryOrder": {
-          "index": 0,
-          "priority": 0
-        },
-        "dictionaryNames": [
-          "Test Dictionary 2"
-        ],
-        "expression": "打ち込む",
-        "reading": "うちこむ",
-        "expressions": [
+        "inflections": [],
+        "score": 1,
+        "dictionaryIndex": 0,
+        "dictionaryPriority": 0,
+        "sourceTermExactMatchCount": 1,
+        "maxDeinflectedTextLength": 4,
+        "headwords": [
           {
-            "sourceTerm": "打ち込む",
-            "expression": "打ち込む",
+            "index": 0,
+            "term": "打ち込む",
             "reading": "うちこむ",
-            "termTags": [
+            "sources": [
+              {
+                "originalText": "打ち込む",
+                "transformedText": "打ち込む",
+                "deinflectedText": "打ち込む",
+                "isPrimary": true
+              }
+            ],
+            "tags": [
               {
                 "name": "tag5",
                 "category": "category5",
-                "notes": "tag5 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag5 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag6",
                 "category": "default",
-                "notes": "",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag7",
                 "category": "default",
-                "notes": "",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               }
+            ]
+          }
+        ],
+        "definitions": [
+          {
+            "index": 0,
+            "headwordIndices": [
+              0
             ],
-            "frequencies": [
+            "dictionary": "Test Dictionary 2",
+            "tags": [
               {
-                "index": 0,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打ち込む",
-                "reading": "うちこむ",
-                "hasReading": false,
-                "frequency": 3
+                "name": "tag1",
+                "category": "category1",
+                "order": 0,
+                "score": 0,
+                "content": [
+                  "tag1 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
+                "redundant": false
               },
               {
-                "index": 1,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打ち込む",
-                "reading": "うちこむ",
-                "hasReading": true,
-                "frequency": 8
+                "name": "tag2",
+                "category": "category2",
+                "order": 0,
+                "score": 0,
+                "content": [
+                  "tag2 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
+                "redundant": false
               }
             ],
-            "pitches": [
-              {
-                "index": 0,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打ち込む",
-                "reading": "うちこむ",
-                "pitches": [
-                  {
-                    "position": 0,
-                    "tags": []
-                  },
-                  {
-                    "position": 3,
-                    "tags": []
-                  }
-                ]
-              }
+            "entries": [
+              "definition15",
+              "definition16"
             ]
           }
         ],
-        "glossary": [
-          "definition15",
-          "definition16"
-        ],
-        "definitionTags": [
-          {
-            "name": "tag1",
-            "category": "category1",
-            "notes": "tag1 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag2",
-            "category": "category2",
-            "notes": "tag2 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          }
-        ],
-        "termTags": [
-          {
-            "name": "tag5",
-            "category": "category5",
-            "notes": "tag5 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag6",
-            "category": "default",
-            "notes": "",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
+        "pronunciations": [
           {
-            "name": "tag7",
-            "category": "default",
-            "notes": "",
-            "order": 0,
-            "score": 0,
+            "index": 0,
+            "headwordIndex": 0,
             "dictionary": "Test Dictionary 2",
-            "redundant": false
+            "dictionaryIndex": 0,
+            "dictionaryPriority": 0,
+            "pitches": [
+              {
+                "position": 0,
+                "tags": []
+              },
+              {
+                "position": 3,
+                "tags": []
+              }
+            ]
           }
         ],
         "frequencies": [
           {
             "index": 0,
-            "expressionIndex": 0,
+            "headwordIndex": 0,
             "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "expression": "打ち込む",
-            "reading": "うちこむ",
+            "dictionaryIndex": 0,
+            "dictionaryPriority": 0,
             "hasReading": false,
             "frequency": 3
           },
           {
             "index": 1,
-            "expressionIndex": 0,
+            "headwordIndex": 0,
             "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "expression": "打ち込む",
-            "reading": "うちこむ",
+            "dictionaryIndex": 0,
+            "dictionaryPriority": 0,
             "hasReading": true,
             "frequency": 8
           }
-        ],
-        "pitches": [
-          {
-            "index": 0,
-            "expressionIndex": 0,
-            "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "expression": "打ち込む",
-            "reading": "うちこむ",
-            "pitches": [
-              {
-                "position": 0,
-                "tags": []
-              },
-              {
-                "position": 3,
-                "tags": []
-              }
-            ]
-          }
-        ],
-        "sourceTermExactMatchCount": 1
+        ]
       },
       {
         "type": "term",
         "id": 10,
-        "source": "打ち込む",
-        "rawSource": "打ち込む",
-        "sourceTerm": "打ち込む",
-        "reasons": [],
-        "score": 1,
         "isPrimary": true,
         "sequence": 4,
-        "dictionary": "Test Dictionary 2",
-        "dictionaryOrder": {
-          "index": 0,
-          "priority": 0
-        },
-        "dictionaryNames": [
-          "Test Dictionary 2"
-        ],
-        "expression": "打ち込む",
-        "reading": "ぶちこむ",
-        "expressions": [
+        "inflections": [],
+        "score": 1,
+        "dictionaryIndex": 0,
+        "dictionaryPriority": 0,
+        "sourceTermExactMatchCount": 1,
+        "maxDeinflectedTextLength": 4,
+        "headwords": [
           {
-            "sourceTerm": "打ち込む",
-            "expression": "打ち込む",
+            "index": 0,
+            "term": "打ち込む",
             "reading": "ぶちこむ",
-            "termTags": [
+            "sources": [
+              {
+                "originalText": "打ち込む",
+                "transformedText": "打ち込む",
+                "deinflectedText": "打ち込む",
+                "isPrimary": true
+              }
+            ],
+            "tags": [
               {
                 "name": "tag3",
                 "category": "category3",
-                "notes": "tag3 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag3 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag4",
                 "category": "category4",
-                "notes": "tag4 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag4 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag5",
                 "category": "category5",
-                "notes": "tag5 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag5 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               }
+            ]
+          }
+        ],
+        "definitions": [
+          {
+            "index": 0,
+            "headwordIndices": [
+              0
             ],
-            "frequencies": [
+            "dictionary": "Test Dictionary 2",
+            "tags": [
               {
-                "index": 0,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打ち込む",
-                "reading": "ぶちこむ",
-                "hasReading": false,
-                "frequency": 3
+                "name": "tag1",
+                "category": "category1",
+                "order": 0,
+                "score": 0,
+                "content": [
+                  "tag1 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
+                "redundant": false
               },
               {
-                "index": 1,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打ち込む",
-                "reading": "ぶちこむ",
-                "hasReading": true,
-                "frequency": 9
+                "name": "tag2",
+                "category": "category2",
+                "order": 0,
+                "score": 0,
+                "content": [
+                  "tag2 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
+                "redundant": false
               }
             ],
-            "pitches": [
-              {
-                "index": 0,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打ち込む",
-                "reading": "ぶちこむ",
-                "pitches": [
-                  {
-                    "position": 0,
-                    "tags": []
-                  },
-                  {
-                    "position": 3,
-                    "tags": []
-                  }
-                ]
-              }
+            "entries": [
+              "definition19",
+              "definition20"
             ]
           }
         ],
-        "glossary": [
-          "definition19",
-          "definition20"
-        ],
-        "definitionTags": [
-          {
-            "name": "tag1",
-            "category": "category1",
-            "notes": "tag1 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag2",
-            "category": "category2",
-            "notes": "tag2 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          }
-        ],
-        "termTags": [
-          {
-            "name": "tag3",
-            "category": "category3",
-            "notes": "tag3 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag4",
-            "category": "category4",
-            "notes": "tag4 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
+        "pronunciations": [
           {
-            "name": "tag5",
-            "category": "category5",
-            "notes": "tag5 notes",
-            "order": 0,
-            "score": 0,
+            "index": 0,
+            "headwordIndex": 0,
             "dictionary": "Test Dictionary 2",
-            "redundant": false
+            "dictionaryIndex": 0,
+            "dictionaryPriority": 0,
+            "pitches": [
+              {
+                "position": 0,
+                "tags": []
+              },
+              {
+                "position": 3,
+                "tags": []
+              }
+            ]
           }
         ],
         "frequencies": [
           {
             "index": 0,
-            "expressionIndex": 0,
+            "headwordIndex": 0,
             "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "expression": "打ち込む",
-            "reading": "ぶちこむ",
+            "dictionaryIndex": 0,
+            "dictionaryPriority": 0,
             "hasReading": false,
             "frequency": 3
           },
           {
             "index": 1,
-            "expressionIndex": 0,
+            "headwordIndex": 0,
             "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "expression": "打ち込む",
-            "reading": "ぶちこむ",
+            "dictionaryIndex": 0,
+            "dictionaryPriority": 0,
             "hasReading": true,
             "frequency": 9
           }
-        ],
-        "pitches": [
-          {
-            "index": 0,
-            "expressionIndex": 0,
-            "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "expression": "打ち込む",
-            "reading": "ぶちこむ",
-            "pitches": [
-              {
-                "position": 0,
-                "tags": []
-              },
-              {
-                "position": 3,
-                "tags": []
-              }
-            ]
-          }
-        ],
-        "sourceTermExactMatchCount": 1
+        ]
       },
       {
         "type": "term",
         "id": 3,
-        "source": "打ち",
-        "rawSource": "打ち",
-        "sourceTerm": "打つ",
-        "reasons": [
-          "masu stem"
-        ],
-        "score": 10,
         "isPrimary": true,
         "sequence": 3,
-        "dictionary": "Test Dictionary 2",
-        "dictionaryOrder": {
-          "index": 0,
-          "priority": 0
-        },
-        "dictionaryNames": [
-          "Test Dictionary 2"
+        "inflections": [
+          "masu stem"
         ],
-        "expression": "打つ",
-        "reading": "うつ",
-        "expressions": [
+        "score": 10,
+        "dictionaryIndex": 0,
+        "dictionaryPriority": 0,
+        "sourceTermExactMatchCount": 1,
+        "maxDeinflectedTextLength": 2,
+        "headwords": [
           {
-            "sourceTerm": "打つ",
-            "expression": "打つ",
+            "index": 0,
+            "term": "打つ",
             "reading": "うつ",
-            "termTags": [
+            "sources": [
+              {
+                "originalText": "打ち",
+                "transformedText": "打ち",
+                "deinflectedText": "打つ",
+                "isPrimary": true
+              }
+            ],
+            "tags": [
               {
                 "name": "tag3",
                 "category": "category3",
-                "notes": "tag3 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag3 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag4",
                 "category": "category4",
-                "notes": "tag4 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag4 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag5",
                 "category": "category5",
-                "notes": "tag5 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag5 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               }
+            ]
+          }
+        ],
+        "definitions": [
+          {
+            "index": 0,
+            "headwordIndices": [
+              0
             ],
-            "frequencies": [
+            "dictionary": "Test Dictionary 2",
+            "tags": [
               {
-                "index": 0,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打つ",
-                "reading": "うつ",
-                "hasReading": false,
-                "frequency": 2
+                "name": "tag1",
+                "category": "category1",
+                "order": 0,
+                "score": 0,
+                "content": [
+                  "tag1 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
+                "redundant": false
               },
               {
-                "index": 1,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打つ",
-                "reading": "うつ",
-                "hasReading": true,
-                "frequency": 6
+                "name": "tag2",
+                "category": "category2",
+                "order": 0,
+                "score": 0,
+                "content": [
+                  "tag2 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
+                "redundant": false
               }
             ],
-            "pitches": []
-          }
-        ],
-        "glossary": [
-          "definition5",
-          "definition6"
-        ],
-        "definitionTags": [
-          {
-            "name": "tag1",
-            "category": "category1",
-            "notes": "tag1 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag2",
-            "category": "category2",
-            "notes": "tag2 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          }
-        ],
-        "termTags": [
-          {
-            "name": "tag3",
-            "category": "category3",
-            "notes": "tag3 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag4",
-            "category": "category4",
-            "notes": "tag4 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag5",
-            "category": "category5",
-            "notes": "tag5 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
+            "entries": [
+              "definition5",
+              "definition6"
+            ]
           }
         ],
+        "pronunciations": [],
         "frequencies": [
           {
             "index": 0,
-            "expressionIndex": 0,
+            "headwordIndex": 0,
             "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "expression": "打つ",
-            "reading": "うつ",
+            "dictionaryIndex": 0,
+            "dictionaryPriority": 0,
             "hasReading": false,
             "frequency": 2
           },
           {
             "index": 1,
-            "expressionIndex": 0,
+            "headwordIndex": 0,
             "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "expression": "打つ",
-            "reading": "うつ",
+            "dictionaryIndex": 0,
+            "dictionaryPriority": 0,
             "hasReading": true,
             "frequency": 6
           }
-        ],
-        "pitches": [],
-        "sourceTermExactMatchCount": 1
+        ]
       },
       {
         "type": "term",
         "id": 5,
-        "source": "打ち",
-        "rawSource": "打ち",
-        "sourceTerm": "打つ",
-        "reasons": [
-          "masu stem"
-        ],
-        "score": 10,
         "isPrimary": true,
         "sequence": 3,
-        "dictionary": "Test Dictionary 2",
-        "dictionaryOrder": {
-          "index": 0,
-          "priority": 0
-        },
-        "dictionaryNames": [
-          "Test Dictionary 2"
+        "inflections": [
+          "masu stem"
         ],
-        "expression": "打つ",
-        "reading": "ぶつ",
-        "expressions": [
+        "score": 10,
+        "dictionaryIndex": 0,
+        "dictionaryPriority": 0,
+        "sourceTermExactMatchCount": 1,
+        "maxDeinflectedTextLength": 2,
+        "headwords": [
           {
-            "sourceTerm": "打つ",
-            "expression": "打つ",
+            "index": 0,
+            "term": "打つ",
             "reading": "ぶつ",
-            "termTags": [
+            "sources": [
+              {
+                "originalText": "打ち",
+                "transformedText": "打ち",
+                "deinflectedText": "打つ",
+                "isPrimary": true
+              }
+            ],
+            "tags": [
               {
                 "name": "tag3",
                 "category": "category3",
-                "notes": "tag3 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag3 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag4",
                 "category": "category4",
-                "notes": "tag4 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag4 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag5",
                 "category": "category5",
-                "notes": "tag5 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag5 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               }
+            ]
+          }
+        ],
+        "definitions": [
+          {
+            "index": 0,
+            "headwordIndices": [
+              0
             ],
-            "frequencies": [
+            "dictionary": "Test Dictionary 2",
+            "tags": [
               {
-                "index": 0,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打つ",
-                "reading": "ぶつ",
-                "hasReading": false,
-                "frequency": 2
+                "name": "tag1",
+                "category": "category1",
+                "order": 0,
+                "score": 0,
+                "content": [
+                  "tag1 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
+                "redundant": false
               },
               {
-                "index": 1,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打つ",
-                "reading": "ぶつ",
-                "hasReading": true,
-                "frequency": 7
+                "name": "tag2",
+                "category": "category2",
+                "order": 0,
+                "score": 0,
+                "content": [
+                  "tag2 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
+                "redundant": false
               }
             ],
-            "pitches": []
-          }
-        ],
-        "glossary": [
-          "definition9",
-          "definition10"
-        ],
-        "definitionTags": [
-          {
-            "name": "tag1",
-            "category": "category1",
-            "notes": "tag1 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag2",
-            "category": "category2",
-            "notes": "tag2 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          }
-        ],
-        "termTags": [
-          {
-            "name": "tag3",
-            "category": "category3",
-            "notes": "tag3 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag4",
-            "category": "category4",
-            "notes": "tag4 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag5",
-            "category": "category5",
-            "notes": "tag5 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
+            "entries": [
+              "definition9",
+              "definition10"
+            ]
           }
         ],
+        "pronunciations": [],
         "frequencies": [
           {
             "index": 0,
-            "expressionIndex": 0,
+            "headwordIndex": 0,
             "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "expression": "打つ",
-            "reading": "ぶつ",
+            "dictionaryIndex": 0,
+            "dictionaryPriority": 0,
             "hasReading": false,
             "frequency": 2
           },
           {
             "index": 1,
-            "expressionIndex": 0,
+            "headwordIndex": 0,
             "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "expression": "打つ",
-            "reading": "ぶつ",
+            "dictionaryIndex": 0,
+            "dictionaryPriority": 0,
             "hasReading": true,
             "frequency": 7
           }
-        ],
-        "pitches": [],
-        "sourceTermExactMatchCount": 1
+        ]
       },
       {
         "type": "term",
         "id": 4,
-        "source": "打ち",
-        "rawSource": "打ち",
-        "sourceTerm": "打つ",
-        "reasons": [
-          "masu stem"
-        ],
-        "score": 1,
         "isPrimary": true,
         "sequence": 3,
-        "dictionary": "Test Dictionary 2",
-        "dictionaryOrder": {
-          "index": 0,
-          "priority": 0
-        },
-        "dictionaryNames": [
-          "Test Dictionary 2"
+        "inflections": [
+          "masu stem"
         ],
-        "expression": "打つ",
-        "reading": "うつ",
-        "expressions": [
+        "score": 1,
+        "dictionaryIndex": 0,
+        "dictionaryPriority": 0,
+        "sourceTermExactMatchCount": 1,
+        "maxDeinflectedTextLength": 2,
+        "headwords": [
           {
-            "sourceTerm": "打つ",
-            "expression": "打つ",
+            "index": 0,
+            "term": "打つ",
             "reading": "うつ",
-            "termTags": [
+            "sources": [
+              {
+                "originalText": "打ち",
+                "transformedText": "打ち",
+                "deinflectedText": "打つ",
+                "isPrimary": true
+              }
+            ],
+            "tags": [
               {
                 "name": "tag3",
                 "category": "category3",
-                "notes": "tag3 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag3 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag4",
                 "category": "category4",
-                "notes": "tag4 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag4 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag5",
                 "category": "category5",
-                "notes": "tag5 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag5 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               }
+            ]
+          }
+        ],
+        "definitions": [
+          {
+            "index": 0,
+            "headwordIndices": [
+              0
             ],
-            "frequencies": [
+            "dictionary": "Test Dictionary 2",
+            "tags": [
               {
-                "index": 0,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打つ",
-                "reading": "うつ",
-                "hasReading": false,
-                "frequency": 2
+                "name": "tag1",
+                "category": "category1",
+                "order": 0,
+                "score": 0,
+                "content": [
+                  "tag1 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
+                "redundant": false
               },
               {
-                "index": 1,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打つ",
-                "reading": "うつ",
-                "hasReading": true,
-                "frequency": 6
+                "name": "tag2",
+                "category": "category2",
+                "order": 0,
+                "score": 0,
+                "content": [
+                  "tag2 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
+                "redundant": false
               }
             ],
-            "pitches": []
-          }
-        ],
-        "glossary": [
-          "definition7",
-          "definition8"
-        ],
-        "definitionTags": [
-          {
-            "name": "tag1",
-            "category": "category1",
-            "notes": "tag1 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag2",
-            "category": "category2",
-            "notes": "tag2 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          }
-        ],
-        "termTags": [
-          {
-            "name": "tag3",
-            "category": "category3",
-            "notes": "tag3 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag4",
-            "category": "category4",
-            "notes": "tag4 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag5",
-            "category": "category5",
-            "notes": "tag5 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
+            "entries": [
+              "definition7",
+              "definition8"
+            ]
           }
         ],
+        "pronunciations": [],
         "frequencies": [
           {
             "index": 0,
-            "expressionIndex": 0,
+            "headwordIndex": 0,
             "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "expression": "打つ",
-            "reading": "うつ",
+            "dictionaryIndex": 0,
+            "dictionaryPriority": 0,
             "hasReading": false,
             "frequency": 2
           },
           {
             "index": 1,
-            "expressionIndex": 0,
+            "headwordIndex": 0,
             "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "expression": "打つ",
-            "reading": "うつ",
+            "dictionaryIndex": 0,
+            "dictionaryPriority": 0,
             "hasReading": true,
             "frequency": 6
           }
-        ],
-        "pitches": [],
-        "sourceTermExactMatchCount": 1
+        ]
       },
       {
         "type": "term",
         "id": 6,
-        "source": "打ち",
-        "rawSource": "打ち",
-        "sourceTerm": "打つ",
-        "reasons": [
-          "masu stem"
-        ],
-        "score": 1,
         "isPrimary": true,
         "sequence": 3,
-        "dictionary": "Test Dictionary 2",
-        "dictionaryOrder": {
-          "index": 0,
-          "priority": 0
-        },
-        "dictionaryNames": [
-          "Test Dictionary 2"
+        "inflections": [
+          "masu stem"
         ],
-        "expression": "打つ",
-        "reading": "ぶつ",
-        "expressions": [
+        "score": 1,
+        "dictionaryIndex": 0,
+        "dictionaryPriority": 0,
+        "sourceTermExactMatchCount": 1,
+        "maxDeinflectedTextLength": 2,
+        "headwords": [
           {
-            "sourceTerm": "打つ",
-            "expression": "打つ",
+            "index": 0,
+            "term": "打つ",
             "reading": "ぶつ",
-            "termTags": [
+            "sources": [
+              {
+                "originalText": "打ち",
+                "transformedText": "打ち",
+                "deinflectedText": "打つ",
+                "isPrimary": true
+              }
+            ],
+            "tags": [
               {
                 "name": "tag3",
                 "category": "category3",
-                "notes": "tag3 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag3 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag4",
                 "category": "category4",
-                "notes": "tag4 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag4 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag5",
                 "category": "category5",
-                "notes": "tag5 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag5 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               }
+            ]
+          }
+        ],
+        "definitions": [
+          {
+            "index": 0,
+            "headwordIndices": [
+              0
             ],
-            "frequencies": [
+            "dictionary": "Test Dictionary 2",
+            "tags": [
               {
-                "index": 0,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打つ",
-                "reading": "ぶつ",
-                "hasReading": false,
-                "frequency": 2
+                "name": "tag1",
+                "category": "category1",
+                "order": 0,
+                "score": 0,
+                "content": [
+                  "tag1 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
+                "redundant": false
               },
               {
-                "index": 1,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打つ",
-                "reading": "ぶつ",
-                "hasReading": true,
-                "frequency": 7
+                "name": "tag2",
+                "category": "category2",
+                "order": 0,
+                "score": 0,
+                "content": [
+                  "tag2 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
+                "redundant": false
               }
             ],
-            "pitches": []
-          }
-        ],
-        "glossary": [
-          "definition11",
-          "definition12"
-        ],
-        "definitionTags": [
-          {
-            "name": "tag1",
-            "category": "category1",
-            "notes": "tag1 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag2",
-            "category": "category2",
-            "notes": "tag2 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          }
-        ],
-        "termTags": [
-          {
-            "name": "tag3",
-            "category": "category3",
-            "notes": "tag3 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag4",
-            "category": "category4",
-            "notes": "tag4 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag5",
-            "category": "category5",
-            "notes": "tag5 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
+            "entries": [
+              "definition11",
+              "definition12"
+            ]
           }
         ],
+        "pronunciations": [],
         "frequencies": [
           {
             "index": 0,
-            "expressionIndex": 0,
+            "headwordIndex": 0,
             "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "expression": "打つ",
-            "reading": "ぶつ",
+            "dictionaryIndex": 0,
+            "dictionaryPriority": 0,
             "hasReading": false,
             "frequency": 2
           },
           {
             "index": 1,
-            "expressionIndex": 0,
+            "headwordIndex": 0,
             "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "expression": "打つ",
-            "reading": "ぶつ",
+            "dictionaryIndex": 0,
+            "dictionaryPriority": 0,
             "hasReading": true,
             "frequency": 7
           }
-        ],
-        "pitches": [],
-        "sourceTermExactMatchCount": 1
+        ]
       },
       {
         "type": "term",
         "id": 1,
-        "source": "打",
-        "rawSource": "打",
-        "sourceTerm": "打",
-        "reasons": [],
-        "score": 1,
         "isPrimary": true,
         "sequence": 1,
-        "dictionary": "Test Dictionary 2",
-        "dictionaryOrder": {
-          "index": 0,
-          "priority": 0
-        },
-        "dictionaryNames": [
-          "Test Dictionary 2"
-        ],
-        "expression": "打",
-        "reading": "だ",
-        "expressions": [
+        "inflections": [],
+        "score": 1,
+        "dictionaryIndex": 0,
+        "dictionaryPriority": 0,
+        "sourceTermExactMatchCount": 1,
+        "maxDeinflectedTextLength": 1,
+        "headwords": [
           {
-            "sourceTerm": "打",
-            "expression": "打",
+            "index": 0,
+            "term": "打",
             "reading": "だ",
-            "termTags": [
+            "sources": [
+              {
+                "originalText": "打",
+                "transformedText": "打",
+                "deinflectedText": "打",
+                "isPrimary": true
+              }
+            ],
+            "tags": [
               {
                 "name": "tag3",
                 "category": "category3",
-                "notes": "tag3 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag3 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag4",
                 "category": "category4",
-                "notes": "tag4 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag4 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag5",
                 "category": "category5",
-                "notes": "tag5 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag5 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               }
+            ]
+          }
+        ],
+        "definitions": [
+          {
+            "index": 0,
+            "headwordIndices": [
+              0
             ],
-            "frequencies": [
+            "dictionary": "Test Dictionary 2",
+            "tags": [
               {
-                "index": 0,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打",
-                "reading": "だ",
-                "hasReading": false,
-                "frequency": 1
+                "name": "tag1",
+                "category": "category1",
+                "order": 0,
+                "score": 0,
+                "content": [
+                  "tag1 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
+                "redundant": false
               },
               {
-                "index": 1,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打",
-                "reading": "だ",
-                "hasReading": true,
-                "frequency": 4
+                "name": "tag2",
+                "category": "category2",
+                "order": 0,
+                "score": 0,
+                "content": [
+                  "tag2 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
+                "redundant": false
               }
             ],
-            "pitches": []
-          }
-        ],
-        "glossary": [
-          "definition1",
-          "definition2"
-        ],
-        "definitionTags": [
-          {
-            "name": "tag1",
-            "category": "category1",
-            "notes": "tag1 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag2",
-            "category": "category2",
-            "notes": "tag2 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          }
-        ],
-        "termTags": [
-          {
-            "name": "tag3",
-            "category": "category3",
-            "notes": "tag3 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag4",
-            "category": "category4",
-            "notes": "tag4 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag5",
-            "category": "category5",
-            "notes": "tag5 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
+            "entries": [
+              "definition1",
+              "definition2"
+            ]
           }
         ],
+        "pronunciations": [],
         "frequencies": [
           {
             "index": 0,
-            "expressionIndex": 0,
+            "headwordIndex": 0,
             "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "expression": "打",
-            "reading": "だ",
+            "dictionaryIndex": 0,
+            "dictionaryPriority": 0,
             "hasReading": false,
             "frequency": 1
           },
           {
             "index": 1,
-            "expressionIndex": 0,
+            "headwordIndex": 0,
             "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "expression": "打",
-            "reading": "だ",
+            "dictionaryIndex": 0,
+            "dictionaryPriority": 0,
             "hasReading": true,
             "frequency": 4
           }
-        ],
-        "pitches": [],
-        "sourceTermExactMatchCount": 1
+        ]
       },
       {
         "type": "term",
         "id": 2,
-        "source": "打",
-        "rawSource": "打",
-        "sourceTerm": "打",
-        "reasons": [],
-        "score": 1,
         "isPrimary": true,
         "sequence": 2,
-        "dictionary": "Test Dictionary 2",
-        "dictionaryOrder": {
-          "index": 0,
-          "priority": 0
-        },
-        "dictionaryNames": [
-          "Test Dictionary 2"
-        ],
-        "expression": "打",
-        "reading": "ダース",
-        "expressions": [
+        "inflections": [],
+        "score": 1,
+        "dictionaryIndex": 0,
+        "dictionaryPriority": 0,
+        "sourceTermExactMatchCount": 1,
+        "maxDeinflectedTextLength": 1,
+        "headwords": [
           {
-            "sourceTerm": "打",
-            "expression": "打",
+            "index": 0,
+            "term": "打",
             "reading": "ダース",
-            "termTags": [
+            "sources": [
+              {
+                "originalText": "打",
+                "transformedText": "打",
+                "deinflectedText": "打",
+                "isPrimary": true
+              }
+            ],
+            "tags": [
               {
                 "name": "tag3",
                 "category": "category3",
-                "notes": "tag3 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag3 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag4",
                 "category": "category4",
-                "notes": "tag4 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag4 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag5",
                 "category": "category5",
-                "notes": "tag5 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag5 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               }
+            ]
+          }
+        ],
+        "definitions": [
+          {
+            "index": 0,
+            "headwordIndices": [
+              0
             ],
-            "frequencies": [
+            "dictionary": "Test Dictionary 2",
+            "tags": [
               {
-                "index": 0,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打",
-                "reading": "ダース",
-                "hasReading": false,
-                "frequency": 1
+                "name": "tag1",
+                "category": "category1",
+                "order": 0,
+                "score": 0,
+                "content": [
+                  "tag1 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
+                "redundant": false
               },
               {
-                "index": 1,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打",
-                "reading": "ダース",
-                "hasReading": true,
-                "frequency": 5
+                "name": "tag2",
+                "category": "category2",
+                "order": 0,
+                "score": 0,
+                "content": [
+                  "tag2 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
+                "redundant": false
               }
             ],
-            "pitches": []
-          }
-        ],
-        "glossary": [
-          "definition3",
-          "definition4"
-        ],
-        "definitionTags": [
-          {
-            "name": "tag1",
-            "category": "category1",
-            "notes": "tag1 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag2",
-            "category": "category2",
-            "notes": "tag2 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          }
-        ],
-        "termTags": [
-          {
-            "name": "tag3",
-            "category": "category3",
-            "notes": "tag3 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag4",
-            "category": "category4",
-            "notes": "tag4 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag5",
-            "category": "category5",
-            "notes": "tag5 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
+            "entries": [
+              "definition3",
+              "definition4"
+            ]
           }
         ],
+        "pronunciations": [],
         "frequencies": [
           {
             "index": 0,
-            "expressionIndex": 0,
+            "headwordIndex": 0,
             "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "expression": "打",
-            "reading": "ダース",
+            "dictionaryIndex": 0,
+            "dictionaryPriority": 0,
             "hasReading": false,
             "frequency": 1
           },
           {
             "index": 1,
-            "expressionIndex": 0,
+            "headwordIndex": 0,
             "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "expression": "打",
-            "reading": "ダース",
+            "dictionaryIndex": 0,
+            "dictionaryPriority": 0,
             "hasReading": true,
             "frequency": 5
           }
-        ],
-        "pitches": [],
-        "sourceTermExactMatchCount": 1
+        ]
       }
     ]
   },
   {
     "name": "Find term using expression text 4",
-    "length": 2,
-    "definitions": [
+    "originalTextLength": 2,
+    "dictionaryEntries": [
       {
         "type": "term",
         "id": 11,
-        "source": "画像",
-        "rawSource": "画像",
-        "sourceTerm": "画像",
-        "reasons": [],
-        "score": 1,
         "isPrimary": true,
         "sequence": 5,
-        "dictionary": "Test Dictionary 2",
-        "dictionaryOrder": {
-          "index": 0,
-          "priority": 0
-        },
-        "dictionaryNames": [
-          "Test Dictionary 2"
-        ],
-        "expression": "画像",
-        "reading": "がぞう",
-        "expressions": [
+        "inflections": [],
+        "score": 1,
+        "dictionaryIndex": 0,
+        "dictionaryPriority": 0,
+        "sourceTermExactMatchCount": 1,
+        "maxDeinflectedTextLength": 2,
+        "headwords": [
           {
-            "sourceTerm": "画像",
-            "expression": "画像",
+            "index": 0,
+            "term": "画像",
             "reading": "がぞう",
-            "termTags": [
+            "sources": [
+              {
+                "originalText": "画像",
+                "transformedText": "画像",
+                "deinflectedText": "画像",
+                "isPrimary": true
+              }
+            ],
+            "tags": [
               {
                 "name": "tag3",
                 "category": "category3",
-                "notes": "tag3 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag3 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag4",
                 "category": "category4",
-                "notes": "tag4 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag4 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag5",
                 "category": "category5",
-                "notes": "tag5 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag5 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               }
-            ],
-            "frequencies": [],
-            "pitches": []
-          }
-        ],
-        "glossary": [
-          "definition21",
-          {
-            "type": "image",
-            "path": "image.gif",
-            "width": 100,
-            "height": 100,
-            "preferredWidth": 350,
-            "preferredHeight": 350,
-            "description": "An image",
-            "pixelated": true
-          }
-        ],
-        "definitionTags": [
-          {
-            "name": "tag1",
-            "category": "category1",
-            "notes": "tag1 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag2",
-            "category": "category2",
-            "notes": "tag2 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
+            ]
           }
         ],
-        "termTags": [
-          {
-            "name": "tag3",
-            "category": "category3",
-            "notes": "tag3 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag4",
-            "category": "category4",
-            "notes": "tag4 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
+        "definitions": [
           {
-            "name": "tag5",
-            "category": "category5",
-            "notes": "tag5 notes",
-            "order": 0,
-            "score": 0,
+            "index": 0,
+            "headwordIndices": [
+              0
+            ],
             "dictionary": "Test Dictionary 2",
-            "redundant": false
+            "tags": [
+              {
+                "name": "tag1",
+                "category": "category1",
+                "order": 0,
+                "score": 0,
+                "content": [
+                  "tag1 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
+                "redundant": false
+              },
+              {
+                "name": "tag2",
+                "category": "category2",
+                "order": 0,
+                "score": 0,
+                "content": [
+                  "tag2 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
+                "redundant": false
+              }
+            ],
+            "entries": [
+              "definition21",
+              {
+                "type": "image",
+                "path": "image.gif",
+                "width": 100,
+                "height": 100,
+                "preferredWidth": 350,
+                "preferredHeight": 350,
+                "description": "An image",
+                "pixelated": true
+              }
+            ]
           }
         ],
-        "frequencies": [],
-        "pitches": [],
-        "sourceTermExactMatchCount": 1
+        "pronunciations": [],
+        "frequencies": []
       }
     ]
   },
   {
     "name": "Find term using reading 1",
-    "length": 1,
-    "definitions": [
+    "originalTextLength": 1,
+    "dictionaryEntries": [
       {
         "type": "term",
         "id": 1,
-        "source": "だ",
-        "rawSource": "だ",
-        "sourceTerm": "だ",
-        "reasons": [],
-        "score": 1,
         "isPrimary": true,
         "sequence": 1,
-        "dictionary": "Test Dictionary 2",
-        "dictionaryOrder": {
-          "index": 0,
-          "priority": 0
-        },
-        "dictionaryNames": [
-          "Test Dictionary 2"
-        ],
-        "expression": "打",
-        "reading": "だ",
-        "expressions": [
+        "inflections": [],
+        "score": 1,
+        "dictionaryIndex": 0,
+        "dictionaryPriority": 0,
+        "sourceTermExactMatchCount": 0,
+        "maxDeinflectedTextLength": 1,
+        "headwords": [
           {
-            "sourceTerm": "だ",
-            "expression": "打",
+            "index": 0,
+            "term": "打",
             "reading": "だ",
-            "termTags": [
+            "sources": [
+              {
+                "originalText": "だ",
+                "transformedText": "だ",
+                "deinflectedText": "だ",
+                "isPrimary": true
+              }
+            ],
+            "tags": [
               {
                 "name": "tag3",
                 "category": "category3",
-                "notes": "tag3 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag3 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag4",
                 "category": "category4",
-                "notes": "tag4 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag4 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag5",
                 "category": "category5",
-                "notes": "tag5 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag5 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               }
+            ]
+          }
+        ],
+        "definitions": [
+          {
+            "index": 0,
+            "headwordIndices": [
+              0
             ],
-            "frequencies": [
+            "dictionary": "Test Dictionary 2",
+            "tags": [
               {
-                "index": 0,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打",
-                "reading": "だ",
-                "hasReading": false,
-                "frequency": 1
+                "name": "tag1",
+                "category": "category1",
+                "order": 0,
+                "score": 0,
+                "content": [
+                  "tag1 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
+                "redundant": false
               },
               {
-                "index": 1,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打",
-                "reading": "だ",
-                "hasReading": true,
-                "frequency": 4
+                "name": "tag2",
+                "category": "category2",
+                "order": 0,
+                "score": 0,
+                "content": [
+                  "tag2 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
+                "redundant": false
               }
             ],
-            "pitches": []
-          }
-        ],
-        "glossary": [
-          "definition1",
-          "definition2"
-        ],
-        "definitionTags": [
-          {
-            "name": "tag1",
-            "category": "category1",
-            "notes": "tag1 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag2",
-            "category": "category2",
-            "notes": "tag2 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          }
-        ],
-        "termTags": [
-          {
-            "name": "tag3",
-            "category": "category3",
-            "notes": "tag3 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag4",
-            "category": "category4",
-            "notes": "tag4 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag5",
-            "category": "category5",
-            "notes": "tag5 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
+            "entries": [
+              "definition1",
+              "definition2"
+            ]
           }
         ],
+        "pronunciations": [],
         "frequencies": [
           {
             "index": 0,
-            "expressionIndex": 0,
+            "headwordIndex": 0,
             "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "expression": "打",
-            "reading": "だ",
+            "dictionaryIndex": 0,
+            "dictionaryPriority": 0,
             "hasReading": false,
             "frequency": 1
           },
           {
             "index": 1,
-            "expressionIndex": 0,
+            "headwordIndex": 0,
             "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "expression": "打",
-            "reading": "だ",
+            "dictionaryIndex": 0,
+            "dictionaryPriority": 0,
             "hasReading": true,
             "frequency": 4
           }
-        ],
-        "pitches": [],
-        "sourceTermExactMatchCount": 0
+        ]
       }
     ]
   },
   {
     "name": "Find term using reading 2",
-    "length": 3,
-    "definitions": [
+    "originalTextLength": 3,
+    "dictionaryEntries": [
       {
         "type": "term",
         "id": 2,
-        "source": "ダース",
-        "rawSource": "ダース",
-        "sourceTerm": "ダース",
-        "reasons": [],
-        "score": 1,
         "isPrimary": true,
         "sequence": 2,
-        "dictionary": "Test Dictionary 2",
-        "dictionaryOrder": {
-          "index": 0,
-          "priority": 0
-        },
-        "dictionaryNames": [
-          "Test Dictionary 2"
-        ],
-        "expression": "打",
-        "reading": "ダース",
-        "expressions": [
+        "inflections": [],
+        "score": 1,
+        "dictionaryIndex": 0,
+        "dictionaryPriority": 0,
+        "sourceTermExactMatchCount": 0,
+        "maxDeinflectedTextLength": 3,
+        "headwords": [
           {
-            "sourceTerm": "ダース",
-            "expression": "打",
+            "index": 0,
+            "term": "打",
             "reading": "ダース",
-            "termTags": [
+            "sources": [
+              {
+                "originalText": "ダース",
+                "transformedText": "ダース",
+                "deinflectedText": "ダース",
+                "isPrimary": true
+              }
+            ],
+            "tags": [
               {
                 "name": "tag3",
                 "category": "category3",
-                "notes": "tag3 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag3 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag4",
                 "category": "category4",
-                "notes": "tag4 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag4 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag5",
                 "category": "category5",
-                "notes": "tag5 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag5 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               }
+            ]
+          }
+        ],
+        "definitions": [
+          {
+            "index": 0,
+            "headwordIndices": [
+              0
             ],
-            "frequencies": [
+            "dictionary": "Test Dictionary 2",
+            "tags": [
               {
-                "index": 0,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打",
-                "reading": "ダース",
-                "hasReading": false,
-                "frequency": 1
+                "name": "tag1",
+                "category": "category1",
+                "order": 0,
+                "score": 0,
+                "content": [
+                  "tag1 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
+                "redundant": false
               },
               {
-                "index": 1,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打",
-                "reading": "ダース",
-                "hasReading": true,
-                "frequency": 5
+                "name": "tag2",
+                "category": "category2",
+                "order": 0,
+                "score": 0,
+                "content": [
+                  "tag2 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
+                "redundant": false
               }
             ],
-            "pitches": []
-          }
-        ],
-        "glossary": [
-          "definition3",
-          "definition4"
-        ],
-        "definitionTags": [
-          {
-            "name": "tag1",
-            "category": "category1",
-            "notes": "tag1 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag2",
-            "category": "category2",
-            "notes": "tag2 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          }
-        ],
-        "termTags": [
-          {
-            "name": "tag3",
-            "category": "category3",
-            "notes": "tag3 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag4",
-            "category": "category4",
-            "notes": "tag4 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag5",
-            "category": "category5",
-            "notes": "tag5 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
+            "entries": [
+              "definition3",
+              "definition4"
+            ]
           }
         ],
+        "pronunciations": [],
         "frequencies": [
           {
             "index": 0,
-            "expressionIndex": 0,
+            "headwordIndex": 0,
             "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "expression": "打",
-            "reading": "ダース",
+            "dictionaryIndex": 0,
+            "dictionaryPriority": 0,
             "hasReading": false,
             "frequency": 1
           },
           {
             "index": 1,
-            "expressionIndex": 0,
+            "headwordIndex": 0,
             "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "expression": "打",
-            "reading": "ダース",
+            "dictionaryIndex": 0,
+            "dictionaryPriority": 0,
             "hasReading": true,
             "frequency": 5
           }
-        ],
-        "pitches": [],
-        "sourceTermExactMatchCount": 0
+        ]
       }
     ]
   },
   {
     "name": "Find term using reading 3",
-    "length": 2,
-    "definitions": [
+    "originalTextLength": 2,
+    "dictionaryEntries": [
       {
         "type": "term",
         "id": 3,
-        "source": "うつ",
-        "rawSource": "うつ",
-        "sourceTerm": "うつ",
-        "reasons": [],
-        "score": 10,
         "isPrimary": true,
         "sequence": 3,
-        "dictionary": "Test Dictionary 2",
-        "dictionaryOrder": {
-          "index": 0,
-          "priority": 0
-        },
-        "dictionaryNames": [
-          "Test Dictionary 2"
-        ],
-        "expression": "打つ",
-        "reading": "うつ",
-        "expressions": [
+        "inflections": [],
+        "score": 10,
+        "dictionaryIndex": 0,
+        "dictionaryPriority": 0,
+        "sourceTermExactMatchCount": 0,
+        "maxDeinflectedTextLength": 2,
+        "headwords": [
           {
-            "sourceTerm": "うつ",
-            "expression": "打つ",
+            "index": 0,
+            "term": "打つ",
             "reading": "うつ",
-            "termTags": [
+            "sources": [
+              {
+                "originalText": "うつ",
+                "transformedText": "うつ",
+                "deinflectedText": "うつ",
+                "isPrimary": true
+              }
+            ],
+            "tags": [
               {
                 "name": "tag3",
                 "category": "category3",
-                "notes": "tag3 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag3 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag4",
                 "category": "category4",
-                "notes": "tag4 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag4 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag5",
                 "category": "category5",
-                "notes": "tag5 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag5 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               }
+            ]
+          }
+        ],
+        "definitions": [
+          {
+            "index": 0,
+            "headwordIndices": [
+              0
             ],
-            "frequencies": [
+            "dictionary": "Test Dictionary 2",
+            "tags": [
               {
-                "index": 0,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打つ",
-                "reading": "うつ",
-                "hasReading": false,
-                "frequency": 2
+                "name": "tag1",
+                "category": "category1",
+                "order": 0,
+                "score": 0,
+                "content": [
+                  "tag1 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
+                "redundant": false
               },
               {
-                "index": 1,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打つ",
-                "reading": "うつ",
-                "hasReading": true,
-                "frequency": 6
+                "name": "tag2",
+                "category": "category2",
+                "order": 0,
+                "score": 0,
+                "content": [
+                  "tag2 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
+                "redundant": false
               }
             ],
-            "pitches": []
-          }
-        ],
-        "glossary": [
-          "definition5",
-          "definition6"
-        ],
-        "definitionTags": [
-          {
-            "name": "tag1",
-            "category": "category1",
-            "notes": "tag1 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag2",
-            "category": "category2",
-            "notes": "tag2 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          }
-        ],
-        "termTags": [
-          {
-            "name": "tag3",
-            "category": "category3",
-            "notes": "tag3 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag4",
-            "category": "category4",
-            "notes": "tag4 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag5",
-            "category": "category5",
-            "notes": "tag5 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
+            "entries": [
+              "definition5",
+              "definition6"
+            ]
           }
         ],
+        "pronunciations": [],
         "frequencies": [
           {
             "index": 0,
-            "expressionIndex": 0,
+            "headwordIndex": 0,
             "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "expression": "打つ",
-            "reading": "うつ",
+            "dictionaryIndex": 0,
+            "dictionaryPriority": 0,
             "hasReading": false,
             "frequency": 2
           },
           {
             "index": 1,
-            "expressionIndex": 0,
+            "headwordIndex": 0,
             "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "expression": "打つ",
-            "reading": "うつ",
+            "dictionaryIndex": 0,
+            "dictionaryPriority": 0,
             "hasReading": true,
             "frequency": 6
           }
-        ],
-        "pitches": [],
-        "sourceTermExactMatchCount": 0
+        ]
       },
       {
         "type": "term",
         "id": 4,
-        "source": "うつ",
-        "rawSource": "うつ",
-        "sourceTerm": "うつ",
-        "reasons": [],
-        "score": 1,
         "isPrimary": true,
         "sequence": 3,
-        "dictionary": "Test Dictionary 2",
-        "dictionaryOrder": {
-          "index": 0,
-          "priority": 0
-        },
-        "dictionaryNames": [
-          "Test Dictionary 2"
-        ],
-        "expression": "打つ",
-        "reading": "うつ",
-        "expressions": [
+        "inflections": [],
+        "score": 1,
+        "dictionaryIndex": 0,
+        "dictionaryPriority": 0,
+        "sourceTermExactMatchCount": 0,
+        "maxDeinflectedTextLength": 2,
+        "headwords": [
           {
-            "sourceTerm": "うつ",
-            "expression": "打つ",
+            "index": 0,
+            "term": "打つ",
             "reading": "うつ",
-            "termTags": [
+            "sources": [
+              {
+                "originalText": "うつ",
+                "transformedText": "うつ",
+                "deinflectedText": "うつ",
+                "isPrimary": true
+              }
+            ],
+            "tags": [
               {
                 "name": "tag3",
                 "category": "category3",
-                "notes": "tag3 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag3 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag4",
                 "category": "category4",
-                "notes": "tag4 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag4 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag5",
                 "category": "category5",
-                "notes": "tag5 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag5 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               }
+            ]
+          }
+        ],
+        "definitions": [
+          {
+            "index": 0,
+            "headwordIndices": [
+              0
             ],
-            "frequencies": [
+            "dictionary": "Test Dictionary 2",
+            "tags": [
               {
-                "index": 0,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打つ",
-                "reading": "うつ",
-                "hasReading": false,
-                "frequency": 2
+                "name": "tag1",
+                "category": "category1",
+                "order": 0,
+                "score": 0,
+                "content": [
+                  "tag1 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
+                "redundant": false
               },
               {
-                "index": 1,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打つ",
-                "reading": "うつ",
-                "hasReading": true,
-                "frequency": 6
+                "name": "tag2",
+                "category": "category2",
+                "order": 0,
+                "score": 0,
+                "content": [
+                  "tag2 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
+                "redundant": false
               }
             ],
-            "pitches": []
-          }
-        ],
-        "glossary": [
-          "definition7",
-          "definition8"
-        ],
-        "definitionTags": [
-          {
-            "name": "tag1",
-            "category": "category1",
-            "notes": "tag1 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag2",
-            "category": "category2",
-            "notes": "tag2 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          }
-        ],
-        "termTags": [
-          {
-            "name": "tag3",
-            "category": "category3",
-            "notes": "tag3 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag4",
-            "category": "category4",
-            "notes": "tag4 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag5",
-            "category": "category5",
-            "notes": "tag5 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
+            "entries": [
+              "definition7",
+              "definition8"
+            ]
           }
         ],
+        "pronunciations": [],
         "frequencies": [
           {
             "index": 0,
-            "expressionIndex": 0,
+            "headwordIndex": 0,
             "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "expression": "打つ",
-            "reading": "うつ",
+            "dictionaryIndex": 0,
+            "dictionaryPriority": 0,
             "hasReading": false,
             "frequency": 2
           },
           {
             "index": 1,
-            "expressionIndex": 0,
+            "headwordIndex": 0,
             "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "expression": "打つ",
-            "reading": "うつ",
+            "dictionaryIndex": 0,
+            "dictionaryPriority": 0,
             "hasReading": true,
             "frequency": 6
           }
-        ],
-        "pitches": [],
-        "sourceTermExactMatchCount": 0
+        ]
       }
     ]
   },
   {
     "name": "Find term using reading 4",
-    "length": 2,
-    "definitions": [
+    "originalTextLength": 2,
+    "dictionaryEntries": [
       {
         "type": "term",
         "id": 5,
-        "source": "ぶつ",
-        "rawSource": "ぶつ",
-        "sourceTerm": "ぶつ",
-        "reasons": [],
-        "score": 10,
         "isPrimary": true,
         "sequence": 3,
-        "dictionary": "Test Dictionary 2",
-        "dictionaryOrder": {
-          "index": 0,
-          "priority": 0
-        },
-        "dictionaryNames": [
-          "Test Dictionary 2"
-        ],
-        "expression": "打つ",
-        "reading": "ぶつ",
-        "expressions": [
+        "inflections": [],
+        "score": 10,
+        "dictionaryIndex": 0,
+        "dictionaryPriority": 0,
+        "sourceTermExactMatchCount": 0,
+        "maxDeinflectedTextLength": 2,
+        "headwords": [
           {
-            "sourceTerm": "ぶつ",
-            "expression": "打つ",
+            "index": 0,
+            "term": "打つ",
             "reading": "ぶつ",
-            "termTags": [
+            "sources": [
+              {
+                "originalText": "ぶつ",
+                "transformedText": "ぶつ",
+                "deinflectedText": "ぶつ",
+                "isPrimary": true
+              }
+            ],
+            "tags": [
               {
                 "name": "tag3",
                 "category": "category3",
-                "notes": "tag3 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag3 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag4",
                 "category": "category4",
-                "notes": "tag4 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag4 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag5",
                 "category": "category5",
-                "notes": "tag5 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag5 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               }
+            ]
+          }
+        ],
+        "definitions": [
+          {
+            "index": 0,
+            "headwordIndices": [
+              0
             ],
-            "frequencies": [
+            "dictionary": "Test Dictionary 2",
+            "tags": [
               {
-                "index": 0,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打つ",
-                "reading": "ぶつ",
-                "hasReading": false,
-                "frequency": 2
+                "name": "tag1",
+                "category": "category1",
+                "order": 0,
+                "score": 0,
+                "content": [
+                  "tag1 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
+                "redundant": false
               },
               {
-                "index": 1,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打つ",
-                "reading": "ぶつ",
-                "hasReading": true,
-                "frequency": 7
+                "name": "tag2",
+                "category": "category2",
+                "order": 0,
+                "score": 0,
+                "content": [
+                  "tag2 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
+                "redundant": false
               }
             ],
-            "pitches": []
-          }
-        ],
-        "glossary": [
-          "definition9",
-          "definition10"
-        ],
-        "definitionTags": [
-          {
-            "name": "tag1",
-            "category": "category1",
-            "notes": "tag1 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag2",
-            "category": "category2",
-            "notes": "tag2 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          }
-        ],
-        "termTags": [
-          {
-            "name": "tag3",
-            "category": "category3",
-            "notes": "tag3 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag4",
-            "category": "category4",
-            "notes": "tag4 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag5",
-            "category": "category5",
-            "notes": "tag5 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
+            "entries": [
+              "definition9",
+              "definition10"
+            ]
           }
         ],
+        "pronunciations": [],
         "frequencies": [
           {
             "index": 0,
-            "expressionIndex": 0,
+            "headwordIndex": 0,
             "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "expression": "打つ",
-            "reading": "ぶつ",
+            "dictionaryIndex": 0,
+            "dictionaryPriority": 0,
             "hasReading": false,
             "frequency": 2
           },
           {
             "index": 1,
-            "expressionIndex": 0,
+            "headwordIndex": 0,
             "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "expression": "打つ",
-            "reading": "ぶつ",
+            "dictionaryIndex": 0,
+            "dictionaryPriority": 0,
             "hasReading": true,
             "frequency": 7
           }
-        ],
-        "pitches": [],
-        "sourceTermExactMatchCount": 0
+        ]
       },
       {
         "type": "term",
         "id": 6,
-        "source": "ぶつ",
-        "rawSource": "ぶつ",
-        "sourceTerm": "ぶつ",
-        "reasons": [],
-        "score": 1,
         "isPrimary": true,
         "sequence": 3,
-        "dictionary": "Test Dictionary 2",
-        "dictionaryOrder": {
-          "index": 0,
-          "priority": 0
-        },
-        "dictionaryNames": [
-          "Test Dictionary 2"
-        ],
-        "expression": "打つ",
-        "reading": "ぶつ",
-        "expressions": [
+        "inflections": [],
+        "score": 1,
+        "dictionaryIndex": 0,
+        "dictionaryPriority": 0,
+        "sourceTermExactMatchCount": 0,
+        "maxDeinflectedTextLength": 2,
+        "headwords": [
           {
-            "sourceTerm": "ぶつ",
-            "expression": "打つ",
+            "index": 0,
+            "term": "打つ",
             "reading": "ぶつ",
-            "termTags": [
+            "sources": [
+              {
+                "originalText": "ぶつ",
+                "transformedText": "ぶつ",
+                "deinflectedText": "ぶつ",
+                "isPrimary": true
+              }
+            ],
+            "tags": [
               {
                 "name": "tag3",
                 "category": "category3",
-                "notes": "tag3 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag3 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag4",
                 "category": "category4",
-                "notes": "tag4 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag4 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag5",
                 "category": "category5",
-                "notes": "tag5 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag5 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               }
+            ]
+          }
+        ],
+        "definitions": [
+          {
+            "index": 0,
+            "headwordIndices": [
+              0
             ],
-            "frequencies": [
+            "dictionary": "Test Dictionary 2",
+            "tags": [
               {
-                "index": 0,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打つ",
-                "reading": "ぶつ",
-                "hasReading": false,
-                "frequency": 2
+                "name": "tag1",
+                "category": "category1",
+                "order": 0,
+                "score": 0,
+                "content": [
+                  "tag1 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
+                "redundant": false
               },
               {
-                "index": 1,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打つ",
-                "reading": "ぶつ",
-                "hasReading": true,
-                "frequency": 7
+                "name": "tag2",
+                "category": "category2",
+                "order": 0,
+                "score": 0,
+                "content": [
+                  "tag2 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
+                "redundant": false
               }
             ],
-            "pitches": []
-          }
-        ],
-        "glossary": [
-          "definition11",
-          "definition12"
-        ],
-        "definitionTags": [
-          {
-            "name": "tag1",
-            "category": "category1",
-            "notes": "tag1 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag2",
-            "category": "category2",
-            "notes": "tag2 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          }
-        ],
-        "termTags": [
-          {
-            "name": "tag3",
-            "category": "category3",
-            "notes": "tag3 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag4",
-            "category": "category4",
-            "notes": "tag4 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag5",
-            "category": "category5",
-            "notes": "tag5 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
+            "entries": [
+              "definition11",
+              "definition12"
+            ]
           }
         ],
+        "pronunciations": [],
         "frequencies": [
           {
             "index": 0,
-            "expressionIndex": 0,
+            "headwordIndex": 0,
             "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "expression": "打つ",
-            "reading": "ぶつ",
+            "dictionaryIndex": 0,
+            "dictionaryPriority": 0,
             "hasReading": false,
             "frequency": 2
           },
           {
             "index": 1,
-            "expressionIndex": 0,
+            "headwordIndex": 0,
             "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "expression": "打つ",
-            "reading": "ぶつ",
+            "dictionaryIndex": 0,
+            "dictionaryPriority": 0,
             "hasReading": true,
             "frequency": 7
           }
-        ],
-        "pitches": [],
-        "sourceTermExactMatchCount": 0
+        ]
       }
     ]
   },
   {
     "name": "Find term using reading 5",
-    "length": 4,
-    "definitions": [
+    "originalTextLength": 4,
+    "dictionaryEntries": [
       {
         "type": "term",
         "id": 7,
-        "source": "うちこむ",
-        "rawSource": "うちこむ",
-        "sourceTerm": "うちこむ",
-        "reasons": [],
-        "score": 10,
         "isPrimary": true,
         "sequence": 4,
-        "dictionary": "Test Dictionary 2",
-        "dictionaryOrder": {
-          "index": 0,
-          "priority": 0
-        },
-        "dictionaryNames": [
-          "Test Dictionary 2"
-        ],
-        "expression": "打ち込む",
-        "reading": "うちこむ",
-        "expressions": [
+        "inflections": [],
+        "score": 10,
+        "dictionaryIndex": 0,
+        "dictionaryPriority": 0,
+        "sourceTermExactMatchCount": 0,
+        "maxDeinflectedTextLength": 4,
+        "headwords": [
           {
-            "sourceTerm": "うちこむ",
-            "expression": "打ち込む",
+            "index": 0,
+            "term": "打ち込む",
             "reading": "うちこむ",
-            "termTags": [
+            "sources": [
+              {
+                "originalText": "うちこむ",
+                "transformedText": "うちこむ",
+                "deinflectedText": "うちこむ",
+                "isPrimary": true
+              }
+            ],
+            "tags": [
               {
                 "name": "tag3",
                 "category": "category3",
-                "notes": "tag3 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag3 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag4",
                 "category": "category4",
-                "notes": "tag4 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag4 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag5",
                 "category": "category5",
-                "notes": "tag5 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag5 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               }
+            ]
+          }
+        ],
+        "definitions": [
+          {
+            "index": 0,
+            "headwordIndices": [
+              0
             ],
-            "frequencies": [
+            "dictionary": "Test Dictionary 2",
+            "tags": [
               {
-                "index": 0,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打ち込む",
-                "reading": "うちこむ",
-                "hasReading": false,
-                "frequency": 3
+                "name": "tag1",
+                "category": "category1",
+                "order": 0,
+                "score": 0,
+                "content": [
+                  "tag1 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
+                "redundant": false
               },
               {
-                "index": 1,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打ち込む",
-                "reading": "うちこむ",
-                "hasReading": true,
-                "frequency": 8
+                "name": "tag2",
+                "category": "category2",
+                "order": 0,
+                "score": 0,
+                "content": [
+                  "tag2 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
+                "redundant": false
               }
             ],
-            "pitches": [
-              {
-                "index": 0,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打ち込む",
-                "reading": "うちこむ",
-                "pitches": [
-                  {
-                    "position": 0,
-                    "tags": []
-                  },
-                  {
-                    "position": 3,
-                    "tags": []
-                  }
-                ]
-              }
+            "entries": [
+              "definition13",
+              "definition14"
             ]
           }
         ],
-        "glossary": [
-          "definition13",
-          "definition14"
-        ],
-        "definitionTags": [
-          {
-            "name": "tag1",
-            "category": "category1",
-            "notes": "tag1 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag2",
-            "category": "category2",
-            "notes": "tag2 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          }
-        ],
-        "termTags": [
-          {
-            "name": "tag3",
-            "category": "category3",
-            "notes": "tag3 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
+        "pronunciations": [
           {
-            "name": "tag4",
-            "category": "category4",
-            "notes": "tag4 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag5",
-            "category": "category5",
-            "notes": "tag5 notes",
-            "order": 0,
-            "score": 0,
+            "index": 0,
+            "headwordIndex": 0,
             "dictionary": "Test Dictionary 2",
-            "redundant": false
+            "dictionaryIndex": 0,
+            "dictionaryPriority": 0,
+            "pitches": [
+              {
+                "position": 0,
+                "tags": []
+              },
+              {
+                "position": 3,
+                "tags": []
+              }
+            ]
           }
         ],
         "frequencies": [
           {
             "index": 0,
-            "expressionIndex": 0,
+            "headwordIndex": 0,
             "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "expression": "打ち込む",
-            "reading": "うちこむ",
+            "dictionaryIndex": 0,
+            "dictionaryPriority": 0,
             "hasReading": false,
             "frequency": 3
           },
           {
             "index": 1,
-            "expressionIndex": 0,
+            "headwordIndex": 0,
             "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "expression": "打ち込む",
-            "reading": "うちこむ",
+            "dictionaryIndex": 0,
+            "dictionaryPriority": 0,
             "hasReading": true,
             "frequency": 8
           }
-        ],
-        "pitches": [
-          {
-            "index": 0,
-            "expressionIndex": 0,
-            "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "expression": "打ち込む",
-            "reading": "うちこむ",
-            "pitches": [
-              {
-                "position": 0,
-                "tags": []
-              },
-              {
-                "position": 3,
-                "tags": []
-              }
-            ]
-          }
-        ],
-        "sourceTermExactMatchCount": 0
+        ]
       },
       {
         "type": "term",
         "id": 8,
-        "source": "うちこむ",
-        "rawSource": "うちこむ",
-        "sourceTerm": "うちこむ",
-        "reasons": [],
-        "score": 1,
         "isPrimary": true,
         "sequence": 4,
-        "dictionary": "Test Dictionary 2",
-        "dictionaryOrder": {
-          "index": 0,
-          "priority": 0
-        },
-        "dictionaryNames": [
-          "Test Dictionary 2"
-        ],
-        "expression": "打ち込む",
-        "reading": "うちこむ",
-        "expressions": [
+        "inflections": [],
+        "score": 1,
+        "dictionaryIndex": 0,
+        "dictionaryPriority": 0,
+        "sourceTermExactMatchCount": 0,
+        "maxDeinflectedTextLength": 4,
+        "headwords": [
           {
-            "sourceTerm": "うちこむ",
-            "expression": "打ち込む",
+            "index": 0,
+            "term": "打ち込む",
             "reading": "うちこむ",
-            "termTags": [
+            "sources": [
+              {
+                "originalText": "うちこむ",
+                "transformedText": "うちこむ",
+                "deinflectedText": "うちこむ",
+                "isPrimary": true
+              }
+            ],
+            "tags": [
               {
                 "name": "tag5",
                 "category": "category5",
-                "notes": "tag5 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag5 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag6",
                 "category": "default",
-                "notes": "",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag7",
                 "category": "default",
-                "notes": "",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               }
+            ]
+          }
+        ],
+        "definitions": [
+          {
+            "index": 0,
+            "headwordIndices": [
+              0
             ],
-            "frequencies": [
+            "dictionary": "Test Dictionary 2",
+            "tags": [
               {
-                "index": 0,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打ち込む",
-                "reading": "うちこむ",
-                "hasReading": false,
-                "frequency": 3
+                "name": "tag1",
+                "category": "category1",
+                "order": 0,
+                "score": 0,
+                "content": [
+                  "tag1 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
+                "redundant": false
               },
               {
-                "index": 1,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打ち込む",
-                "reading": "うちこむ",
-                "hasReading": true,
-                "frequency": 8
+                "name": "tag2",
+                "category": "category2",
+                "order": 0,
+                "score": 0,
+                "content": [
+                  "tag2 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
+                "redundant": false
               }
             ],
-            "pitches": [
-              {
-                "index": 0,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打ち込む",
-                "reading": "うちこむ",
-                "pitches": [
-                  {
-                    "position": 0,
-                    "tags": []
-                  },
-                  {
-                    "position": 3,
-                    "tags": []
-                  }
-                ]
-              }
+            "entries": [
+              "definition15",
+              "definition16"
             ]
           }
         ],
-        "glossary": [
-          "definition15",
-          "definition16"
-        ],
-        "definitionTags": [
-          {
-            "name": "tag1",
-            "category": "category1",
-            "notes": "tag1 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag2",
-            "category": "category2",
-            "notes": "tag2 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          }
-        ],
-        "termTags": [
+        "pronunciations": [
           {
-            "name": "tag5",
-            "category": "category5",
-            "notes": "tag5 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag6",
-            "category": "default",
-            "notes": "",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag7",
-            "category": "default",
-            "notes": "",
-            "order": 0,
-            "score": 0,
+            "index": 0,
+            "headwordIndex": 0,
             "dictionary": "Test Dictionary 2",
-            "redundant": false
+            "dictionaryIndex": 0,
+            "dictionaryPriority": 0,
+            "pitches": [
+              {
+                "position": 0,
+                "tags": []
+              },
+              {
+                "position": 3,
+                "tags": []
+              }
+            ]
           }
         ],
         "frequencies": [
           {
             "index": 0,
-            "expressionIndex": 0,
+            "headwordIndex": 0,
             "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "expression": "打ち込む",
-            "reading": "うちこむ",
+            "dictionaryIndex": 0,
+            "dictionaryPriority": 0,
             "hasReading": false,
             "frequency": 3
           },
           {
             "index": 1,
-            "expressionIndex": 0,
+            "headwordIndex": 0,
             "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "expression": "打ち込む",
-            "reading": "うちこむ",
+            "dictionaryIndex": 0,
+            "dictionaryPriority": 0,
             "hasReading": true,
             "frequency": 8
           }
-        ],
-        "pitches": [
-          {
-            "index": 0,
-            "expressionIndex": 0,
-            "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "expression": "打ち込む",
-            "reading": "うちこむ",
-            "pitches": [
-              {
-                "position": 0,
-                "tags": []
-              },
-              {
-                "position": 3,
-                "tags": []
-              }
-            ]
-          }
-        ],
-        "sourceTermExactMatchCount": 0
+        ]
       },
       {
         "type": "term",
         "id": 3,
-        "source": "うち",
-        "rawSource": "うち",
-        "sourceTerm": "うつ",
-        "reasons": [
-          "masu stem"
-        ],
-        "score": 10,
         "isPrimary": true,
         "sequence": 3,
-        "dictionary": "Test Dictionary 2",
-        "dictionaryOrder": {
-          "index": 0,
-          "priority": 0
-        },
-        "dictionaryNames": [
-          "Test Dictionary 2"
+        "inflections": [
+          "masu stem"
         ],
-        "expression": "打つ",
-        "reading": "うつ",
-        "expressions": [
+        "score": 10,
+        "dictionaryIndex": 0,
+        "dictionaryPriority": 0,
+        "sourceTermExactMatchCount": 0,
+        "maxDeinflectedTextLength": 2,
+        "headwords": [
           {
-            "sourceTerm": "うつ",
-            "expression": "打つ",
+            "index": 0,
+            "term": "打つ",
             "reading": "うつ",
-            "termTags": [
+            "sources": [
+              {
+                "originalText": "うち",
+                "transformedText": "うち",
+                "deinflectedText": "うつ",
+                "isPrimary": true
+              }
+            ],
+            "tags": [
               {
                 "name": "tag3",
                 "category": "category3",
-                "notes": "tag3 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag3 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag4",
                 "category": "category4",
-                "notes": "tag4 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag4 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag5",
                 "category": "category5",
-                "notes": "tag5 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag5 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               }
+            ]
+          }
+        ],
+        "definitions": [
+          {
+            "index": 0,
+            "headwordIndices": [
+              0
             ],
-            "frequencies": [
+            "dictionary": "Test Dictionary 2",
+            "tags": [
               {
-                "index": 0,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打つ",
-                "reading": "うつ",
-                "hasReading": false,
-                "frequency": 2
+                "name": "tag1",
+                "category": "category1",
+                "order": 0,
+                "score": 0,
+                "content": [
+                  "tag1 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
+                "redundant": false
               },
               {
-                "index": 1,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打つ",
-                "reading": "うつ",
-                "hasReading": true,
-                "frequency": 6
+                "name": "tag2",
+                "category": "category2",
+                "order": 0,
+                "score": 0,
+                "content": [
+                  "tag2 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
+                "redundant": false
               }
             ],
-            "pitches": []
-          }
-        ],
-        "glossary": [
-          "definition5",
-          "definition6"
-        ],
-        "definitionTags": [
-          {
-            "name": "tag1",
-            "category": "category1",
-            "notes": "tag1 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag2",
-            "category": "category2",
-            "notes": "tag2 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          }
-        ],
-        "termTags": [
-          {
-            "name": "tag3",
-            "category": "category3",
-            "notes": "tag3 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag4",
-            "category": "category4",
-            "notes": "tag4 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag5",
-            "category": "category5",
-            "notes": "tag5 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
+            "entries": [
+              "definition5",
+              "definition6"
+            ]
           }
         ],
+        "pronunciations": [],
         "frequencies": [
           {
             "index": 0,
-            "expressionIndex": 0,
+            "headwordIndex": 0,
             "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "expression": "打つ",
-            "reading": "うつ",
+            "dictionaryIndex": 0,
+            "dictionaryPriority": 0,
             "hasReading": false,
             "frequency": 2
           },
           {
             "index": 1,
-            "expressionIndex": 0,
+            "headwordIndex": 0,
             "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "expression": "打つ",
-            "reading": "うつ",
+            "dictionaryIndex": 0,
+            "dictionaryPriority": 0,
             "hasReading": true,
             "frequency": 6
           }
-        ],
-        "pitches": [],
-        "sourceTermExactMatchCount": 0
+        ]
       },
       {
         "type": "term",
         "id": 4,
-        "source": "うち",
-        "rawSource": "うち",
-        "sourceTerm": "うつ",
-        "reasons": [
-          "masu stem"
-        ],
-        "score": 1,
         "isPrimary": true,
         "sequence": 3,
-        "dictionary": "Test Dictionary 2",
-        "dictionaryOrder": {
-          "index": 0,
-          "priority": 0
-        },
-        "dictionaryNames": [
-          "Test Dictionary 2"
+        "inflections": [
+          "masu stem"
         ],
-        "expression": "打つ",
-        "reading": "うつ",
-        "expressions": [
+        "score": 1,
+        "dictionaryIndex": 0,
+        "dictionaryPriority": 0,
+        "sourceTermExactMatchCount": 0,
+        "maxDeinflectedTextLength": 2,
+        "headwords": [
           {
-            "sourceTerm": "うつ",
-            "expression": "打つ",
+            "index": 0,
+            "term": "打つ",
             "reading": "うつ",
-            "termTags": [
+            "sources": [
+              {
+                "originalText": "うち",
+                "transformedText": "うち",
+                "deinflectedText": "うつ",
+                "isPrimary": true
+              }
+            ],
+            "tags": [
               {
                 "name": "tag3",
                 "category": "category3",
-                "notes": "tag3 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag3 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag4",
                 "category": "category4",
-                "notes": "tag4 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag4 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag5",
                 "category": "category5",
-                "notes": "tag5 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag5 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               }
+            ]
+          }
+        ],
+        "definitions": [
+          {
+            "index": 0,
+            "headwordIndices": [
+              0
             ],
-            "frequencies": [
+            "dictionary": "Test Dictionary 2",
+            "tags": [
               {
-                "index": 0,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打つ",
-                "reading": "うつ",
-                "hasReading": false,
-                "frequency": 2
+                "name": "tag1",
+                "category": "category1",
+                "order": 0,
+                "score": 0,
+                "content": [
+                  "tag1 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
+                "redundant": false
               },
               {
-                "index": 1,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打つ",
-                "reading": "うつ",
-                "hasReading": true,
-                "frequency": 6
+                "name": "tag2",
+                "category": "category2",
+                "order": 0,
+                "score": 0,
+                "content": [
+                  "tag2 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
+                "redundant": false
               }
             ],
-            "pitches": []
-          }
-        ],
-        "glossary": [
-          "definition7",
-          "definition8"
-        ],
-        "definitionTags": [
-          {
-            "name": "tag1",
-            "category": "category1",
-            "notes": "tag1 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag2",
-            "category": "category2",
-            "notes": "tag2 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          }
-        ],
-        "termTags": [
-          {
-            "name": "tag3",
-            "category": "category3",
-            "notes": "tag3 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag4",
-            "category": "category4",
-            "notes": "tag4 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag5",
-            "category": "category5",
-            "notes": "tag5 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
+            "entries": [
+              "definition7",
+              "definition8"
+            ]
           }
         ],
+        "pronunciations": [],
         "frequencies": [
           {
             "index": 0,
-            "expressionIndex": 0,
+            "headwordIndex": 0,
             "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "expression": "打つ",
-            "reading": "うつ",
+            "dictionaryIndex": 0,
+            "dictionaryPriority": 0,
             "hasReading": false,
             "frequency": 2
           },
           {
             "index": 1,
-            "expressionIndex": 0,
+            "headwordIndex": 0,
             "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "expression": "打つ",
-            "reading": "うつ",
+            "dictionaryIndex": 0,
+            "dictionaryPriority": 0,
             "hasReading": true,
             "frequency": 6
           }
-        ],
-        "pitches": [],
-        "sourceTermExactMatchCount": 0
+        ]
       }
     ]
   },
   {
     "name": "Find term using reading 6",
-    "length": 4,
-    "definitions": [
+    "originalTextLength": 4,
+    "dictionaryEntries": [
       {
         "type": "term",
         "id": 9,
-        "source": "ぶちこむ",
-        "rawSource": "ぶちこむ",
-        "sourceTerm": "ぶちこむ",
-        "reasons": [],
-        "score": 10,
         "isPrimary": true,
         "sequence": 4,
-        "dictionary": "Test Dictionary 2",
-        "dictionaryOrder": {
-          "index": 0,
-          "priority": 0
-        },
-        "dictionaryNames": [
-          "Test Dictionary 2"
-        ],
-        "expression": "打ち込む",
-        "reading": "ぶちこむ",
-        "expressions": [
+        "inflections": [],
+        "score": 10,
+        "dictionaryIndex": 0,
+        "dictionaryPriority": 0,
+        "sourceTermExactMatchCount": 0,
+        "maxDeinflectedTextLength": 4,
+        "headwords": [
           {
-            "sourceTerm": "ぶちこむ",
-            "expression": "打ち込む",
+            "index": 0,
+            "term": "打ち込む",
             "reading": "ぶちこむ",
-            "termTags": [
+            "sources": [
+              {
+                "originalText": "ぶちこむ",
+                "transformedText": "ぶちこむ",
+                "deinflectedText": "ぶちこむ",
+                "isPrimary": true
+              }
+            ],
+            "tags": [
               {
                 "name": "tag3",
                 "category": "category3",
-                "notes": "tag3 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag3 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag4",
                 "category": "category4",
-                "notes": "tag4 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag4 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag5",
                 "category": "category5",
-                "notes": "tag5 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag5 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               }
+            ]
+          }
+        ],
+        "definitions": [
+          {
+            "index": 0,
+            "headwordIndices": [
+              0
             ],
-            "frequencies": [
+            "dictionary": "Test Dictionary 2",
+            "tags": [
               {
-                "index": 0,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打ち込む",
-                "reading": "ぶちこむ",
-                "hasReading": false,
-                "frequency": 3
+                "name": "tag1",
+                "category": "category1",
+                "order": 0,
+                "score": 0,
+                "content": [
+                  "tag1 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
+                "redundant": false
               },
               {
-                "index": 1,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打ち込む",
-                "reading": "ぶちこむ",
-                "hasReading": true,
-                "frequency": 9
+                "name": "tag2",
+                "category": "category2",
+                "order": 0,
+                "score": 0,
+                "content": [
+                  "tag2 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
+                "redundant": false
               }
             ],
-            "pitches": [
-              {
-                "index": 0,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打ち込む",
-                "reading": "ぶちこむ",
-                "pitches": [
-                  {
-                    "position": 0,
-                    "tags": []
-                  },
-                  {
-                    "position": 3,
-                    "tags": []
-                  }
-                ]
-              }
+            "entries": [
+              "definition17",
+              "definition18"
             ]
           }
         ],
-        "glossary": [
-          "definition17",
-          "definition18"
-        ],
-        "definitionTags": [
+        "pronunciations": [
           {
-            "name": "tag1",
-            "category": "category1",
-            "notes": "tag1 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag2",
-            "category": "category2",
-            "notes": "tag2 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          }
-        ],
-        "termTags": [
-          {
-            "name": "tag3",
-            "category": "category3",
-            "notes": "tag3 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag4",
-            "category": "category4",
-            "notes": "tag4 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag5",
-            "category": "category5",
-            "notes": "tag5 notes",
-            "order": 0,
-            "score": 0,
+            "index": 0,
+            "headwordIndex": 0,
             "dictionary": "Test Dictionary 2",
-            "redundant": false
+            "dictionaryIndex": 0,
+            "dictionaryPriority": 0,
+            "pitches": [
+              {
+                "position": 0,
+                "tags": []
+              },
+              {
+                "position": 3,
+                "tags": []
+              }
+            ]
           }
         ],
         "frequencies": [
           {
             "index": 0,
-            "expressionIndex": 0,
+            "headwordIndex": 0,
             "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "expression": "打ち込む",
-            "reading": "ぶちこむ",
+            "dictionaryIndex": 0,
+            "dictionaryPriority": 0,
             "hasReading": false,
             "frequency": 3
           },
           {
             "index": 1,
-            "expressionIndex": 0,
+            "headwordIndex": 0,
             "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "expression": "打ち込む",
-            "reading": "ぶちこむ",
+            "dictionaryIndex": 0,
+            "dictionaryPriority": 0,
             "hasReading": true,
             "frequency": 9
           }
-        ],
-        "pitches": [
-          {
-            "index": 0,
-            "expressionIndex": 0,
-            "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "expression": "打ち込む",
-            "reading": "ぶちこむ",
-            "pitches": [
-              {
-                "position": 0,
-                "tags": []
-              },
-              {
-                "position": 3,
-                "tags": []
-              }
-            ]
-          }
-        ],
-        "sourceTermExactMatchCount": 0
+        ]
       },
       {
         "type": "term",
         "id": 10,
-        "source": "ぶちこむ",
-        "rawSource": "ぶちこむ",
-        "sourceTerm": "ぶちこむ",
-        "reasons": [],
-        "score": 1,
         "isPrimary": true,
         "sequence": 4,
-        "dictionary": "Test Dictionary 2",
-        "dictionaryOrder": {
-          "index": 0,
-          "priority": 0
-        },
-        "dictionaryNames": [
-          "Test Dictionary 2"
-        ],
-        "expression": "打ち込む",
-        "reading": "ぶちこむ",
-        "expressions": [
+        "inflections": [],
+        "score": 1,
+        "dictionaryIndex": 0,
+        "dictionaryPriority": 0,
+        "sourceTermExactMatchCount": 0,
+        "maxDeinflectedTextLength": 4,
+        "headwords": [
           {
-            "sourceTerm": "ぶちこむ",
-            "expression": "打ち込む",
+            "index": 0,
+            "term": "打ち込む",
             "reading": "ぶちこむ",
-            "termTags": [
+            "sources": [
+              {
+                "originalText": "ぶちこむ",
+                "transformedText": "ぶちこむ",
+                "deinflectedText": "ぶちこむ",
+                "isPrimary": true
+              }
+            ],
+            "tags": [
               {
                 "name": "tag3",
                 "category": "category3",
-                "notes": "tag3 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag3 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag4",
                 "category": "category4",
-                "notes": "tag4 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag4 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag5",
                 "category": "category5",
-                "notes": "tag5 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag5 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               }
+            ]
+          }
+        ],
+        "definitions": [
+          {
+            "index": 0,
+            "headwordIndices": [
+              0
             ],
-            "frequencies": [
+            "dictionary": "Test Dictionary 2",
+            "tags": [
               {
-                "index": 0,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打ち込む",
-                "reading": "ぶちこむ",
-                "hasReading": false,
-                "frequency": 3
+                "name": "tag1",
+                "category": "category1",
+                "order": 0,
+                "score": 0,
+                "content": [
+                  "tag1 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
+                "redundant": false
               },
               {
-                "index": 1,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打ち込む",
-                "reading": "ぶちこむ",
-                "hasReading": true,
-                "frequency": 9
+                "name": "tag2",
+                "category": "category2",
+                "order": 0,
+                "score": 0,
+                "content": [
+                  "tag2 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
+                "redundant": false
               }
             ],
-            "pitches": [
-              {
-                "index": 0,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打ち込む",
-                "reading": "ぶちこむ",
-                "pitches": [
-                  {
-                    "position": 0,
-                    "tags": []
-                  },
-                  {
-                    "position": 3,
-                    "tags": []
-                  }
-                ]
-              }
+            "entries": [
+              "definition19",
+              "definition20"
             ]
           }
         ],
-        "glossary": [
-          "definition19",
-          "definition20"
-        ],
-        "definitionTags": [
-          {
-            "name": "tag1",
-            "category": "category1",
-            "notes": "tag1 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
+        "pronunciations": [
           {
-            "name": "tag2",
-            "category": "category2",
-            "notes": "tag2 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          }
-        ],
-        "termTags": [
-          {
-            "name": "tag3",
-            "category": "category3",
-            "notes": "tag3 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag4",
-            "category": "category4",
-            "notes": "tag4 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag5",
-            "category": "category5",
-            "notes": "tag5 notes",
-            "order": 0,
-            "score": 0,
+            "index": 0,
+            "headwordIndex": 0,
             "dictionary": "Test Dictionary 2",
-            "redundant": false
+            "dictionaryIndex": 0,
+            "dictionaryPriority": 0,
+            "pitches": [
+              {
+                "position": 0,
+                "tags": []
+              },
+              {
+                "position": 3,
+                "tags": []
+              }
+            ]
           }
         ],
         "frequencies": [
           {
             "index": 0,
-            "expressionIndex": 0,
+            "headwordIndex": 0,
             "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "expression": "打ち込む",
-            "reading": "ぶちこむ",
+            "dictionaryIndex": 0,
+            "dictionaryPriority": 0,
             "hasReading": false,
             "frequency": 3
           },
           {
             "index": 1,
-            "expressionIndex": 0,
+            "headwordIndex": 0,
             "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "expression": "打ち込む",
-            "reading": "ぶちこむ",
+            "dictionaryIndex": 0,
+            "dictionaryPriority": 0,
             "hasReading": true,
             "frequency": 9
           }
-        ],
-        "pitches": [
-          {
-            "index": 0,
-            "expressionIndex": 0,
-            "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "expression": "打ち込む",
-            "reading": "ぶちこむ",
-            "pitches": [
-              {
-                "position": 0,
-                "tags": []
-              },
-              {
-                "position": 3,
-                "tags": []
-              }
-            ]
-          }
-        ],
-        "sourceTermExactMatchCount": 0
+        ]
       },
       {
         "type": "term",
         "id": 5,
-        "source": "ぶち",
-        "rawSource": "ぶち",
-        "sourceTerm": "ぶつ",
-        "reasons": [
-          "masu stem"
-        ],
-        "score": 10,
         "isPrimary": true,
         "sequence": 3,
-        "dictionary": "Test Dictionary 2",
-        "dictionaryOrder": {
-          "index": 0,
-          "priority": 0
-        },
-        "dictionaryNames": [
-          "Test Dictionary 2"
+        "inflections": [
+          "masu stem"
         ],
-        "expression": "打つ",
-        "reading": "ぶつ",
-        "expressions": [
+        "score": 10,
+        "dictionaryIndex": 0,
+        "dictionaryPriority": 0,
+        "sourceTermExactMatchCount": 0,
+        "maxDeinflectedTextLength": 2,
+        "headwords": [
           {
-            "sourceTerm": "ぶつ",
-            "expression": "打つ",
+            "index": 0,
+            "term": "打つ",
             "reading": "ぶつ",
-            "termTags": [
+            "sources": [
+              {
+                "originalText": "ぶち",
+                "transformedText": "ぶち",
+                "deinflectedText": "ぶつ",
+                "isPrimary": true
+              }
+            ],
+            "tags": [
               {
                 "name": "tag3",
                 "category": "category3",
-                "notes": "tag3 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag3 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag4",
                 "category": "category4",
-                "notes": "tag4 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag4 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag5",
                 "category": "category5",
-                "notes": "tag5 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag5 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               }
+            ]
+          }
+        ],
+        "definitions": [
+          {
+            "index": 0,
+            "headwordIndices": [
+              0
             ],
-            "frequencies": [
+            "dictionary": "Test Dictionary 2",
+            "tags": [
               {
-                "index": 0,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打つ",
-                "reading": "ぶつ",
-                "hasReading": false,
-                "frequency": 2
+                "name": "tag1",
+                "category": "category1",
+                "order": 0,
+                "score": 0,
+                "content": [
+                  "tag1 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
+                "redundant": false
               },
               {
-                "index": 1,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打つ",
-                "reading": "ぶつ",
-                "hasReading": true,
-                "frequency": 7
+                "name": "tag2",
+                "category": "category2",
+                "order": 0,
+                "score": 0,
+                "content": [
+                  "tag2 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
+                "redundant": false
               }
             ],
-            "pitches": []
-          }
-        ],
-        "glossary": [
-          "definition9",
-          "definition10"
-        ],
-        "definitionTags": [
-          {
-            "name": "tag1",
-            "category": "category1",
-            "notes": "tag1 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag2",
-            "category": "category2",
-            "notes": "tag2 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          }
-        ],
-        "termTags": [
-          {
-            "name": "tag3",
-            "category": "category3",
-            "notes": "tag3 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag4",
-            "category": "category4",
-            "notes": "tag4 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag5",
-            "category": "category5",
-            "notes": "tag5 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
+            "entries": [
+              "definition9",
+              "definition10"
+            ]
           }
         ],
+        "pronunciations": [],
         "frequencies": [
           {
             "index": 0,
-            "expressionIndex": 0,
+            "headwordIndex": 0,
             "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "expression": "打つ",
-            "reading": "ぶつ",
+            "dictionaryIndex": 0,
+            "dictionaryPriority": 0,
             "hasReading": false,
             "frequency": 2
           },
           {
             "index": 1,
-            "expressionIndex": 0,
+            "headwordIndex": 0,
             "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "expression": "打つ",
-            "reading": "ぶつ",
+            "dictionaryIndex": 0,
+            "dictionaryPriority": 0,
             "hasReading": true,
             "frequency": 7
           }
-        ],
-        "pitches": [],
-        "sourceTermExactMatchCount": 0
+        ]
       },
       {
         "type": "term",
         "id": 6,
-        "source": "ぶち",
-        "rawSource": "ぶち",
-        "sourceTerm": "ぶつ",
-        "reasons": [
-          "masu stem"
-        ],
-        "score": 1,
         "isPrimary": true,
         "sequence": 3,
-        "dictionary": "Test Dictionary 2",
-        "dictionaryOrder": {
-          "index": 0,
-          "priority": 0
-        },
-        "dictionaryNames": [
-          "Test Dictionary 2"
+        "inflections": [
+          "masu stem"
         ],
-        "expression": "打つ",
-        "reading": "ぶつ",
-        "expressions": [
+        "score": 1,
+        "dictionaryIndex": 0,
+        "dictionaryPriority": 0,
+        "sourceTermExactMatchCount": 0,
+        "maxDeinflectedTextLength": 2,
+        "headwords": [
           {
-            "sourceTerm": "ぶつ",
-            "expression": "打つ",
+            "index": 0,
+            "term": "打つ",
             "reading": "ぶつ",
-            "termTags": [
+            "sources": [
+              {
+                "originalText": "ぶち",
+                "transformedText": "ぶち",
+                "deinflectedText": "ぶつ",
+                "isPrimary": true
+              }
+            ],
+            "tags": [
               {
                 "name": "tag3",
                 "category": "category3",
-                "notes": "tag3 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag3 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag4",
                 "category": "category4",
-                "notes": "tag4 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag4 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag5",
                 "category": "category5",
-                "notes": "tag5 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag5 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               }
+            ]
+          }
+        ],
+        "definitions": [
+          {
+            "index": 0,
+            "headwordIndices": [
+              0
             ],
-            "frequencies": [
+            "dictionary": "Test Dictionary 2",
+            "tags": [
               {
-                "index": 0,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打つ",
-                "reading": "ぶつ",
-                "hasReading": false,
-                "frequency": 2
+                "name": "tag1",
+                "category": "category1",
+                "order": 0,
+                "score": 0,
+                "content": [
+                  "tag1 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
+                "redundant": false
               },
               {
-                "index": 1,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打つ",
-                "reading": "ぶつ",
-                "hasReading": true,
-                "frequency": 7
+                "name": "tag2",
+                "category": "category2",
+                "order": 0,
+                "score": 0,
+                "content": [
+                  "tag2 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
+                "redundant": false
               }
             ],
-            "pitches": []
-          }
-        ],
-        "glossary": [
-          "definition11",
-          "definition12"
-        ],
-        "definitionTags": [
-          {
-            "name": "tag1",
-            "category": "category1",
-            "notes": "tag1 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag2",
-            "category": "category2",
-            "notes": "tag2 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          }
-        ],
-        "termTags": [
-          {
-            "name": "tag3",
-            "category": "category3",
-            "notes": "tag3 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag4",
-            "category": "category4",
-            "notes": "tag4 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag5",
-            "category": "category5",
-            "notes": "tag5 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
+            "entries": [
+              "definition11",
+              "definition12"
+            ]
           }
         ],
+        "pronunciations": [],
         "frequencies": [
           {
             "index": 0,
-            "expressionIndex": 0,
+            "headwordIndex": 0,
             "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "expression": "打つ",
-            "reading": "ぶつ",
+            "dictionaryIndex": 0,
+            "dictionaryPriority": 0,
             "hasReading": false,
             "frequency": 2
           },
           {
             "index": 1,
-            "expressionIndex": 0,
+            "headwordIndex": 0,
             "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "expression": "打つ",
-            "reading": "ぶつ",
+            "dictionaryIndex": 0,
+            "dictionaryPriority": 0,
             "hasReading": true,
             "frequency": 7
           }
-        ],
-        "pitches": [],
-        "sourceTermExactMatchCount": 0
+        ]
       }
     ]
   },
   {
     "name": "Find term using reading 7",
-    "length": 3,
-    "definitions": [
+    "originalTextLength": 3,
+    "dictionaryEntries": [
       {
         "type": "term",
         "id": 11,
-        "source": "がぞう",
-        "rawSource": "がぞう",
-        "sourceTerm": "がぞう",
-        "reasons": [],
-        "score": 1,
         "isPrimary": true,
         "sequence": 5,
-        "dictionary": "Test Dictionary 2",
-        "dictionaryOrder": {
-          "index": 0,
-          "priority": 0
-        },
-        "dictionaryNames": [
-          "Test Dictionary 2"
-        ],
-        "expression": "画像",
-        "reading": "がぞう",
-        "expressions": [
+        "inflections": [],
+        "score": 1,
+        "dictionaryIndex": 0,
+        "dictionaryPriority": 0,
+        "sourceTermExactMatchCount": 0,
+        "maxDeinflectedTextLength": 3,
+        "headwords": [
           {
-            "sourceTerm": "がぞう",
-            "expression": "画像",
+            "index": 0,
+            "term": "画像",
             "reading": "がぞう",
-            "termTags": [
+            "sources": [
+              {
+                "originalText": "がぞう",
+                "transformedText": "がぞう",
+                "deinflectedText": "がぞう",
+                "isPrimary": true
+              }
+            ],
+            "tags": [
               {
                 "name": "tag3",
                 "category": "category3",
-                "notes": "tag3 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag3 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag4",
                 "category": "category4",
-                "notes": "tag4 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag4 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag5",
                 "category": "category5",
-                "notes": "tag5 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag5 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               }
-            ],
-            "frequencies": [],
-            "pitches": []
-          }
-        ],
-        "glossary": [
-          "definition21",
-          {
-            "type": "image",
-            "path": "image.gif",
-            "width": 100,
-            "height": 100,
-            "preferredWidth": 350,
-            "preferredHeight": 350,
-            "description": "An image",
-            "pixelated": true
-          }
-        ],
-        "definitionTags": [
-          {
-            "name": "tag1",
-            "category": "category1",
-            "notes": "tag1 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag2",
-            "category": "category2",
-            "notes": "tag2 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
+            ]
           }
         ],
-        "termTags": [
-          {
-            "name": "tag3",
-            "category": "category3",
-            "notes": "tag3 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag4",
-            "category": "category4",
-            "notes": "tag4 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
+        "definitions": [
           {
-            "name": "tag5",
-            "category": "category5",
-            "notes": "tag5 notes",
-            "order": 0,
-            "score": 0,
+            "index": 0,
+            "headwordIndices": [
+              0
+            ],
             "dictionary": "Test Dictionary 2",
-            "redundant": false
+            "tags": [
+              {
+                "name": "tag1",
+                "category": "category1",
+                "order": 0,
+                "score": 0,
+                "content": [
+                  "tag1 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
+                "redundant": false
+              },
+              {
+                "name": "tag2",
+                "category": "category2",
+                "order": 0,
+                "score": 0,
+                "content": [
+                  "tag2 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
+                "redundant": false
+              }
+            ],
+            "entries": [
+              "definition21",
+              {
+                "type": "image",
+                "path": "image.gif",
+                "width": 100,
+                "height": 100,
+                "preferredWidth": 350,
+                "preferredHeight": 350,
+                "description": "An image",
+                "pixelated": true
+              }
+            ]
           }
         ],
-        "frequencies": [],
-        "pitches": [],
-        "sourceTermExactMatchCount": 0
+        "pronunciations": [],
+        "frequencies": []
       }
     ]
   },
   {
     "name": "Missing term 1",
-    "length": 0,
-    "definitions": []
+    "originalTextLength": 0,
+    "dictionaryEntries": []
   },
   {
     "name": "Missing term ２",
-    "length": 0,
-    "definitions": []
+    "originalTextLength": 0,
+    "dictionaryEntries": []
   },
   {
     "name": "Search using different modes",
-    "length": 4,
-    "definitions": [
+    "originalTextLength": 4,
+    "dictionaryEntries": [
       {
         "type": "term",
         "id": 7,
-        "source": "打ち込む",
-        "rawSource": "打ち込む",
-        "sourceTerm": "打ち込む",
-        "reasons": [],
-        "score": 10,
         "isPrimary": true,
         "sequence": 4,
-        "dictionary": "Test Dictionary 2",
-        "dictionaryOrder": {
-          "index": 0,
-          "priority": 0
-        },
-        "dictionaryNames": [
-          "Test Dictionary 2"
-        ],
-        "expression": "打ち込む",
-        "reading": "うちこむ",
-        "expressions": [
+        "inflections": [],
+        "score": 10,
+        "dictionaryIndex": 0,
+        "dictionaryPriority": 0,
+        "sourceTermExactMatchCount": 1,
+        "maxDeinflectedTextLength": 4,
+        "headwords": [
           {
-            "sourceTerm": "打ち込む",
-            "expression": "打ち込む",
+            "index": 0,
+            "term": "打ち込む",
             "reading": "うちこむ",
-            "termTags": [
+            "sources": [
               {
-                "name": "tag3",
-                "category": "category3",
-                "notes": "tag3 notes",
-                "order": 0,
-                "score": 0,
-                "dictionary": "Test Dictionary 2",
-                "redundant": false
-              },
-              {
-                "name": "tag4",
-                "category": "category4",
-                "notes": "tag4 notes",
-                "order": 0,
-                "score": 0,
-                "dictionary": "Test Dictionary 2",
-                "redundant": false
-              },
-              {
-                "name": "tag5",
-                "category": "category5",
-                "notes": "tag5 notes",
-                "order": 0,
-                "score": 0,
-                "dictionary": "Test Dictionary 2",
-                "redundant": false
+                "originalText": "打ち込む",
+                "transformedText": "打ち込む",
+                "deinflectedText": "打ち込む",
+                "isPrimary": true
               }
             ],
-            "frequencies": [],
-            "pitches": []
+            "tags": []
           }
         ],
-        "glossary": [
-          "definition13",
-          "definition14"
-        ],
-        "definitionTags": [
-          {
-            "name": "tag1",
-            "category": "category1",
-            "notes": "tag1 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag2",
-            "category": "category2",
-            "notes": "tag2 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          }
-        ],
-        "termTags": [
-          {
-            "name": "tag3",
-            "category": "category3",
-            "notes": "tag3 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag4",
-            "category": "category4",
-            "notes": "tag4 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
+        "definitions": [
           {
-            "name": "tag5",
-            "category": "category5",
-            "notes": "tag5 notes",
-            "order": 0,
-            "score": 0,
+            "index": 0,
+            "headwordIndices": [
+              0
+            ],
             "dictionary": "Test Dictionary 2",
-            "redundant": false
+            "tags": [],
+            "entries": [
+              "definition13",
+              "definition14"
+            ]
           }
         ],
-        "frequencies": [],
-        "pitches": [],
-        "sourceTermExactMatchCount": 1
+        "pronunciations": [],
+        "frequencies": []
       },
       {
         "type": "term",
         "id": 9,
-        "source": "打ち込む",
-        "rawSource": "打ち込む",
-        "sourceTerm": "打ち込む",
-        "reasons": [],
-        "score": 10,
         "isPrimary": true,
         "sequence": 4,
-        "dictionary": "Test Dictionary 2",
-        "dictionaryOrder": {
-          "index": 0,
-          "priority": 0
-        },
-        "dictionaryNames": [
-          "Test Dictionary 2"
-        ],
-        "expression": "打ち込む",
-        "reading": "ぶちこむ",
-        "expressions": [
+        "inflections": [],
+        "score": 10,
+        "dictionaryIndex": 0,
+        "dictionaryPriority": 0,
+        "sourceTermExactMatchCount": 1,
+        "maxDeinflectedTextLength": 4,
+        "headwords": [
           {
-            "sourceTerm": "打ち込む",
-            "expression": "打ち込む",
+            "index": 0,
+            "term": "打ち込む",
             "reading": "ぶちこむ",
-            "termTags": [
-              {
-                "name": "tag3",
-                "category": "category3",
-                "notes": "tag3 notes",
-                "order": 0,
-                "score": 0,
-                "dictionary": "Test Dictionary 2",
-                "redundant": false
-              },
-              {
-                "name": "tag4",
-                "category": "category4",
-                "notes": "tag4 notes",
-                "order": 0,
-                "score": 0,
-                "dictionary": "Test Dictionary 2",
-                "redundant": false
-              },
+            "sources": [
               {
-                "name": "tag5",
-                "category": "category5",
-                "notes": "tag5 notes",
-                "order": 0,
-                "score": 0,
-                "dictionary": "Test Dictionary 2",
-                "redundant": false
+                "originalText": "打ち込む",
+                "transformedText": "打ち込む",
+                "deinflectedText": "打ち込む",
+                "isPrimary": true
               }
             ],
-            "frequencies": [],
-            "pitches": []
+            "tags": []
           }
         ],
-        "glossary": [
-          "definition17",
-          "definition18"
-        ],
-        "definitionTags": [
-          {
-            "name": "tag1",
-            "category": "category1",
-            "notes": "tag1 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag2",
-            "category": "category2",
-            "notes": "tag2 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          }
-        ],
-        "termTags": [
-          {
-            "name": "tag3",
-            "category": "category3",
-            "notes": "tag3 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag4",
-            "category": "category4",
-            "notes": "tag4 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
+        "definitions": [
           {
-            "name": "tag5",
-            "category": "category5",
-            "notes": "tag5 notes",
-            "order": 0,
-            "score": 0,
+            "index": 0,
+            "headwordIndices": [
+              0
+            ],
             "dictionary": "Test Dictionary 2",
-            "redundant": false
+            "tags": [],
+            "entries": [
+              "definition17",
+              "definition18"
+            ]
           }
         ],
-        "frequencies": [],
-        "pitches": [],
-        "sourceTermExactMatchCount": 1
+        "pronunciations": [],
+        "frequencies": []
       },
       {
         "type": "term",
         "id": 8,
-        "source": "打ち込む",
-        "rawSource": "打ち込む",
-        "sourceTerm": "打ち込む",
-        "reasons": [],
-        "score": 1,
         "isPrimary": true,
         "sequence": 4,
-        "dictionary": "Test Dictionary 2",
-        "dictionaryOrder": {
-          "index": 0,
-          "priority": 0
-        },
-        "dictionaryNames": [
-          "Test Dictionary 2"
-        ],
-        "expression": "打ち込む",
-        "reading": "うちこむ",
-        "expressions": [
+        "inflections": [],
+        "score": 1,
+        "dictionaryIndex": 0,
+        "dictionaryPriority": 0,
+        "sourceTermExactMatchCount": 1,
+        "maxDeinflectedTextLength": 4,
+        "headwords": [
           {
-            "sourceTerm": "打ち込む",
-            "expression": "打ち込む",
+            "index": 0,
+            "term": "打ち込む",
             "reading": "うちこむ",
-            "termTags": [
+            "sources": [
               {
-                "name": "tag5",
-                "category": "category5",
-                "notes": "tag5 notes",
-                "order": 0,
-                "score": 0,
-                "dictionary": "Test Dictionary 2",
-                "redundant": false
-              },
-              {
-                "name": "tag6",
-                "category": "default",
-                "notes": "",
-                "order": 0,
-                "score": 0,
-                "dictionary": "Test Dictionary 2",
-                "redundant": false
-              },
-              {
-                "name": "tag7",
-                "category": "default",
-                "notes": "",
-                "order": 0,
-                "score": 0,
-                "dictionary": "Test Dictionary 2",
-                "redundant": false
+                "originalText": "打ち込む",
+                "transformedText": "打ち込む",
+                "deinflectedText": "打ち込む",
+                "isPrimary": true
               }
             ],
-            "frequencies": [],
-            "pitches": []
-          }
-        ],
-        "glossary": [
-          "definition15",
-          "definition16"
-        ],
-        "definitionTags": [
-          {
-            "name": "tag1",
-            "category": "category1",
-            "notes": "tag1 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag2",
-            "category": "category2",
-            "notes": "tag2 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
+            "tags": []
           }
         ],
-        "termTags": [
-          {
-            "name": "tag5",
-            "category": "category5",
-            "notes": "tag5 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag6",
-            "category": "default",
-            "notes": "",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
+        "definitions": [
           {
-            "name": "tag7",
-            "category": "default",
-            "notes": "",
-            "order": 0,
-            "score": 0,
+            "index": 0,
+            "headwordIndices": [
+              0
+            ],
             "dictionary": "Test Dictionary 2",
-            "redundant": false
+            "tags": [],
+            "entries": [
+              "definition15",
+              "definition16"
+            ]
           }
         ],
-        "frequencies": [],
-        "pitches": [],
-        "sourceTermExactMatchCount": 1
+        "pronunciations": [],
+        "frequencies": []
       },
       {
         "type": "term",
         "id": 10,
-        "source": "打ち込む",
-        "rawSource": "打ち込む",
-        "sourceTerm": "打ち込む",
-        "reasons": [],
-        "score": 1,
         "isPrimary": true,
         "sequence": 4,
-        "dictionary": "Test Dictionary 2",
-        "dictionaryOrder": {
-          "index": 0,
-          "priority": 0
-        },
-        "dictionaryNames": [
-          "Test Dictionary 2"
-        ],
-        "expression": "打ち込む",
-        "reading": "ぶちこむ",
-        "expressions": [
+        "inflections": [],
+        "score": 1,
+        "dictionaryIndex": 0,
+        "dictionaryPriority": 0,
+        "sourceTermExactMatchCount": 1,
+        "maxDeinflectedTextLength": 4,
+        "headwords": [
           {
-            "sourceTerm": "打ち込む",
-            "expression": "打ち込む",
+            "index": 0,
+            "term": "打ち込む",
             "reading": "ぶちこむ",
-            "termTags": [
+            "sources": [
               {
-                "name": "tag3",
-                "category": "category3",
-                "notes": "tag3 notes",
-                "order": 0,
-                "score": 0,
-                "dictionary": "Test Dictionary 2",
-                "redundant": false
-              },
-              {
-                "name": "tag4",
-                "category": "category4",
-                "notes": "tag4 notes",
-                "order": 0,
-                "score": 0,
-                "dictionary": "Test Dictionary 2",
-                "redundant": false
-              },
-              {
-                "name": "tag5",
-                "category": "category5",
-                "notes": "tag5 notes",
-                "order": 0,
-                "score": 0,
-                "dictionary": "Test Dictionary 2",
-                "redundant": false
+                "originalText": "打ち込む",
+                "transformedText": "打ち込む",
+                "deinflectedText": "打ち込む",
+                "isPrimary": true
               }
             ],
-            "frequencies": [],
-            "pitches": []
+            "tags": []
           }
         ],
-        "glossary": [
-          "definition19",
-          "definition20"
-        ],
-        "definitionTags": [
-          {
-            "name": "tag1",
-            "category": "category1",
-            "notes": "tag1 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag2",
-            "category": "category2",
-            "notes": "tag2 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          }
-        ],
-        "termTags": [
-          {
-            "name": "tag3",
-            "category": "category3",
-            "notes": "tag3 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag4",
-            "category": "category4",
-            "notes": "tag4 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
+        "definitions": [
           {
-            "name": "tag5",
-            "category": "category5",
-            "notes": "tag5 notes",
-            "order": 0,
-            "score": 0,
+            "index": 0,
+            "headwordIndices": [
+              0
+            ],
             "dictionary": "Test Dictionary 2",
-            "redundant": false
+            "tags": [],
+            "entries": [
+              "definition19",
+              "definition20"
+            ]
           }
         ],
-        "frequencies": [],
-        "pitches": [],
-        "sourceTermExactMatchCount": 1
+        "pronunciations": [],
+        "frequencies": []
       },
       {
         "type": "term",
         "id": 3,
-        "source": "打ち",
-        "rawSource": "打ち",
-        "sourceTerm": "打つ",
-        "reasons": [
-          "masu stem"
-        ],
-        "score": 10,
         "isPrimary": true,
         "sequence": 3,
-        "dictionary": "Test Dictionary 2",
-        "dictionaryOrder": {
-          "index": 0,
-          "priority": 0
-        },
-        "dictionaryNames": [
-          "Test Dictionary 2"
+        "inflections": [
+          "masu stem"
         ],
-        "expression": "打つ",
-        "reading": "うつ",
-        "expressions": [
+        "score": 10,
+        "dictionaryIndex": 0,
+        "dictionaryPriority": 0,
+        "sourceTermExactMatchCount": 1,
+        "maxDeinflectedTextLength": 2,
+        "headwords": [
           {
-            "sourceTerm": "打つ",
-            "expression": "打つ",
+            "index": 0,
+            "term": "打つ",
             "reading": "うつ",
-            "termTags": [
+            "sources": [
               {
-                "name": "tag3",
-                "category": "category3",
-                "notes": "tag3 notes",
-                "order": 0,
-                "score": 0,
-                "dictionary": "Test Dictionary 2",
-                "redundant": false
-              },
-              {
-                "name": "tag4",
-                "category": "category4",
-                "notes": "tag4 notes",
-                "order": 0,
-                "score": 0,
-                "dictionary": "Test Dictionary 2",
-                "redundant": false
-              },
-              {
-                "name": "tag5",
-                "category": "category5",
-                "notes": "tag5 notes",
-                "order": 0,
-                "score": 0,
-                "dictionary": "Test Dictionary 2",
-                "redundant": false
+                "originalText": "打ち",
+                "transformedText": "打ち",
+                "deinflectedText": "打つ",
+                "isPrimary": true
               }
             ],
-            "frequencies": [],
-            "pitches": []
-          }
-        ],
-        "glossary": [
-          "definition5",
-          "definition6"
-        ],
-        "definitionTags": [
-          {
-            "name": "tag1",
-            "category": "category1",
-            "notes": "tag1 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag2",
-            "category": "category2",
-            "notes": "tag2 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
+            "tags": []
           }
         ],
-        "termTags": [
-          {
-            "name": "tag3",
-            "category": "category3",
-            "notes": "tag3 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag4",
-            "category": "category4",
-            "notes": "tag4 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
+        "definitions": [
           {
-            "name": "tag5",
-            "category": "category5",
-            "notes": "tag5 notes",
-            "order": 0,
-            "score": 0,
+            "index": 0,
+            "headwordIndices": [
+              0
+            ],
             "dictionary": "Test Dictionary 2",
-            "redundant": false
+            "tags": [],
+            "entries": [
+              "definition5",
+              "definition6"
+            ]
           }
         ],
-        "frequencies": [],
-        "pitches": [],
-        "sourceTermExactMatchCount": 1
+        "pronunciations": [],
+        "frequencies": []
       },
       {
         "type": "term",
         "id": 5,
-        "source": "打ち",
-        "rawSource": "打ち",
-        "sourceTerm": "打つ",
-        "reasons": [
-          "masu stem"
-        ],
-        "score": 10,
         "isPrimary": true,
         "sequence": 3,
-        "dictionary": "Test Dictionary 2",
-        "dictionaryOrder": {
-          "index": 0,
-          "priority": 0
-        },
-        "dictionaryNames": [
-          "Test Dictionary 2"
+        "inflections": [
+          "masu stem"
         ],
-        "expression": "打つ",
-        "reading": "ぶつ",
-        "expressions": [
+        "score": 10,
+        "dictionaryIndex": 0,
+        "dictionaryPriority": 0,
+        "sourceTermExactMatchCount": 1,
+        "maxDeinflectedTextLength": 2,
+        "headwords": [
           {
-            "sourceTerm": "打つ",
-            "expression": "打つ",
+            "index": 0,
+            "term": "打つ",
             "reading": "ぶつ",
-            "termTags": [
+            "sources": [
               {
-                "name": "tag3",
-                "category": "category3",
-                "notes": "tag3 notes",
-                "order": 0,
-                "score": 0,
-                "dictionary": "Test Dictionary 2",
-                "redundant": false
-              },
-              {
-                "name": "tag4",
-                "category": "category4",
-                "notes": "tag4 notes",
-                "order": 0,
-                "score": 0,
-                "dictionary": "Test Dictionary 2",
-                "redundant": false
-              },
-              {
-                "name": "tag5",
-                "category": "category5",
-                "notes": "tag5 notes",
-                "order": 0,
-                "score": 0,
-                "dictionary": "Test Dictionary 2",
-                "redundant": false
+                "originalText": "打ち",
+                "transformedText": "打ち",
+                "deinflectedText": "打つ",
+                "isPrimary": true
               }
             ],
-            "frequencies": [],
-            "pitches": []
+            "tags": []
           }
         ],
-        "glossary": [
-          "definition9",
-          "definition10"
-        ],
-        "definitionTags": [
-          {
-            "name": "tag1",
-            "category": "category1",
-            "notes": "tag1 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag2",
-            "category": "category2",
-            "notes": "tag2 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          }
-        ],
-        "termTags": [
-          {
-            "name": "tag3",
-            "category": "category3",
-            "notes": "tag3 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag4",
-            "category": "category4",
-            "notes": "tag4 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
+        "definitions": [
           {
-            "name": "tag5",
-            "category": "category5",
-            "notes": "tag5 notes",
-            "order": 0,
-            "score": 0,
+            "index": 0,
+            "headwordIndices": [
+              0
+            ],
             "dictionary": "Test Dictionary 2",
-            "redundant": false
+            "tags": [],
+            "entries": [
+              "definition9",
+              "definition10"
+            ]
           }
         ],
-        "frequencies": [],
-        "pitches": [],
-        "sourceTermExactMatchCount": 1
+        "pronunciations": [],
+        "frequencies": []
       },
       {
         "type": "term",
         "id": 4,
-        "source": "打ち",
-        "rawSource": "打ち",
-        "sourceTerm": "打つ",
-        "reasons": [
-          "masu stem"
-        ],
-        "score": 1,
         "isPrimary": true,
         "sequence": 3,
-        "dictionary": "Test Dictionary 2",
-        "dictionaryOrder": {
-          "index": 0,
-          "priority": 0
-        },
-        "dictionaryNames": [
-          "Test Dictionary 2"
+        "inflections": [
+          "masu stem"
         ],
-        "expression": "打つ",
-        "reading": "うつ",
-        "expressions": [
+        "score": 1,
+        "dictionaryIndex": 0,
+        "dictionaryPriority": 0,
+        "sourceTermExactMatchCount": 1,
+        "maxDeinflectedTextLength": 2,
+        "headwords": [
           {
-            "sourceTerm": "打つ",
-            "expression": "打つ",
+            "index": 0,
+            "term": "打つ",
             "reading": "うつ",
-            "termTags": [
-              {
-                "name": "tag3",
-                "category": "category3",
-                "notes": "tag3 notes",
-                "order": 0,
-                "score": 0,
-                "dictionary": "Test Dictionary 2",
-                "redundant": false
-              },
-              {
-                "name": "tag4",
-                "category": "category4",
-                "notes": "tag4 notes",
-                "order": 0,
-                "score": 0,
-                "dictionary": "Test Dictionary 2",
-                "redundant": false
-              },
+            "sources": [
               {
-                "name": "tag5",
-                "category": "category5",
-                "notes": "tag5 notes",
-                "order": 0,
-                "score": 0,
-                "dictionary": "Test Dictionary 2",
-                "redundant": false
+                "originalText": "打ち",
+                "transformedText": "打ち",
+                "deinflectedText": "打つ",
+                "isPrimary": true
               }
             ],
-            "frequencies": [],
-            "pitches": []
-          }
-        ],
-        "glossary": [
-          "definition7",
-          "definition8"
-        ],
-        "definitionTags": [
-          {
-            "name": "tag1",
-            "category": "category1",
-            "notes": "tag1 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag2",
-            "category": "category2",
-            "notes": "tag2 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
+            "tags": []
           }
         ],
-        "termTags": [
-          {
-            "name": "tag3",
-            "category": "category3",
-            "notes": "tag3 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag4",
-            "category": "category4",
-            "notes": "tag4 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
+        "definitions": [
           {
-            "name": "tag5",
-            "category": "category5",
-            "notes": "tag5 notes",
-            "order": 0,
-            "score": 0,
+            "index": 0,
+            "headwordIndices": [
+              0
+            ],
             "dictionary": "Test Dictionary 2",
-            "redundant": false
+            "tags": [],
+            "entries": [
+              "definition7",
+              "definition8"
+            ]
           }
         ],
-        "frequencies": [],
-        "pitches": [],
-        "sourceTermExactMatchCount": 1
+        "pronunciations": [],
+        "frequencies": []
       },
       {
         "type": "term",
         "id": 6,
-        "source": "打ち",
-        "rawSource": "打ち",
-        "sourceTerm": "打つ",
-        "reasons": [
-          "masu stem"
-        ],
-        "score": 1,
         "isPrimary": true,
         "sequence": 3,
-        "dictionary": "Test Dictionary 2",
-        "dictionaryOrder": {
-          "index": 0,
-          "priority": 0
-        },
-        "dictionaryNames": [
-          "Test Dictionary 2"
+        "inflections": [
+          "masu stem"
         ],
-        "expression": "打つ",
-        "reading": "ぶつ",
-        "expressions": [
+        "score": 1,
+        "dictionaryIndex": 0,
+        "dictionaryPriority": 0,
+        "sourceTermExactMatchCount": 1,
+        "maxDeinflectedTextLength": 2,
+        "headwords": [
           {
-            "sourceTerm": "打つ",
-            "expression": "打つ",
+            "index": 0,
+            "term": "打つ",
             "reading": "ぶつ",
-            "termTags": [
+            "sources": [
               {
-                "name": "tag3",
-                "category": "category3",
-                "notes": "tag3 notes",
-                "order": 0,
-                "score": 0,
-                "dictionary": "Test Dictionary 2",
-                "redundant": false
-              },
-              {
-                "name": "tag4",
-                "category": "category4",
-                "notes": "tag4 notes",
-                "order": 0,
-                "score": 0,
-                "dictionary": "Test Dictionary 2",
-                "redundant": false
-              },
-              {
-                "name": "tag5",
-                "category": "category5",
-                "notes": "tag5 notes",
-                "order": 0,
-                "score": 0,
-                "dictionary": "Test Dictionary 2",
-                "redundant": false
+                "originalText": "打ち",
+                "transformedText": "打ち",
+                "deinflectedText": "打つ",
+                "isPrimary": true
               }
             ],
-            "frequencies": [],
-            "pitches": []
+            "tags": []
           }
         ],
-        "glossary": [
-          "definition11",
-          "definition12"
-        ],
-        "definitionTags": [
-          {
-            "name": "tag1",
-            "category": "category1",
-            "notes": "tag1 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag2",
-            "category": "category2",
-            "notes": "tag2 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          }
-        ],
-        "termTags": [
-          {
-            "name": "tag3",
-            "category": "category3",
-            "notes": "tag3 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag4",
-            "category": "category4",
-            "notes": "tag4 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
+        "definitions": [
           {
-            "name": "tag5",
-            "category": "category5",
-            "notes": "tag5 notes",
-            "order": 0,
-            "score": 0,
+            "index": 0,
+            "headwordIndices": [
+              0
+            ],
             "dictionary": "Test Dictionary 2",
-            "redundant": false
+            "tags": [],
+            "entries": [
+              "definition11",
+              "definition12"
+            ]
           }
         ],
-        "frequencies": [],
-        "pitches": [],
-        "sourceTermExactMatchCount": 1
+        "pronunciations": [],
+        "frequencies": []
       },
       {
         "type": "term",
         "id": 1,
-        "source": "打",
-        "rawSource": "打",
-        "sourceTerm": "打",
-        "reasons": [],
-        "score": 1,
         "isPrimary": true,
         "sequence": 1,
-        "dictionary": "Test Dictionary 2",
-        "dictionaryOrder": {
-          "index": 0,
-          "priority": 0
-        },
-        "dictionaryNames": [
-          "Test Dictionary 2"
-        ],
-        "expression": "打",
-        "reading": "だ",
-        "expressions": [
+        "inflections": [],
+        "score": 1,
+        "dictionaryIndex": 0,
+        "dictionaryPriority": 0,
+        "sourceTermExactMatchCount": 1,
+        "maxDeinflectedTextLength": 1,
+        "headwords": [
           {
-            "sourceTerm": "打",
-            "expression": "打",
+            "index": 0,
+            "term": "打",
             "reading": "だ",
-            "termTags": [
-              {
-                "name": "tag3",
-                "category": "category3",
-                "notes": "tag3 notes",
-                "order": 0,
-                "score": 0,
-                "dictionary": "Test Dictionary 2",
-                "redundant": false
-              },
-              {
-                "name": "tag4",
-                "category": "category4",
-                "notes": "tag4 notes",
-                "order": 0,
-                "score": 0,
-                "dictionary": "Test Dictionary 2",
-                "redundant": false
-              },
+            "sources": [
               {
-                "name": "tag5",
-                "category": "category5",
-                "notes": "tag5 notes",
-                "order": 0,
-                "score": 0,
-                "dictionary": "Test Dictionary 2",
-                "redundant": false
+                "originalText": "打",
+                "transformedText": "打",
+                "deinflectedText": "打",
+                "isPrimary": true
               }
             ],
-            "frequencies": [],
-            "pitches": []
-          }
-        ],
-        "glossary": [
-          "definition1",
-          "definition2"
-        ],
-        "definitionTags": [
-          {
-            "name": "tag1",
-            "category": "category1",
-            "notes": "tag1 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag2",
-            "category": "category2",
-            "notes": "tag2 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
+            "tags": []
           }
         ],
-        "termTags": [
-          {
-            "name": "tag3",
-            "category": "category3",
-            "notes": "tag3 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag4",
-            "category": "category4",
-            "notes": "tag4 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
+        "definitions": [
           {
-            "name": "tag5",
-            "category": "category5",
-            "notes": "tag5 notes",
-            "order": 0,
-            "score": 0,
+            "index": 0,
+            "headwordIndices": [
+              0
+            ],
             "dictionary": "Test Dictionary 2",
-            "redundant": false
+            "tags": [],
+            "entries": [
+              "definition1",
+              "definition2"
+            ]
           }
         ],
-        "frequencies": [],
-        "pitches": [],
-        "sourceTermExactMatchCount": 1
+        "pronunciations": [],
+        "frequencies": []
       },
       {
         "type": "term",
         "id": 2,
-        "source": "打",
-        "rawSource": "打",
-        "sourceTerm": "打",
-        "reasons": [],
-        "score": 1,
         "isPrimary": true,
         "sequence": 2,
-        "dictionary": "Test Dictionary 2",
-        "dictionaryOrder": {
-          "index": 0,
-          "priority": 0
-        },
-        "dictionaryNames": [
-          "Test Dictionary 2"
-        ],
-        "expression": "打",
-        "reading": "ダース",
-        "expressions": [
+        "inflections": [],
+        "score": 1,
+        "dictionaryIndex": 0,
+        "dictionaryPriority": 0,
+        "sourceTermExactMatchCount": 1,
+        "maxDeinflectedTextLength": 1,
+        "headwords": [
           {
-            "sourceTerm": "打",
-            "expression": "打",
+            "index": 0,
+            "term": "打",
             "reading": "ダース",
-            "termTags": [
+            "sources": [
               {
-                "name": "tag3",
-                "category": "category3",
-                "notes": "tag3 notes",
-                "order": 0,
-                "score": 0,
-                "dictionary": "Test Dictionary 2",
-                "redundant": false
-              },
-              {
-                "name": "tag4",
-                "category": "category4",
-                "notes": "tag4 notes",
-                "order": 0,
-                "score": 0,
-                "dictionary": "Test Dictionary 2",
-                "redundant": false
-              },
-              {
-                "name": "tag5",
-                "category": "category5",
-                "notes": "tag5 notes",
-                "order": 0,
-                "score": 0,
-                "dictionary": "Test Dictionary 2",
-                "redundant": false
+                "originalText": "打",
+                "transformedText": "打",
+                "deinflectedText": "打",
+                "isPrimary": true
               }
             ],
-            "frequencies": [],
-            "pitches": []
-          }
-        ],
-        "glossary": [
-          "definition3",
-          "definition4"
-        ],
-        "definitionTags": [
-          {
-            "name": "tag1",
-            "category": "category1",
-            "notes": "tag1 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag2",
-            "category": "category2",
-            "notes": "tag2 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
+            "tags": []
           }
         ],
-        "termTags": [
-          {
-            "name": "tag3",
-            "category": "category3",
-            "notes": "tag3 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag4",
-            "category": "category4",
-            "notes": "tag4 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
+        "definitions": [
           {
-            "name": "tag5",
-            "category": "category5",
-            "notes": "tag5 notes",
-            "order": 0,
-            "score": 0,
+            "index": 0,
+            "headwordIndices": [
+              0
+            ],
             "dictionary": "Test Dictionary 2",
-            "redundant": false
+            "tags": [],
+            "entries": [
+              "definition3",
+              "definition4"
+            ]
           }
         ],
-        "frequencies": [],
-        "pitches": [],
-        "sourceTermExactMatchCount": 1
+        "pronunciations": [],
+        "frequencies": []
       }
     ]
   },
   {
     "name": "Search using different modes",
-    "length": 4,
-    "definitions": [
+    "originalTextLength": 4,
+    "dictionaryEntries": [
       {
-        "type": "termGrouped",
-        "source": "打ち込む",
-        "rawSource": "打ち込む",
-        "sourceTerm": "打ち込む",
-        "reasons": [],
+        "type": "term",
+        "id": -1,
+        "isPrimary": true,
+        "sequence": -1,
+        "inflections": [],
         "score": 10,
-        "dictionary": "Test Dictionary 2",
-        "dictionaryOrder": {
-          "index": 0,
-          "priority": 0
-        },
-        "dictionaryNames": [
-          "Test Dictionary 2"
-        ],
-        "expression": "打ち込む",
-        "reading": "うちこむ",
-        "expressions": [
+        "dictionaryIndex": 0,
+        "dictionaryPriority": 0,
+        "sourceTermExactMatchCount": 2,
+        "maxDeinflectedTextLength": 4,
+        "headwords": [
           {
-            "sourceTerm": "打ち込む",
-            "expression": "打ち込む",
+            "index": 0,
+            "term": "打ち込む",
             "reading": "うちこむ",
-            "termTags": [
+            "sources": [
+              {
+                "originalText": "打ち込む",
+                "transformedText": "打ち込む",
+                "deinflectedText": "打ち込む",
+                "isPrimary": true
+              }
+            ],
+            "tags": [
               {
                 "name": "tag3",
                 "category": "category3",
-                "notes": "tag3 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag3 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag4",
                 "category": "category4",
-                "notes": "tag4 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag4 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag5",
                 "category": "category5",
-                "notes": "tag5 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag5 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag6",
                 "category": "default",
-                "notes": "",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag7",
                 "category": "default",
-                "notes": "",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               }
-            ],
-            "frequencies": [
-              {
-                "index": 0,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打ち込む",
-                "reading": "うちこむ",
-                "hasReading": false,
-                "frequency": 3
-              },
-              {
-                "index": 1,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打ち込む",
-                "reading": "うちこむ",
-                "hasReading": true,
-                "frequency": 8
-              }
-            ],
-            "pitches": [
-              {
-                "index": 0,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打ち込む",
-                "reading": "うちこむ",
-                "pitches": [
-                  {
-                    "position": 0,
-                    "tags": []
-                  },
-                  {
-                    "position": 3,
-                    "tags": []
-                  }
-                ]
-              }
             ]
           }
         ],
-        "termTags": [
-          {
-            "name": "tag3",
-            "category": "category3",
-            "notes": "tag3 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag4",
-            "category": "category4",
-            "notes": "tag4 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag5",
-            "category": "category5",
-            "notes": "tag5 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag6",
-            "category": "default",
-            "notes": "",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag7",
-            "category": "default",
-            "notes": "",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          }
-        ],
         "definitions": [
           {
-            "type": "term",
-            "id": 7,
-            "source": "打ち込む",
-            "rawSource": "打ち込む",
-            "sourceTerm": "打ち込む",
-            "reasons": [],
-            "score": 10,
-            "isPrimary": true,
-            "sequence": 4,
-            "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "dictionaryNames": [
-              "Test Dictionary 2"
-            ],
-            "expression": "打ち込む",
-            "reading": "うちこむ",
-            "expressions": [
-              {
-                "sourceTerm": "打ち込む",
-                "expression": "打ち込む",
-                "reading": "うちこむ",
-                "termTags": [
-                  {
-                    "name": "tag3",
-                    "category": "category3",
-                    "notes": "tag3 notes",
-                    "order": 0,
-                    "score": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "redundant": false
-                  },
-                  {
-                    "name": "tag4",
-                    "category": "category4",
-                    "notes": "tag4 notes",
-                    "order": 0,
-                    "score": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "redundant": false
-                  },
-                  {
-                    "name": "tag5",
-                    "category": "category5",
-                    "notes": "tag5 notes",
-                    "order": 0,
-                    "score": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "redundant": false
-                  }
-                ],
-                "frequencies": [
-                  {
-                    "index": 0,
-                    "expressionIndex": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "dictionaryOrder": {
-                      "index": 0,
-                      "priority": 0
-                    },
-                    "expression": "打ち込む",
-                    "reading": "うちこむ",
-                    "hasReading": false,
-                    "frequency": 3
-                  },
-                  {
-                    "index": 1,
-                    "expressionIndex": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "dictionaryOrder": {
-                      "index": 0,
-                      "priority": 0
-                    },
-                    "expression": "打ち込む",
-                    "reading": "うちこむ",
-                    "hasReading": true,
-                    "frequency": 8
-                  }
-                ],
-                "pitches": [
-                  {
-                    "index": 0,
-                    "expressionIndex": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "dictionaryOrder": {
-                      "index": 0,
-                      "priority": 0
-                    },
-                    "expression": "打ち込む",
-                    "reading": "うちこむ",
-                    "pitches": [
-                      {
-                        "position": 0,
-                        "tags": []
-                      },
-                      {
-                        "position": 3,
-                        "tags": []
-                      }
-                    ]
-                  }
-                ]
-              }
-            ],
-            "glossary": [
-              "definition13",
-              "definition14"
+            "index": 0,
+            "headwordIndices": [
+              0
             ],
-            "definitionTags": [
+            "dictionary": "Test Dictionary 2",
+            "tags": [
               {
                 "name": "tag1",
                 "category": "category1",
-                "notes": "tag1 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag1 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag2",
                 "category": "category2",
-                "notes": "tag2 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
-                "redundant": false
-              }
-            ],
-            "termTags": [
-              {
-                "name": "tag3",
-                "category": "category3",
-                "notes": "tag3 notes",
-                "order": 0,
-                "score": 0,
-                "dictionary": "Test Dictionary 2",
-                "redundant": false
-              },
-              {
-                "name": "tag4",
-                "category": "category4",
-                "notes": "tag4 notes",
-                "order": 0,
-                "score": 0,
-                "dictionary": "Test Dictionary 2",
-                "redundant": false
-              },
-              {
-                "name": "tag5",
-                "category": "category5",
-                "notes": "tag5 notes",
-                "order": 0,
-                "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag2 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               }
             ],
-            "frequencies": [
-              {
-                "index": 0,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打ち込む",
-                "reading": "うちこむ",
-                "hasReading": false,
-                "frequency": 3
-              },
-              {
-                "index": 1,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打ち込む",
-                "reading": "うちこむ",
-                "hasReading": true,
-                "frequency": 8
-              }
-            ],
-            "pitches": [
-              {
-                "index": 0,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打ち込む",
-                "reading": "うちこむ",
-                "pitches": [
-                  {
-                    "position": 0,
-                    "tags": []
-                  },
-                  {
-                    "position": 3,
-                    "tags": []
-                  }
-                ]
-              }
-            ],
-            "sourceTermExactMatchCount": 1
+            "entries": [
+              "definition13",
+              "definition14"
+            ]
           },
           {
-            "type": "term",
-            "id": 8,
-            "source": "打ち込む",
-            "rawSource": "打ち込む",
-            "sourceTerm": "打ち込む",
-            "reasons": [],
-            "score": 1,
-            "isPrimary": true,
-            "sequence": 4,
-            "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "dictionaryNames": [
-              "Test Dictionary 2"
-            ],
-            "expression": "打ち込む",
-            "reading": "うちこむ",
-            "expressions": [
-              {
-                "sourceTerm": "打ち込む",
-                "expression": "打ち込む",
-                "reading": "うちこむ",
-                "termTags": [
-                  {
-                    "name": "tag5",
-                    "category": "category5",
-                    "notes": "tag5 notes",
-                    "order": 0,
-                    "score": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "redundant": false
-                  },
-                  {
-                    "name": "tag6",
-                    "category": "default",
-                    "notes": "",
-                    "order": 0,
-                    "score": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "redundant": false
-                  },
-                  {
-                    "name": "tag7",
-                    "category": "default",
-                    "notes": "",
-                    "order": 0,
-                    "score": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "redundant": false
-                  }
-                ],
-                "frequencies": [
-                  {
-                    "index": 0,
-                    "expressionIndex": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "dictionaryOrder": {
-                      "index": 0,
-                      "priority": 0
-                    },
-                    "expression": "打ち込む",
-                    "reading": "うちこむ",
-                    "hasReading": false,
-                    "frequency": 3
-                  },
-                  {
-                    "index": 1,
-                    "expressionIndex": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "dictionaryOrder": {
-                      "index": 0,
-                      "priority": 0
-                    },
-                    "expression": "打ち込む",
-                    "reading": "うちこむ",
-                    "hasReading": true,
-                    "frequency": 8
-                  }
-                ],
-                "pitches": [
-                  {
-                    "index": 0,
-                    "expressionIndex": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "dictionaryOrder": {
-                      "index": 0,
-                      "priority": 0
-                    },
-                    "expression": "打ち込む",
-                    "reading": "うちこむ",
-                    "pitches": [
-                      {
-                        "position": 0,
-                        "tags": []
-                      },
-                      {
-                        "position": 3,
-                        "tags": []
-                      }
-                    ]
-                  }
-                ]
-              }
-            ],
-            "glossary": [
-              "definition15",
-              "definition16"
+            "index": 1,
+            "headwordIndices": [
+              0
             ],
-            "definitionTags": [
+            "dictionary": "Test Dictionary 2",
+            "tags": [
               {
                 "name": "tag1",
                 "category": "category1",
-                "notes": "tag1 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag1 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag2",
                 "category": "category2",
-                "notes": "tag2 notes",
-                "order": 0,
-                "score": 0,
-                "dictionary": "Test Dictionary 2",
-                "redundant": false
-              }
-            ],
-            "termTags": [
-              {
-                "name": "tag5",
-                "category": "category5",
-                "notes": "tag5 notes",
-                "order": 0,
-                "score": 0,
-                "dictionary": "Test Dictionary 2",
-                "redundant": false
-              },
-              {
-                "name": "tag6",
-                "category": "default",
-                "notes": "",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
-                "redundant": false
-              },
-              {
-                "name": "tag7",
-                "category": "default",
-                "notes": "",
-                "order": 0,
-                "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag2 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               }
             ],
-            "frequencies": [
+            "entries": [
+              "definition15",
+              "definition16"
+            ]
+          }
+        ],
+        "pronunciations": [
+          {
+            "index": 0,
+            "headwordIndex": 0,
+            "dictionary": "Test Dictionary 2",
+            "dictionaryIndex": 0,
+            "dictionaryPriority": 0,
+            "pitches": [
               {
-                "index": 0,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打ち込む",
-                "reading": "うちこむ",
-                "hasReading": false,
-                "frequency": 3
+                "position": 0,
+                "tags": []
               },
               {
-                "index": 1,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打ち込む",
-                "reading": "うちこむ",
-                "hasReading": true,
-                "frequency": 8
+                "position": 3,
+                "tags": []
               }
-            ],
-            "pitches": [
-              {
-                "index": 0,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打ち込む",
-                "reading": "うちこむ",
-                "pitches": [
-                  {
-                    "position": 0,
-                    "tags": []
-                  },
-                  {
-                    "position": 3,
-                    "tags": []
-                  }
-                ]
-              }
-            ],
-            "sourceTermExactMatchCount": 1
+            ]
           }
         ],
         "frequencies": [
           {
             "index": 0,
-            "expressionIndex": 0,
+            "headwordIndex": 0,
             "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "expression": "打ち込む",
-            "reading": "うちこむ",
+            "dictionaryIndex": 0,
+            "dictionaryPriority": 0,
             "hasReading": false,
             "frequency": 3
           },
           {
             "index": 1,
-            "expressionIndex": 0,
+            "headwordIndex": 0,
             "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "expression": "打ち込む",
-            "reading": "うちこむ",
+            "dictionaryIndex": 0,
+            "dictionaryPriority": 0,
             "hasReading": true,
             "frequency": 8
           }
-        ],
-        "pitches": [
-          {
-            "index": 0,
-            "expressionIndex": 0,
-            "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "expression": "打ち込む",
-            "reading": "うちこむ",
-            "pitches": [
-              {
-                "position": 0,
-                "tags": []
-              },
-              {
-                "position": 3,
-                "tags": []
-              }
-            ]
-          }
-        ],
-        "sourceTermExactMatchCount": 1
+        ]
       },
       {
-        "type": "termGrouped",
-        "source": "打ち込む",
-        "rawSource": "打ち込む",
-        "sourceTerm": "打ち込む",
-        "reasons": [],
+        "type": "term",
+        "id": -1,
+        "isPrimary": true,
+        "sequence": -1,
+        "inflections": [],
         "score": 10,
-        "dictionary": "Test Dictionary 2",
-        "dictionaryOrder": {
-          "index": 0,
-          "priority": 0
-        },
-        "dictionaryNames": [
-          "Test Dictionary 2"
-        ],
-        "expression": "打ち込む",
-        "reading": "ぶちこむ",
-        "expressions": [
+        "dictionaryIndex": 0,
+        "dictionaryPriority": 0,
+        "sourceTermExactMatchCount": 2,
+        "maxDeinflectedTextLength": 4,
+        "headwords": [
           {
-            "sourceTerm": "打ち込む",
-            "expression": "打ち込む",
+            "index": 0,
+            "term": "打ち込む",
             "reading": "ぶちこむ",
-            "termTags": [
+            "sources": [
+              {
+                "originalText": "打ち込む",
+                "transformedText": "打ち込む",
+                "deinflectedText": "打ち込む",
+                "isPrimary": true
+              }
+            ],
+            "tags": [
               {
                 "name": "tag3",
                 "category": "category3",
-                "notes": "tag3 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag3 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag4",
                 "category": "category4",
-                "notes": "tag4 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag4 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag5",
                 "category": "category5",
-                "notes": "tag5 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag5 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               }
-            ],
-            "frequencies": [
-              {
-                "index": 0,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打ち込む",
-                "reading": "ぶちこむ",
-                "hasReading": false,
-                "frequency": 3
-              },
-              {
-                "index": 1,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打ち込む",
-                "reading": "ぶちこむ",
-                "hasReading": true,
-                "frequency": 9
-              }
-            ],
-            "pitches": [
-              {
-                "index": 0,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打ち込む",
-                "reading": "ぶちこむ",
-                "pitches": [
-                  {
-                    "position": 0,
-                    "tags": []
-                  },
-                  {
-                    "position": 3,
-                    "tags": []
-                  }
-                ]
-              }
             ]
           }
         ],
-        "termTags": [
-          {
-            "name": "tag3",
-            "category": "category3",
-            "notes": "tag3 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag4",
-            "category": "category4",
-            "notes": "tag4 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag5",
-            "category": "category5",
-            "notes": "tag5 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          }
-        ],
         "definitions": [
           {
-            "type": "term",
-            "id": 9,
-            "source": "打ち込む",
-            "rawSource": "打ち込む",
-            "sourceTerm": "打ち込む",
-            "reasons": [],
-            "score": 10,
-            "isPrimary": true,
-            "sequence": 4,
-            "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "dictionaryNames": [
-              "Test Dictionary 2"
-            ],
-            "expression": "打ち込む",
-            "reading": "ぶちこむ",
-            "expressions": [
-              {
-                "sourceTerm": "打ち込む",
-                "expression": "打ち込む",
-                "reading": "ぶちこむ",
-                "termTags": [
-                  {
-                    "name": "tag3",
-                    "category": "category3",
-                    "notes": "tag3 notes",
-                    "order": 0,
-                    "score": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "redundant": false
-                  },
-                  {
-                    "name": "tag4",
-                    "category": "category4",
-                    "notes": "tag4 notes",
-                    "order": 0,
-                    "score": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "redundant": false
-                  },
-                  {
-                    "name": "tag5",
-                    "category": "category5",
-                    "notes": "tag5 notes",
-                    "order": 0,
-                    "score": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "redundant": false
-                  }
-                ],
-                "frequencies": [
-                  {
-                    "index": 0,
-                    "expressionIndex": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "dictionaryOrder": {
-                      "index": 0,
-                      "priority": 0
-                    },
-                    "expression": "打ち込む",
-                    "reading": "ぶちこむ",
-                    "hasReading": false,
-                    "frequency": 3
-                  },
-                  {
-                    "index": 1,
-                    "expressionIndex": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "dictionaryOrder": {
-                      "index": 0,
-                      "priority": 0
-                    },
-                    "expression": "打ち込む",
-                    "reading": "ぶちこむ",
-                    "hasReading": true,
-                    "frequency": 9
-                  }
-                ],
-                "pitches": [
-                  {
-                    "index": 0,
-                    "expressionIndex": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "dictionaryOrder": {
-                      "index": 0,
-                      "priority": 0
-                    },
-                    "expression": "打ち込む",
-                    "reading": "ぶちこむ",
-                    "pitches": [
-                      {
-                        "position": 0,
-                        "tags": []
-                      },
-                      {
-                        "position": 3,
-                        "tags": []
-                      }
-                    ]
-                  }
-                ]
-              }
-            ],
-            "glossary": [
-              "definition17",
-              "definition18"
+            "index": 0,
+            "headwordIndices": [
+              0
             ],
-            "definitionTags": [
+            "dictionary": "Test Dictionary 2",
+            "tags": [
               {
                 "name": "tag1",
                 "category": "category1",
-                "notes": "tag1 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag1 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag2",
                 "category": "category2",
-                "notes": "tag2 notes",
-                "order": 0,
-                "score": 0,
-                "dictionary": "Test Dictionary 2",
-                "redundant": false
-              }
-            ],
-            "termTags": [
-              {
-                "name": "tag3",
-                "category": "category3",
-                "notes": "tag3 notes",
-                "order": 0,
-                "score": 0,
-                "dictionary": "Test Dictionary 2",
-                "redundant": false
-              },
-              {
-                "name": "tag4",
-                "category": "category4",
-                "notes": "tag4 notes",
-                "order": 0,
-                "score": 0,
-                "dictionary": "Test Dictionary 2",
-                "redundant": false
-              },
-              {
-                "name": "tag5",
-                "category": "category5",
-                "notes": "tag5 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag2 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               }
             ],
-            "frequencies": [
-              {
-                "index": 0,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打ち込む",
-                "reading": "ぶちこむ",
-                "hasReading": false,
-                "frequency": 3
-              },
-              {
-                "index": 1,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打ち込む",
-                "reading": "ぶちこむ",
-                "hasReading": true,
-                "frequency": 9
-              }
-            ],
-            "pitches": [
-              {
-                "index": 0,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打ち込む",
-                "reading": "ぶちこむ",
-                "pitches": [
-                  {
-                    "position": 0,
-                    "tags": []
-                  },
-                  {
-                    "position": 3,
-                    "tags": []
-                  }
-                ]
-              }
-            ],
-            "sourceTermExactMatchCount": 1
+            "entries": [
+              "definition17",
+              "definition18"
+            ]
           },
           {
-            "type": "term",
-            "id": 10,
-            "source": "打ち込む",
-            "rawSource": "打ち込む",
-            "sourceTerm": "打ち込む",
-            "reasons": [],
-            "score": 1,
-            "isPrimary": true,
-            "sequence": 4,
-            "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "dictionaryNames": [
-              "Test Dictionary 2"
-            ],
-            "expression": "打ち込む",
-            "reading": "ぶちこむ",
-            "expressions": [
-              {
-                "sourceTerm": "打ち込む",
-                "expression": "打ち込む",
-                "reading": "ぶちこむ",
-                "termTags": [
-                  {
-                    "name": "tag3",
-                    "category": "category3",
-                    "notes": "tag3 notes",
-                    "order": 0,
-                    "score": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "redundant": false
-                  },
-                  {
-                    "name": "tag4",
-                    "category": "category4",
-                    "notes": "tag4 notes",
-                    "order": 0,
-                    "score": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "redundant": false
-                  },
-                  {
-                    "name": "tag5",
-                    "category": "category5",
-                    "notes": "tag5 notes",
-                    "order": 0,
-                    "score": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "redundant": false
-                  }
-                ],
-                "frequencies": [
-                  {
-                    "index": 0,
-                    "expressionIndex": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "dictionaryOrder": {
-                      "index": 0,
-                      "priority": 0
-                    },
-                    "expression": "打ち込む",
-                    "reading": "ぶちこむ",
-                    "hasReading": false,
-                    "frequency": 3
-                  },
-                  {
-                    "index": 1,
-                    "expressionIndex": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "dictionaryOrder": {
-                      "index": 0,
-                      "priority": 0
-                    },
-                    "expression": "打ち込む",
-                    "reading": "ぶちこむ",
-                    "hasReading": true,
-                    "frequency": 9
-                  }
-                ],
-                "pitches": [
-                  {
-                    "index": 0,
-                    "expressionIndex": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "dictionaryOrder": {
-                      "index": 0,
-                      "priority": 0
-                    },
-                    "expression": "打ち込む",
-                    "reading": "ぶちこむ",
-                    "pitches": [
-                      {
-                        "position": 0,
-                        "tags": []
-                      },
-                      {
-                        "position": 3,
-                        "tags": []
-                      }
-                    ]
-                  }
-                ]
-              }
-            ],
-            "glossary": [
-              "definition19",
-              "definition20"
+            "index": 1,
+            "headwordIndices": [
+              0
             ],
-            "definitionTags": [
+            "dictionary": "Test Dictionary 2",
+            "tags": [
               {
                 "name": "tag1",
                 "category": "category1",
-                "notes": "tag1 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag1 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag2",
                 "category": "category2",
-                "notes": "tag2 notes",
-                "order": 0,
-                "score": 0,
-                "dictionary": "Test Dictionary 2",
-                "redundant": false
-              }
-            ],
-            "termTags": [
-              {
-                "name": "tag3",
-                "category": "category3",
-                "notes": "tag3 notes",
-                "order": 0,
-                "score": 0,
-                "dictionary": "Test Dictionary 2",
-                "redundant": false
-              },
-              {
-                "name": "tag4",
-                "category": "category4",
-                "notes": "tag4 notes",
-                "order": 0,
-                "score": 0,
-                "dictionary": "Test Dictionary 2",
-                "redundant": false
-              },
-              {
-                "name": "tag5",
-                "category": "category5",
-                "notes": "tag5 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag2 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               }
             ],
-            "frequencies": [
+            "entries": [
+              "definition19",
+              "definition20"
+            ]
+          }
+        ],
+        "pronunciations": [
+          {
+            "index": 0,
+            "headwordIndex": 0,
+            "dictionary": "Test Dictionary 2",
+            "dictionaryIndex": 0,
+            "dictionaryPriority": 0,
+            "pitches": [
               {
-                "index": 0,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打ち込む",
-                "reading": "ぶちこむ",
-                "hasReading": false,
-                "frequency": 3
+                "position": 0,
+                "tags": []
               },
               {
-                "index": 1,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打ち込む",
-                "reading": "ぶちこむ",
-                "hasReading": true,
-                "frequency": 9
+                "position": 3,
+                "tags": []
               }
-            ],
-            "pitches": [
-              {
-                "index": 0,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打ち込む",
-                "reading": "ぶちこむ",
-                "pitches": [
-                  {
-                    "position": 0,
-                    "tags": []
-                  },
-                  {
-                    "position": 3,
-                    "tags": []
-                  }
-                ]
-              }
-            ],
-            "sourceTermExactMatchCount": 1
+            ]
           }
         ],
         "frequencies": [
           {
             "index": 0,
-            "expressionIndex": 0,
+            "headwordIndex": 0,
             "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "expression": "打ち込む",
-            "reading": "ぶちこむ",
+            "dictionaryIndex": 0,
+            "dictionaryPriority": 0,
             "hasReading": false,
             "frequency": 3
           },
           {
             "index": 1,
-            "expressionIndex": 0,
+            "headwordIndex": 0,
             "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "expression": "打ち込む",
-            "reading": "ぶちこむ",
+            "dictionaryIndex": 0,
+            "dictionaryPriority": 0,
             "hasReading": true,
             "frequency": 9
           }
-        ],
-        "pitches": [
-          {
-            "index": 0,
-            "expressionIndex": 0,
-            "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "expression": "打ち込む",
-            "reading": "ぶちこむ",
-            "pitches": [
-              {
-                "position": 0,
-                "tags": []
-              },
-              {
-                "position": 3,
-                "tags": []
-              }
-            ]
-          }
-        ],
-        "sourceTermExactMatchCount": 1
+        ]
       },
       {
-        "type": "termGrouped",
-        "source": "打ち",
-        "rawSource": "打ち",
-        "sourceTerm": "打つ",
-        "reasons": [
+        "type": "term",
+        "id": -1,
+        "isPrimary": true,
+        "sequence": -1,
+        "inflections": [
           "masu stem"
         ],
         "score": 10,
-        "dictionary": "Test Dictionary 2",
-        "dictionaryOrder": {
-          "index": 0,
-          "priority": 0
-        },
-        "dictionaryNames": [
-          "Test Dictionary 2"
-        ],
-        "expression": "打つ",
-        "reading": "うつ",
-        "expressions": [
+        "dictionaryIndex": 0,
+        "dictionaryPriority": 0,
+        "sourceTermExactMatchCount": 2,
+        "maxDeinflectedTextLength": 2,
+        "headwords": [
           {
-            "sourceTerm": "打つ",
-            "expression": "打つ",
+            "index": 0,
+            "term": "打つ",
             "reading": "うつ",
-            "termTags": [
+            "sources": [
+              {
+                "originalText": "打ち",
+                "transformedText": "打ち",
+                "deinflectedText": "打つ",
+                "isPrimary": true
+              }
+            ],
+            "tags": [
               {
                 "name": "tag3",
                 "category": "category3",
-                "notes": "tag3 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag3 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag4",
                 "category": "category4",
-                "notes": "tag4 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag4 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag5",
                 "category": "category5",
-                "notes": "tag5 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag5 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               }
-            ],
-            "frequencies": [
-              {
-                "index": 0,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打つ",
-                "reading": "うつ",
-                "hasReading": false,
-                "frequency": 2
-              },
-              {
-                "index": 1,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打つ",
-                "reading": "うつ",
-                "hasReading": true,
-                "frequency": 6
-              }
-            ],
-            "pitches": []
-          }
-        ],
-        "termTags": [
-          {
-            "name": "tag3",
-            "category": "category3",
-            "notes": "tag3 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag4",
-            "category": "category4",
-            "notes": "tag4 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag5",
-            "category": "category5",
-            "notes": "tag5 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
+            ]
           }
         ],
         "definitions": [
           {
-            "type": "term",
-            "id": 3,
-            "source": "打ち",
-            "rawSource": "打ち",
-            "sourceTerm": "打つ",
-            "reasons": [
-              "masu stem"
-            ],
-            "score": 10,
-            "isPrimary": true,
-            "sequence": 3,
-            "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "dictionaryNames": [
-              "Test Dictionary 2"
-            ],
-            "expression": "打つ",
-            "reading": "うつ",
-            "expressions": [
-              {
-                "sourceTerm": "打つ",
-                "expression": "打つ",
-                "reading": "うつ",
-                "termTags": [
-                  {
-                    "name": "tag3",
-                    "category": "category3",
-                    "notes": "tag3 notes",
-                    "order": 0,
-                    "score": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "redundant": false
-                  },
-                  {
-                    "name": "tag4",
-                    "category": "category4",
-                    "notes": "tag4 notes",
-                    "order": 0,
-                    "score": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "redundant": false
-                  },
-                  {
-                    "name": "tag5",
-                    "category": "category5",
-                    "notes": "tag5 notes",
-                    "order": 0,
-                    "score": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "redundant": false
-                  }
-                ],
-                "frequencies": [
-                  {
-                    "index": 0,
-                    "expressionIndex": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "dictionaryOrder": {
-                      "index": 0,
-                      "priority": 0
-                    },
-                    "expression": "打つ",
-                    "reading": "うつ",
-                    "hasReading": false,
-                    "frequency": 2
-                  },
-                  {
-                    "index": 1,
-                    "expressionIndex": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "dictionaryOrder": {
-                      "index": 0,
-                      "priority": 0
-                    },
-                    "expression": "打つ",
-                    "reading": "うつ",
-                    "hasReading": true,
-                    "frequency": 6
-                  }
-                ],
-                "pitches": []
-              }
-            ],
-            "glossary": [
-              "definition5",
-              "definition6"
+            "index": 0,
+            "headwordIndices": [
+              0
             ],
-            "definitionTags": [
+            "dictionary": "Test Dictionary 2",
+            "tags": [
               {
                 "name": "tag1",
                 "category": "category1",
-                "notes": "tag1 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag1 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag2",
                 "category": "category2",
-                "notes": "tag2 notes",
-                "order": 0,
-                "score": 0,
-                "dictionary": "Test Dictionary 2",
-                "redundant": false
-              }
-            ],
-            "termTags": [
-              {
-                "name": "tag3",
-                "category": "category3",
-                "notes": "tag3 notes",
-                "order": 0,
-                "score": 0,
-                "dictionary": "Test Dictionary 2",
-                "redundant": false
-              },
-              {
-                "name": "tag4",
-                "category": "category4",
-                "notes": "tag4 notes",
-                "order": 0,
-                "score": 0,
-                "dictionary": "Test Dictionary 2",
-                "redundant": false
-              },
-              {
-                "name": "tag5",
-                "category": "category5",
-                "notes": "tag5 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag2 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               }
             ],
-            "frequencies": [
-              {
-                "index": 0,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打つ",
-                "reading": "うつ",
-                "hasReading": false,
-                "frequency": 2
-              },
-              {
-                "index": 1,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打つ",
-                "reading": "うつ",
-                "hasReading": true,
-                "frequency": 6
-              }
-            ],
-            "pitches": [],
-            "sourceTermExactMatchCount": 1
+            "entries": [
+              "definition5",
+              "definition6"
+            ]
           },
           {
-            "type": "term",
-            "id": 4,
-            "source": "打ち",
-            "rawSource": "打ち",
-            "sourceTerm": "打つ",
-            "reasons": [
-              "masu stem"
-            ],
-            "score": 1,
-            "isPrimary": true,
-            "sequence": 3,
-            "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "dictionaryNames": [
-              "Test Dictionary 2"
-            ],
-            "expression": "打つ",
-            "reading": "うつ",
-            "expressions": [
-              {
-                "sourceTerm": "打つ",
-                "expression": "打つ",
-                "reading": "うつ",
-                "termTags": [
-                  {
-                    "name": "tag3",
-                    "category": "category3",
-                    "notes": "tag3 notes",
-                    "order": 0,
-                    "score": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "redundant": false
-                  },
-                  {
-                    "name": "tag4",
-                    "category": "category4",
-                    "notes": "tag4 notes",
-                    "order": 0,
-                    "score": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "redundant": false
-                  },
-                  {
-                    "name": "tag5",
-                    "category": "category5",
-                    "notes": "tag5 notes",
-                    "order": 0,
-                    "score": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "redundant": false
-                  }
-                ],
-                "frequencies": [
-                  {
-                    "index": 0,
-                    "expressionIndex": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "dictionaryOrder": {
-                      "index": 0,
-                      "priority": 0
-                    },
-                    "expression": "打つ",
-                    "reading": "うつ",
-                    "hasReading": false,
-                    "frequency": 2
-                  },
-                  {
-                    "index": 1,
-                    "expressionIndex": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "dictionaryOrder": {
-                      "index": 0,
-                      "priority": 0
-                    },
-                    "expression": "打つ",
-                    "reading": "うつ",
-                    "hasReading": true,
-                    "frequency": 6
-                  }
-                ],
-                "pitches": []
-              }
-            ],
-            "glossary": [
-              "definition7",
-              "definition8"
+            "index": 1,
+            "headwordIndices": [
+              0
             ],
-            "definitionTags": [
+            "dictionary": "Test Dictionary 2",
+            "tags": [
               {
                 "name": "tag1",
                 "category": "category1",
-                "notes": "tag1 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag1 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag2",
                 "category": "category2",
-                "notes": "tag2 notes",
-                "order": 0,
-                "score": 0,
-                "dictionary": "Test Dictionary 2",
-                "redundant": false
-              }
-            ],
-            "termTags": [
-              {
-                "name": "tag3",
-                "category": "category3",
-                "notes": "tag3 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
-                "redundant": false
-              },
-              {
-                "name": "tag4",
-                "category": "category4",
-                "notes": "tag4 notes",
-                "order": 0,
-                "score": 0,
-                "dictionary": "Test Dictionary 2",
-                "redundant": false
-              },
-              {
-                "name": "tag5",
-                "category": "category5",
-                "notes": "tag5 notes",
-                "order": 0,
-                "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag2 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               }
             ],
-            "frequencies": [
-              {
-                "index": 0,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打つ",
-                "reading": "うつ",
-                "hasReading": false,
-                "frequency": 2
-              },
-              {
-                "index": 1,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打つ",
-                "reading": "うつ",
-                "hasReading": true,
-                "frequency": 6
-              }
-            ],
-            "pitches": [],
-            "sourceTermExactMatchCount": 1
+            "entries": [
+              "definition7",
+              "definition8"
+            ]
           }
         ],
+        "pronunciations": [],
         "frequencies": [
           {
             "index": 0,
-            "expressionIndex": 0,
+            "headwordIndex": 0,
             "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "expression": "打つ",
-            "reading": "うつ",
+            "dictionaryIndex": 0,
+            "dictionaryPriority": 0,
             "hasReading": false,
             "frequency": 2
           },
           {
             "index": 1,
-            "expressionIndex": 0,
+            "headwordIndex": 0,
             "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "expression": "打つ",
-            "reading": "うつ",
+            "dictionaryIndex": 0,
+            "dictionaryPriority": 0,
             "hasReading": true,
             "frequency": 6
           }
-        ],
-        "pitches": [],
-        "sourceTermExactMatchCount": 1
+        ]
       },
       {
-        "type": "termGrouped",
-        "source": "打ち",
-        "rawSource": "打ち",
-        "sourceTerm": "打つ",
-        "reasons": [
+        "type": "term",
+        "id": -1,
+        "isPrimary": true,
+        "sequence": -1,
+        "inflections": [
           "masu stem"
         ],
         "score": 10,
-        "dictionary": "Test Dictionary 2",
-        "dictionaryOrder": {
-          "index": 0,
-          "priority": 0
-        },
-        "dictionaryNames": [
-          "Test Dictionary 2"
-        ],
-        "expression": "打つ",
-        "reading": "ぶつ",
-        "expressions": [
+        "dictionaryIndex": 0,
+        "dictionaryPriority": 0,
+        "sourceTermExactMatchCount": 2,
+        "maxDeinflectedTextLength": 2,
+        "headwords": [
           {
-            "sourceTerm": "打つ",
-            "expression": "打つ",
+            "index": 0,
+            "term": "打つ",
             "reading": "ぶつ",
-            "termTags": [
+            "sources": [
+              {
+                "originalText": "打ち",
+                "transformedText": "打ち",
+                "deinflectedText": "打つ",
+                "isPrimary": true
+              }
+            ],
+            "tags": [
               {
                 "name": "tag3",
                 "category": "category3",
-                "notes": "tag3 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag3 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag4",
                 "category": "category4",
-                "notes": "tag4 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag4 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag5",
                 "category": "category5",
-                "notes": "tag5 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag5 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               }
-            ],
-            "frequencies": [
-              {
-                "index": 0,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打つ",
-                "reading": "ぶつ",
-                "hasReading": false,
-                "frequency": 2
-              },
-              {
-                "index": 1,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打つ",
-                "reading": "ぶつ",
-                "hasReading": true,
-                "frequency": 7
-              }
-            ],
-            "pitches": []
-          }
-        ],
-        "termTags": [
-          {
-            "name": "tag3",
-            "category": "category3",
-            "notes": "tag3 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag4",
-            "category": "category4",
-            "notes": "tag4 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag5",
-            "category": "category5",
-            "notes": "tag5 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
+            ]
           }
         ],
         "definitions": [
           {
-            "type": "term",
-            "id": 5,
-            "source": "打ち",
-            "rawSource": "打ち",
-            "sourceTerm": "打つ",
-            "reasons": [
-              "masu stem"
-            ],
-            "score": 10,
-            "isPrimary": true,
-            "sequence": 3,
-            "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "dictionaryNames": [
-              "Test Dictionary 2"
-            ],
-            "expression": "打つ",
-            "reading": "ぶつ",
-            "expressions": [
-              {
-                "sourceTerm": "打つ",
-                "expression": "打つ",
-                "reading": "ぶつ",
-                "termTags": [
-                  {
-                    "name": "tag3",
-                    "category": "category3",
-                    "notes": "tag3 notes",
-                    "order": 0,
-                    "score": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "redundant": false
-                  },
-                  {
-                    "name": "tag4",
-                    "category": "category4",
-                    "notes": "tag4 notes",
-                    "order": 0,
-                    "score": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "redundant": false
-                  },
-                  {
-                    "name": "tag5",
-                    "category": "category5",
-                    "notes": "tag5 notes",
-                    "order": 0,
-                    "score": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "redundant": false
-                  }
-                ],
-                "frequencies": [
-                  {
-                    "index": 0,
-                    "expressionIndex": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "dictionaryOrder": {
-                      "index": 0,
-                      "priority": 0
-                    },
-                    "expression": "打つ",
-                    "reading": "ぶつ",
-                    "hasReading": false,
-                    "frequency": 2
-                  },
-                  {
-                    "index": 1,
-                    "expressionIndex": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "dictionaryOrder": {
-                      "index": 0,
-                      "priority": 0
-                    },
-                    "expression": "打つ",
-                    "reading": "ぶつ",
-                    "hasReading": true,
-                    "frequency": 7
-                  }
-                ],
-                "pitches": []
-              }
-            ],
-            "glossary": [
-              "definition9",
-              "definition10"
+            "index": 0,
+            "headwordIndices": [
+              0
             ],
-            "definitionTags": [
+            "dictionary": "Test Dictionary 2",
+            "tags": [
               {
                 "name": "tag1",
                 "category": "category1",
-                "notes": "tag1 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag1 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag2",
                 "category": "category2",
-                "notes": "tag2 notes",
-                "order": 0,
-                "score": 0,
-                "dictionary": "Test Dictionary 2",
-                "redundant": false
-              }
-            ],
-            "termTags": [
-              {
-                "name": "tag3",
-                "category": "category3",
-                "notes": "tag3 notes",
-                "order": 0,
-                "score": 0,
-                "dictionary": "Test Dictionary 2",
-                "redundant": false
-              },
-              {
-                "name": "tag4",
-                "category": "category4",
-                "notes": "tag4 notes",
-                "order": 0,
-                "score": 0,
-                "dictionary": "Test Dictionary 2",
-                "redundant": false
-              },
-              {
-                "name": "tag5",
-                "category": "category5",
-                "notes": "tag5 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag2 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               }
             ],
-            "frequencies": [
-              {
-                "index": 0,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打つ",
-                "reading": "ぶつ",
-                "hasReading": false,
-                "frequency": 2
-              },
-              {
-                "index": 1,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打つ",
-                "reading": "ぶつ",
-                "hasReading": true,
-                "frequency": 7
-              }
-            ],
-            "pitches": [],
-            "sourceTermExactMatchCount": 1
+            "entries": [
+              "definition9",
+              "definition10"
+            ]
           },
           {
-            "type": "term",
-            "id": 6,
-            "source": "打ち",
-            "rawSource": "打ち",
-            "sourceTerm": "打つ",
-            "reasons": [
-              "masu stem"
-            ],
-            "score": 1,
-            "isPrimary": true,
-            "sequence": 3,
-            "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "dictionaryNames": [
-              "Test Dictionary 2"
-            ],
-            "expression": "打つ",
-            "reading": "ぶつ",
-            "expressions": [
-              {
-                "sourceTerm": "打つ",
-                "expression": "打つ",
-                "reading": "ぶつ",
-                "termTags": [
-                  {
-                    "name": "tag3",
-                    "category": "category3",
-                    "notes": "tag3 notes",
-                    "order": 0,
-                    "score": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "redundant": false
-                  },
-                  {
-                    "name": "tag4",
-                    "category": "category4",
-                    "notes": "tag4 notes",
-                    "order": 0,
-                    "score": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "redundant": false
-                  },
-                  {
-                    "name": "tag5",
-                    "category": "category5",
-                    "notes": "tag5 notes",
-                    "order": 0,
-                    "score": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "redundant": false
-                  }
-                ],
-                "frequencies": [
-                  {
-                    "index": 0,
-                    "expressionIndex": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "dictionaryOrder": {
-                      "index": 0,
-                      "priority": 0
-                    },
-                    "expression": "打つ",
-                    "reading": "ぶつ",
-                    "hasReading": false,
-                    "frequency": 2
-                  },
-                  {
-                    "index": 1,
-                    "expressionIndex": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "dictionaryOrder": {
-                      "index": 0,
-                      "priority": 0
-                    },
-                    "expression": "打つ",
-                    "reading": "ぶつ",
-                    "hasReading": true,
-                    "frequency": 7
-                  }
-                ],
-                "pitches": []
-              }
-            ],
-            "glossary": [
-              "definition11",
-              "definition12"
+            "index": 1,
+            "headwordIndices": [
+              0
             ],
-            "definitionTags": [
+            "dictionary": "Test Dictionary 2",
+            "tags": [
               {
                 "name": "tag1",
                 "category": "category1",
-                "notes": "tag1 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag1 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag2",
                 "category": "category2",
-                "notes": "tag2 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
-                "redundant": false
-              }
-            ],
-            "termTags": [
-              {
-                "name": "tag3",
-                "category": "category3",
-                "notes": "tag3 notes",
-                "order": 0,
-                "score": 0,
-                "dictionary": "Test Dictionary 2",
-                "redundant": false
-              },
-              {
-                "name": "tag4",
-                "category": "category4",
-                "notes": "tag4 notes",
-                "order": 0,
-                "score": 0,
-                "dictionary": "Test Dictionary 2",
-                "redundant": false
-              },
-              {
-                "name": "tag5",
-                "category": "category5",
-                "notes": "tag5 notes",
-                "order": 0,
-                "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag2 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               }
             ],
-            "frequencies": [
-              {
-                "index": 0,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打つ",
-                "reading": "ぶつ",
-                "hasReading": false,
-                "frequency": 2
-              },
-              {
-                "index": 1,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打つ",
-                "reading": "ぶつ",
-                "hasReading": true,
-                "frequency": 7
-              }
-            ],
-            "pitches": [],
-            "sourceTermExactMatchCount": 1
+            "entries": [
+              "definition11",
+              "definition12"
+            ]
           }
         ],
+        "pronunciations": [],
         "frequencies": [
           {
             "index": 0,
-            "expressionIndex": 0,
+            "headwordIndex": 0,
             "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "expression": "打つ",
-            "reading": "ぶつ",
+            "dictionaryIndex": 0,
+            "dictionaryPriority": 0,
             "hasReading": false,
             "frequency": 2
           },
           {
             "index": 1,
-            "expressionIndex": 0,
+            "headwordIndex": 0,
             "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "expression": "打つ",
-            "reading": "ぶつ",
+            "dictionaryIndex": 0,
+            "dictionaryPriority": 0,
             "hasReading": true,
             "frequency": 7
           }
-        ],
-        "pitches": [],
-        "sourceTermExactMatchCount": 1
+        ]
       },
       {
-        "type": "termGrouped",
-        "source": "打",
-        "rawSource": "打",
-        "sourceTerm": "打",
-        "reasons": [],
+        "type": "term",
+        "id": -1,
+        "isPrimary": true,
+        "sequence": -1,
+        "inflections": [],
         "score": 1,
-        "dictionary": "Test Dictionary 2",
-        "dictionaryOrder": {
-          "index": 0,
-          "priority": 0
-        },
-        "dictionaryNames": [
-          "Test Dictionary 2"
-        ],
-        "expression": "打",
-        "reading": "だ",
-        "expressions": [
+        "dictionaryIndex": 0,
+        "dictionaryPriority": 0,
+        "sourceTermExactMatchCount": 1,
+        "maxDeinflectedTextLength": 1,
+        "headwords": [
           {
-            "sourceTerm": "打",
-            "expression": "打",
+            "index": 0,
+            "term": "打",
             "reading": "だ",
-            "termTags": [
+            "sources": [
+              {
+                "originalText": "打",
+                "transformedText": "打",
+                "deinflectedText": "打",
+                "isPrimary": true
+              }
+            ],
+            "tags": [
               {
                 "name": "tag3",
                 "category": "category3",
-                "notes": "tag3 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag3 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag4",
                 "category": "category4",
-                "notes": "tag4 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag4 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag5",
                 "category": "category5",
-                "notes": "tag5 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag5 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               }
-            ],
-            "frequencies": [
-              {
-                "index": 0,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打",
-                "reading": "だ",
-                "hasReading": false,
-                "frequency": 1
-              },
-              {
-                "index": 1,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打",
-                "reading": "だ",
-                "hasReading": true,
-                "frequency": 4
-              }
-            ],
-            "pitches": []
-          }
-        ],
-        "termTags": [
-          {
-            "name": "tag3",
-            "category": "category3",
-            "notes": "tag3 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag4",
-            "category": "category4",
-            "notes": "tag4 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag5",
-            "category": "category5",
-            "notes": "tag5 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
+            ]
           }
         ],
         "definitions": [
           {
-            "type": "term",
-            "id": 1,
-            "source": "打",
-            "rawSource": "打",
-            "sourceTerm": "打",
-            "reasons": [],
-            "score": 1,
-            "isPrimary": true,
-            "sequence": 1,
-            "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "dictionaryNames": [
-              "Test Dictionary 2"
-            ],
-            "expression": "打",
-            "reading": "だ",
-            "expressions": [
-              {
-                "sourceTerm": "打",
-                "expression": "打",
-                "reading": "だ",
-                "termTags": [
-                  {
-                    "name": "tag3",
-                    "category": "category3",
-                    "notes": "tag3 notes",
-                    "order": 0,
-                    "score": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "redundant": false
-                  },
-                  {
-                    "name": "tag4",
-                    "category": "category4",
-                    "notes": "tag4 notes",
-                    "order": 0,
-                    "score": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "redundant": false
-                  },
-                  {
-                    "name": "tag5",
-                    "category": "category5",
-                    "notes": "tag5 notes",
-                    "order": 0,
-                    "score": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "redundant": false
-                  }
-                ],
-                "frequencies": [
-                  {
-                    "index": 0,
-                    "expressionIndex": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "dictionaryOrder": {
-                      "index": 0,
-                      "priority": 0
-                    },
-                    "expression": "打",
-                    "reading": "だ",
-                    "hasReading": false,
-                    "frequency": 1
-                  },
-                  {
-                    "index": 1,
-                    "expressionIndex": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "dictionaryOrder": {
-                      "index": 0,
-                      "priority": 0
-                    },
-                    "expression": "打",
-                    "reading": "だ",
-                    "hasReading": true,
-                    "frequency": 4
-                  }
-                ],
-                "pitches": []
-              }
-            ],
-            "glossary": [
-              "definition1",
-              "definition2"
+            "index": 0,
+            "headwordIndices": [
+              0
             ],
-            "definitionTags": [
+            "dictionary": "Test Dictionary 2",
+            "tags": [
               {
                 "name": "tag1",
                 "category": "category1",
-                "notes": "tag1 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag1 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag2",
                 "category": "category2",
-                "notes": "tag2 notes",
-                "order": 0,
-                "score": 0,
-                "dictionary": "Test Dictionary 2",
-                "redundant": false
-              }
-            ],
-            "termTags": [
-              {
-                "name": "tag3",
-                "category": "category3",
-                "notes": "tag3 notes",
-                "order": 0,
-                "score": 0,
-                "dictionary": "Test Dictionary 2",
-                "redundant": false
-              },
-              {
-                "name": "tag4",
-                "category": "category4",
-                "notes": "tag4 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
-                "redundant": false
-              },
-              {
-                "name": "tag5",
-                "category": "category5",
-                "notes": "tag5 notes",
-                "order": 0,
-                "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag2 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               }
             ],
-            "frequencies": [
-              {
-                "index": 0,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打",
-                "reading": "だ",
-                "hasReading": false,
-                "frequency": 1
-              },
-              {
-                "index": 1,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打",
-                "reading": "だ",
-                "hasReading": true,
-                "frequency": 4
-              }
-            ],
-            "pitches": [],
-            "sourceTermExactMatchCount": 1
+            "entries": [
+              "definition1",
+              "definition2"
+            ]
           }
         ],
+        "pronunciations": [],
         "frequencies": [
           {
             "index": 0,
-            "expressionIndex": 0,
+            "headwordIndex": 0,
             "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "expression": "打",
-            "reading": "だ",
+            "dictionaryIndex": 0,
+            "dictionaryPriority": 0,
             "hasReading": false,
             "frequency": 1
           },
           {
             "index": 1,
-            "expressionIndex": 0,
+            "headwordIndex": 0,
             "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "expression": "打",
-            "reading": "だ",
+            "dictionaryIndex": 0,
+            "dictionaryPriority": 0,
             "hasReading": true,
             "frequency": 4
           }
-        ],
-        "pitches": [],
-        "sourceTermExactMatchCount": 1
+        ]
       },
       {
-        "type": "termGrouped",
-        "source": "打",
-        "rawSource": "打",
-        "sourceTerm": "打",
-        "reasons": [],
+        "type": "term",
+        "id": -1,
+        "isPrimary": true,
+        "sequence": -1,
+        "inflections": [],
         "score": 1,
-        "dictionary": "Test Dictionary 2",
-        "dictionaryOrder": {
-          "index": 0,
-          "priority": 0
-        },
-        "dictionaryNames": [
-          "Test Dictionary 2"
-        ],
-        "expression": "打",
-        "reading": "ダース",
-        "expressions": [
+        "dictionaryIndex": 0,
+        "dictionaryPriority": 0,
+        "sourceTermExactMatchCount": 1,
+        "maxDeinflectedTextLength": 1,
+        "headwords": [
           {
-            "sourceTerm": "打",
-            "expression": "打",
+            "index": 0,
+            "term": "打",
             "reading": "ダース",
-            "termTags": [
+            "sources": [
+              {
+                "originalText": "打",
+                "transformedText": "打",
+                "deinflectedText": "打",
+                "isPrimary": true
+              }
+            ],
+            "tags": [
               {
                 "name": "tag3",
                 "category": "category3",
-                "notes": "tag3 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag3 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag4",
                 "category": "category4",
-                "notes": "tag4 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag4 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag5",
                 "category": "category5",
-                "notes": "tag5 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag5 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               }
-            ],
-            "frequencies": [
-              {
-                "index": 0,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打",
-                "reading": "ダース",
-                "hasReading": false,
-                "frequency": 1
-              },
-              {
-                "index": 1,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打",
-                "reading": "ダース",
-                "hasReading": true,
-                "frequency": 5
-              }
-            ],
-            "pitches": []
-          }
-        ],
-        "termTags": [
-          {
-            "name": "tag3",
-            "category": "category3",
-            "notes": "tag3 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag4",
-            "category": "category4",
-            "notes": "tag4 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag5",
-            "category": "category5",
-            "notes": "tag5 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
+            ]
           }
         ],
         "definitions": [
           {
-            "type": "term",
-            "id": 2,
-            "source": "打",
-            "rawSource": "打",
-            "sourceTerm": "打",
-            "reasons": [],
-            "score": 1,
-            "isPrimary": true,
-            "sequence": 2,
-            "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "dictionaryNames": [
-              "Test Dictionary 2"
-            ],
-            "expression": "打",
-            "reading": "ダース",
-            "expressions": [
-              {
-                "sourceTerm": "打",
-                "expression": "打",
-                "reading": "ダース",
-                "termTags": [
-                  {
-                    "name": "tag3",
-                    "category": "category3",
-                    "notes": "tag3 notes",
-                    "order": 0,
-                    "score": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "redundant": false
-                  },
-                  {
-                    "name": "tag4",
-                    "category": "category4",
-                    "notes": "tag4 notes",
-                    "order": 0,
-                    "score": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "redundant": false
-                  },
-                  {
-                    "name": "tag5",
-                    "category": "category5",
-                    "notes": "tag5 notes",
-                    "order": 0,
-                    "score": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "redundant": false
-                  }
-                ],
-                "frequencies": [
-                  {
-                    "index": 0,
-                    "expressionIndex": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "dictionaryOrder": {
-                      "index": 0,
-                      "priority": 0
-                    },
-                    "expression": "打",
-                    "reading": "ダース",
-                    "hasReading": false,
-                    "frequency": 1
-                  },
-                  {
-                    "index": 1,
-                    "expressionIndex": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "dictionaryOrder": {
-                      "index": 0,
-                      "priority": 0
-                    },
-                    "expression": "打",
-                    "reading": "ダース",
-                    "hasReading": true,
-                    "frequency": 5
-                  }
-                ],
-                "pitches": []
-              }
-            ],
-            "glossary": [
-              "definition3",
-              "definition4"
+            "index": 0,
+            "headwordIndices": [
+              0
             ],
-            "definitionTags": [
+            "dictionary": "Test Dictionary 2",
+            "tags": [
               {
                 "name": "tag1",
                 "category": "category1",
-                "notes": "tag1 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag1 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag2",
                 "category": "category2",
-                "notes": "tag2 notes",
-                "order": 0,
-                "score": 0,
-                "dictionary": "Test Dictionary 2",
-                "redundant": false
-              }
-            ],
-            "termTags": [
-              {
-                "name": "tag3",
-                "category": "category3",
-                "notes": "tag3 notes",
-                "order": 0,
-                "score": 0,
-                "dictionary": "Test Dictionary 2",
-                "redundant": false
-              },
-              {
-                "name": "tag4",
-                "category": "category4",
-                "notes": "tag4 notes",
-                "order": 0,
-                "score": 0,
-                "dictionary": "Test Dictionary 2",
-                "redundant": false
-              },
-              {
-                "name": "tag5",
-                "category": "category5",
-                "notes": "tag5 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag2 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               }
             ],
-            "frequencies": [
-              {
-                "index": 0,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打",
-                "reading": "ダース",
-                "hasReading": false,
-                "frequency": 1
-              },
-              {
-                "index": 1,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打",
-                "reading": "ダース",
-                "hasReading": true,
-                "frequency": 5
-              }
-            ],
-            "pitches": [],
-            "sourceTermExactMatchCount": 1
+            "entries": [
+              "definition3",
+              "definition4"
+            ]
           }
         ],
+        "pronunciations": [],
         "frequencies": [
           {
             "index": 0,
-            "expressionIndex": 0,
+            "headwordIndex": 0,
             "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "expression": "打",
-            "reading": "ダース",
+            "dictionaryIndex": 0,
+            "dictionaryPriority": 0,
             "hasReading": false,
             "frequency": 1
           },
           {
             "index": 1,
-            "expressionIndex": 0,
+            "headwordIndex": 0,
             "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "expression": "打",
-            "reading": "ダース",
+            "dictionaryIndex": 0,
+            "dictionaryPriority": 0,
             "hasReading": true,
             "frequency": 5
           }
-        ],
-        "pitches": [],
-        "sourceTermExactMatchCount": 1
+        ]
       }
     ]
   },
   {
     "name": "Search using different modes",
-    "length": 4,
-    "definitions": [
+    "originalTextLength": 4,
+    "dictionaryEntries": [
       {
-        "type": "termMerged",
-        "source": "打ち込む",
-        "rawSource": "打ち込む",
-        "reasons": [],
+        "type": "term",
+        "id": -1,
+        "isPrimary": true,
+        "sequence": -1,
+        "inflections": [],
         "score": 10,
-        "dictionary": "Test Dictionary 2",
-        "dictionaryOrder": {
-          "index": 0,
-          "priority": 0
-        },
-        "dictionaryNames": [
-          "Test Dictionary 2"
-        ],
-        "expression": [
-          "打ち込む"
-        ],
-        "reading": [
-          "うちこむ",
-          "ぶちこむ"
-        ],
-        "expressions": [
+        "dictionaryIndex": 0,
+        "dictionaryPriority": 0,
+        "sourceTermExactMatchCount": 4,
+        "maxDeinflectedTextLength": 4,
+        "headwords": [
           {
-            "sourceTerm": "打ち込む",
-            "expression": "打ち込む",
+            "index": 0,
+            "term": "打ち込む",
             "reading": "うちこむ",
-            "termTags": [
+            "sources": [
+              {
+                "originalText": "打ち込む",
+                "transformedText": "打ち込む",
+                "deinflectedText": "打ち込む",
+                "isPrimary": true
+              }
+            ],
+            "tags": [
               {
                 "name": "tag3",
                 "category": "category3",
-                "notes": "tag3 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag3 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag4",
                 "category": "category4",
-                "notes": "tag4 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag4 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag5",
                 "category": "category5",
-                "notes": "tag5 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag5 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag6",
                 "category": "default",
-                "notes": "",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag7",
                 "category": "default",
-                "notes": "",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               }
-            ],
-            "frequencies": [
-              {
-                "index": 0,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打ち込む",
-                "reading": "うちこむ",
-                "hasReading": false,
-                "frequency": 3
-              },
-              {
-                "index": 1,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打ち込む",
-                "reading": "うちこむ",
-                "hasReading": true,
-                "frequency": 8
-              }
-            ],
-            "pitches": [
-              {
-                "index": 0,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打ち込む",
-                "reading": "うちこむ",
-                "pitches": [
-                  {
-                    "position": 0,
-                    "tags": []
-                  },
-                  {
-                    "position": 3,
-                    "tags": []
-                  }
-                ]
-              }
             ]
           },
           {
-            "sourceTerm": "打ち込む",
-            "expression": "打ち込む",
+            "index": 1,
+            "term": "打ち込む",
             "reading": "ぶちこむ",
-            "termTags": [
+            "sources": [
+              {
+                "originalText": "打ち込む",
+                "transformedText": "打ち込む",
+                "deinflectedText": "打ち込む",
+                "isPrimary": true
+              }
+            ],
+            "tags": [
               {
                 "name": "tag3",
                 "category": "category3",
-                "notes": "tag3 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag3 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag4",
                 "category": "category4",
-                "notes": "tag4 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag4 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag5",
                 "category": "category5",
-                "notes": "tag5 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag5 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               }
-            ],
-            "frequencies": [
-              {
-                "index": 0,
-                "expressionIndex": 1,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打ち込む",
-                "reading": "ぶちこむ",
-                "hasReading": false,
-                "frequency": 3
-              },
-              {
-                "index": 1,
-                "expressionIndex": 1,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打ち込む",
-                "reading": "ぶちこむ",
-                "hasReading": true,
-                "frequency": 9
-              }
-            ],
-            "pitches": [
-              {
-                "index": 0,
-                "expressionIndex": 1,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打ち込む",
-                "reading": "ぶちこむ",
-                "pitches": [
-                  {
-                    "position": 0,
-                    "tags": []
-                  },
-                  {
-                    "position": 3,
-                    "tags": []
-                  }
-                ]
-              }
             ]
           }
         ],
         "definitions": [
           {
-            "type": "termMergedByGlossary",
-            "source": "打ち込む",
-            "rawSource": "打ち込む",
-            "reasons": [],
-            "score": 10,
-            "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "dictionaryNames": [
-              "Test Dictionary 2"
-            ],
-            "expression": [
-              "打ち込む"
-            ],
-            "reading": [
-              "うちこむ"
-            ],
-            "expressions": [
-              {
-                "sourceTerm": "打ち込む",
-                "expression": "打ち込む",
-                "reading": "うちこむ",
-                "termTags": [
-                  {
-                    "name": "tag3",
-                    "category": "category3",
-                    "notes": "tag3 notes",
-                    "order": 0,
-                    "score": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "redundant": false
-                  },
-                  {
-                    "name": "tag4",
-                    "category": "category4",
-                    "notes": "tag4 notes",
-                    "order": 0,
-                    "score": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "redundant": false
-                  },
-                  {
-                    "name": "tag5",
-                    "category": "category5",
-                    "notes": "tag5 notes",
-                    "order": 0,
-                    "score": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "redundant": false
-                  }
-                ],
-                "frequencies": [
-                  {
-                    "index": 0,
-                    "expressionIndex": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "dictionaryOrder": {
-                      "index": 0,
-                      "priority": 0
-                    },
-                    "expression": "打ち込む",
-                    "reading": "うちこむ",
-                    "hasReading": false,
-                    "frequency": 3
-                  },
-                  {
-                    "index": 1,
-                    "expressionIndex": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "dictionaryOrder": {
-                      "index": 0,
-                      "priority": 0
-                    },
-                    "expression": "打ち込む",
-                    "reading": "うちこむ",
-                    "hasReading": true,
-                    "frequency": 8
-                  }
-                ],
-                "pitches": [
-                  {
-                    "index": 0,
-                    "expressionIndex": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "dictionaryOrder": {
-                      "index": 0,
-                      "priority": 0
-                    },
-                    "expression": "打ち込む",
-                    "reading": "うちこむ",
-                    "pitches": [
-                      {
-                        "position": 0,
-                        "tags": []
-                      },
-                      {
-                        "position": 3,
-                        "tags": []
-                      }
-                    ]
-                  }
-                ]
-              }
-            ],
-            "glossary": [
-              "definition13",
-              "definition14"
+            "index": 0,
+            "headwordIndices": [
+              0
             ],
-            "definitionTags": [
+            "dictionary": "Test Dictionary 2",
+            "tags": [
               {
                 "name": "tag1",
                 "category": "category1",
-                "notes": "tag1 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag1 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag2",
                 "category": "category2",
-                "notes": "tag2 notes",
-                "order": 0,
-                "score": 0,
-                "dictionary": "Test Dictionary 2",
-                "redundant": false
-              }
-            ],
-            "definitions": [
-              {
-                "type": "term",
-                "id": 7,
-                "source": "打ち込む",
-                "rawSource": "打ち込む",
-                "sourceTerm": "打ち込む",
-                "reasons": [],
-                "score": 10,
-                "isPrimary": true,
-                "sequence": 4,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "dictionaryNames": [
-                  "Test Dictionary 2"
-                ],
-                "expression": "打ち込む",
-                "reading": "うちこむ",
-                "expressions": [
-                  {
-                    "sourceTerm": "打ち込む",
-                    "expression": "打ち込む",
-                    "reading": "うちこむ",
-                    "termTags": [
-                      {
-                        "name": "tag3",
-                        "category": "category3",
-                        "notes": "tag3 notes",
-                        "order": 0,
-                        "score": 0,
-                        "dictionary": "Test Dictionary 2",
-                        "redundant": false
-                      },
-                      {
-                        "name": "tag4",
-                        "category": "category4",
-                        "notes": "tag4 notes",
-                        "order": 0,
-                        "score": 0,
-                        "dictionary": "Test Dictionary 2",
-                        "redundant": false
-                      },
-                      {
-                        "name": "tag5",
-                        "category": "category5",
-                        "notes": "tag5 notes",
-                        "order": 0,
-                        "score": 0,
-                        "dictionary": "Test Dictionary 2",
-                        "redundant": false
-                      }
-                    ],
-                    "frequencies": [
-                      {
-                        "index": 0,
-                        "expressionIndex": 0,
-                        "dictionary": "Test Dictionary 2",
-                        "dictionaryOrder": {
-                          "index": 0,
-                          "priority": 0
-                        },
-                        "expression": "打ち込む",
-                        "reading": "うちこむ",
-                        "hasReading": false,
-                        "frequency": 3
-                      },
-                      {
-                        "index": 1,
-                        "expressionIndex": 0,
-                        "dictionary": "Test Dictionary 2",
-                        "dictionaryOrder": {
-                          "index": 0,
-                          "priority": 0
-                        },
-                        "expression": "打ち込む",
-                        "reading": "うちこむ",
-                        "hasReading": true,
-                        "frequency": 8
-                      }
-                    ],
-                    "pitches": [
-                      {
-                        "index": 0,
-                        "expressionIndex": 0,
-                        "dictionary": "Test Dictionary 2",
-                        "dictionaryOrder": {
-                          "index": 0,
-                          "priority": 0
-                        },
-                        "expression": "打ち込む",
-                        "reading": "うちこむ",
-                        "pitches": [
-                          {
-                            "position": 0,
-                            "tags": []
-                          },
-                          {
-                            "position": 3,
-                            "tags": []
-                          }
-                        ]
-                      }
-                    ]
-                  }
-                ],
-                "glossary": [
-                  "definition13",
-                  "definition14"
-                ],
-                "definitionTags": [
-                  {
-                    "name": "tag1",
-                    "category": "category1",
-                    "notes": "tag1 notes",
-                    "order": 0,
-                    "score": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "redundant": false
-                  },
-                  {
-                    "name": "tag2",
-                    "category": "category2",
-                    "notes": "tag2 notes",
-                    "order": 0,
-                    "score": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "redundant": false
-                  }
-                ],
-                "termTags": [
-                  {
-                    "name": "tag3",
-                    "category": "category3",
-                    "notes": "tag3 notes",
-                    "order": 0,
-                    "score": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "redundant": false
-                  },
-                  {
-                    "name": "tag4",
-                    "category": "category4",
-                    "notes": "tag4 notes",
-                    "order": 0,
-                    "score": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "redundant": false
-                  },
-                  {
-                    "name": "tag5",
-                    "category": "category5",
-                    "notes": "tag5 notes",
-                    "order": 0,
-                    "score": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "redundant": false
-                  }
-                ],
-                "frequencies": [
-                  {
-                    "index": 0,
-                    "expressionIndex": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "dictionaryOrder": {
-                      "index": 0,
-                      "priority": 0
-                    },
-                    "expression": "打ち込む",
-                    "reading": "うちこむ",
-                    "hasReading": false,
-                    "frequency": 3
-                  },
-                  {
-                    "index": 1,
-                    "expressionIndex": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "dictionaryOrder": {
-                      "index": 0,
-                      "priority": 0
-                    },
-                    "expression": "打ち込む",
-                    "reading": "うちこむ",
-                    "hasReading": true,
-                    "frequency": 8
-                  }
-                ],
-                "pitches": [
-                  {
-                    "index": 0,
-                    "expressionIndex": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "dictionaryOrder": {
-                      "index": 0,
-                      "priority": 0
-                    },
-                    "expression": "打ち込む",
-                    "reading": "うちこむ",
-                    "pitches": [
-                      {
-                        "position": 0,
-                        "tags": []
-                      },
-                      {
-                        "position": 3,
-                        "tags": []
-                      }
-                    ]
-                  }
-                ],
-                "sourceTermExactMatchCount": 1
-              }
-            ],
-            "frequencies": [
-              {
-                "index": 0,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打ち込む",
-                "reading": "うちこむ",
-                "hasReading": false,
-                "frequency": 3
-              },
-              {
-                "index": 1,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打ち込む",
-                "reading": "うちこむ",
-                "hasReading": true,
-                "frequency": 8
+                "order": 0,
+                "score": 0,
+                "content": [
+                  "tag2 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
+                "redundant": false
               }
             ],
-            "pitches": [
-              {
-                "index": 0,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打ち込む",
-                "reading": "うちこむ",
-                "pitches": [
-                  {
-                    "position": 0,
-                    "tags": []
-                  },
-                  {
-                    "position": 3,
-                    "tags": []
-                  }
-                ]
-              }
-            ],
-            "only": [
-              "うちこむ"
-            ],
-            "sourceTermExactMatchCount": 1
+            "entries": [
+              "definition13",
+              "definition14"
+            ]
           },
           {
-            "type": "termMergedByGlossary",
-            "source": "打ち込む",
-            "rawSource": "打ち込む",
-            "reasons": [],
-            "score": 10,
-            "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "dictionaryNames": [
-              "Test Dictionary 2"
-            ],
-            "expression": [
-              "打ち込む"
-            ],
-            "reading": [
-              "ぶちこむ"
-            ],
-            "expressions": [
-              {
-                "sourceTerm": "打ち込む",
-                "expression": "打ち込む",
-                "reading": "ぶちこむ",
-                "termTags": [
-                  {
-                    "name": "tag3",
-                    "category": "category3",
-                    "notes": "tag3 notes",
-                    "order": 0,
-                    "score": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "redundant": false
-                  },
-                  {
-                    "name": "tag4",
-                    "category": "category4",
-                    "notes": "tag4 notes",
-                    "order": 0,
-                    "score": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "redundant": false
-                  },
-                  {
-                    "name": "tag5",
-                    "category": "category5",
-                    "notes": "tag5 notes",
-                    "order": 0,
-                    "score": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "redundant": false
-                  }
-                ],
-                "frequencies": [
-                  {
-                    "index": 0,
-                    "expressionIndex": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "dictionaryOrder": {
-                      "index": 0,
-                      "priority": 0
-                    },
-                    "expression": "打ち込む",
-                    "reading": "ぶちこむ",
-                    "hasReading": false,
-                    "frequency": 3
-                  },
-                  {
-                    "index": 1,
-                    "expressionIndex": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "dictionaryOrder": {
-                      "index": 0,
-                      "priority": 0
-                    },
-                    "expression": "打ち込む",
-                    "reading": "ぶちこむ",
-                    "hasReading": true,
-                    "frequency": 9
-                  }
-                ],
-                "pitches": [
-                  {
-                    "index": 0,
-                    "expressionIndex": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "dictionaryOrder": {
-                      "index": 0,
-                      "priority": 0
-                    },
-                    "expression": "打ち込む",
-                    "reading": "ぶちこむ",
-                    "pitches": [
-                      {
-                        "position": 0,
-                        "tags": []
-                      },
-                      {
-                        "position": 3,
-                        "tags": []
-                      }
-                    ]
-                  }
-                ]
-              }
-            ],
-            "glossary": [
-              "definition17",
-              "definition18"
+            "index": 1,
+            "headwordIndices": [
+              1
             ],
-            "definitionTags": [
+            "dictionary": "Test Dictionary 2",
+            "tags": [
               {
                 "name": "tag1",
                 "category": "category1",
-                "notes": "tag1 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag1 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag2",
                 "category": "category2",
-                "notes": "tag2 notes",
-                "order": 0,
-                "score": 0,
-                "dictionary": "Test Dictionary 2",
-                "redundant": false
-              }
-            ],
-            "definitions": [
-              {
-                "type": "term",
-                "id": 9,
-                "source": "打ち込む",
-                "rawSource": "打ち込む",
-                "sourceTerm": "打ち込む",
-                "reasons": [],
-                "score": 10,
-                "isPrimary": true,
-                "sequence": 4,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "dictionaryNames": [
-                  "Test Dictionary 2"
-                ],
-                "expression": "打ち込む",
-                "reading": "ぶちこむ",
-                "expressions": [
-                  {
-                    "sourceTerm": "打ち込む",
-                    "expression": "打ち込む",
-                    "reading": "ぶちこむ",
-                    "termTags": [
-                      {
-                        "name": "tag3",
-                        "category": "category3",
-                        "notes": "tag3 notes",
-                        "order": 0,
-                        "score": 0,
-                        "dictionary": "Test Dictionary 2",
-                        "redundant": false
-                      },
-                      {
-                        "name": "tag4",
-                        "category": "category4",
-                        "notes": "tag4 notes",
-                        "order": 0,
-                        "score": 0,
-                        "dictionary": "Test Dictionary 2",
-                        "redundant": false
-                      },
-                      {
-                        "name": "tag5",
-                        "category": "category5",
-                        "notes": "tag5 notes",
-                        "order": 0,
-                        "score": 0,
-                        "dictionary": "Test Dictionary 2",
-                        "redundant": false
-                      }
-                    ],
-                    "frequencies": [
-                      {
-                        "index": 0,
-                        "expressionIndex": 0,
-                        "dictionary": "Test Dictionary 2",
-                        "dictionaryOrder": {
-                          "index": 0,
-                          "priority": 0
-                        },
-                        "expression": "打ち込む",
-                        "reading": "ぶちこむ",
-                        "hasReading": false,
-                        "frequency": 3
-                      },
-                      {
-                        "index": 1,
-                        "expressionIndex": 0,
-                        "dictionary": "Test Dictionary 2",
-                        "dictionaryOrder": {
-                          "index": 0,
-                          "priority": 0
-                        },
-                        "expression": "打ち込む",
-                        "reading": "ぶちこむ",
-                        "hasReading": true,
-                        "frequency": 9
-                      }
-                    ],
-                    "pitches": [
-                      {
-                        "index": 0,
-                        "expressionIndex": 0,
-                        "dictionary": "Test Dictionary 2",
-                        "dictionaryOrder": {
-                          "index": 0,
-                          "priority": 0
-                        },
-                        "expression": "打ち込む",
-                        "reading": "ぶちこむ",
-                        "pitches": [
-                          {
-                            "position": 0,
-                            "tags": []
-                          },
-                          {
-                            "position": 3,
-                            "tags": []
-                          }
-                        ]
-                      }
-                    ]
-                  }
-                ],
-                "glossary": [
-                  "definition17",
-                  "definition18"
-                ],
-                "definitionTags": [
-                  {
-                    "name": "tag1",
-                    "category": "category1",
-                    "notes": "tag1 notes",
-                    "order": 0,
-                    "score": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "redundant": false
-                  },
-                  {
-                    "name": "tag2",
-                    "category": "category2",
-                    "notes": "tag2 notes",
-                    "order": 0,
-                    "score": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "redundant": false
-                  }
-                ],
-                "termTags": [
-                  {
-                    "name": "tag3",
-                    "category": "category3",
-                    "notes": "tag3 notes",
-                    "order": 0,
-                    "score": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "redundant": false
-                  },
-                  {
-                    "name": "tag4",
-                    "category": "category4",
-                    "notes": "tag4 notes",
-                    "order": 0,
-                    "score": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "redundant": false
-                  },
-                  {
-                    "name": "tag5",
-                    "category": "category5",
-                    "notes": "tag5 notes",
-                    "order": 0,
-                    "score": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "redundant": false
-                  }
-                ],
-                "frequencies": [
-                  {
-                    "index": 0,
-                    "expressionIndex": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "dictionaryOrder": {
-                      "index": 0,
-                      "priority": 0
-                    },
-                    "expression": "打ち込む",
-                    "reading": "ぶちこむ",
-                    "hasReading": false,
-                    "frequency": 3
-                  },
-                  {
-                    "index": 1,
-                    "expressionIndex": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "dictionaryOrder": {
-                      "index": 0,
-                      "priority": 0
-                    },
-                    "expression": "打ち込む",
-                    "reading": "ぶちこむ",
-                    "hasReading": true,
-                    "frequency": 9
-                  }
-                ],
-                "pitches": [
-                  {
-                    "index": 0,
-                    "expressionIndex": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "dictionaryOrder": {
-                      "index": 0,
-                      "priority": 0
-                    },
-                    "expression": "打ち込む",
-                    "reading": "ぶちこむ",
-                    "pitches": [
-                      {
-                        "position": 0,
-                        "tags": []
-                      },
-                      {
-                        "position": 3,
-                        "tags": []
-                      }
-                    ]
-                  }
-                ],
-                "sourceTermExactMatchCount": 1
-              }
-            ],
-            "frequencies": [
-              {
-                "index": 0,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打ち込む",
-                "reading": "ぶちこむ",
-                "hasReading": false,
-                "frequency": 3
-              },
-              {
-                "index": 1,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打ち込む",
-                "reading": "ぶちこむ",
-                "hasReading": true,
-                "frequency": 9
+                "order": 0,
+                "score": 0,
+                "content": [
+                  "tag2 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
+                "redundant": false
               }
             ],
-            "pitches": [
-              {
-                "index": 0,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打ち込む",
-                "reading": "ぶちこむ",
-                "pitches": [
-                  {
-                    "position": 0,
-                    "tags": []
-                  },
-                  {
-                    "position": 3,
-                    "tags": []
-                  }
-                ]
-              }
-            ],
-            "only": [
-              "ぶちこむ"
-            ],
-            "sourceTermExactMatchCount": 1
+            "entries": [
+              "definition17",
+              "definition18"
+            ]
           },
           {
-            "type": "termMergedByGlossary",
-            "source": "打ち込む",
-            "rawSource": "打ち込む",
-            "reasons": [],
-            "score": 1,
-            "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "dictionaryNames": [
-              "Test Dictionary 2"
-            ],
-            "expression": [
-              "打ち込む"
-            ],
-            "reading": [
-              "うちこむ"
-            ],
-            "expressions": [
-              {
-                "sourceTerm": "打ち込む",
-                "expression": "打ち込む",
-                "reading": "うちこむ",
-                "termTags": [
-                  {
-                    "name": "tag5",
-                    "category": "category5",
-                    "notes": "tag5 notes",
-                    "order": 0,
-                    "score": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "redundant": false
-                  },
-                  {
-                    "name": "tag6",
-                    "category": "default",
-                    "notes": "",
-                    "order": 0,
-                    "score": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "redundant": false
-                  },
-                  {
-                    "name": "tag7",
-                    "category": "default",
-                    "notes": "",
-                    "order": 0,
-                    "score": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "redundant": false
-                  }
-                ],
-                "frequencies": [
-                  {
-                    "index": 0,
-                    "expressionIndex": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "dictionaryOrder": {
-                      "index": 0,
-                      "priority": 0
-                    },
-                    "expression": "打ち込む",
-                    "reading": "うちこむ",
-                    "hasReading": false,
-                    "frequency": 3
-                  },
-                  {
-                    "index": 1,
-                    "expressionIndex": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "dictionaryOrder": {
-                      "index": 0,
-                      "priority": 0
-                    },
-                    "expression": "打ち込む",
-                    "reading": "うちこむ",
-                    "hasReading": true,
-                    "frequency": 8
-                  }
-                ],
-                "pitches": [
-                  {
-                    "index": 0,
-                    "expressionIndex": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "dictionaryOrder": {
-                      "index": 0,
-                      "priority": 0
-                    },
-                    "expression": "打ち込む",
-                    "reading": "うちこむ",
-                    "pitches": [
-                      {
-                        "position": 0,
-                        "tags": []
-                      },
-                      {
-                        "position": 3,
-                        "tags": []
-                      }
-                    ]
-                  }
-                ]
-              }
-            ],
-            "glossary": [
-              "definition15",
-              "definition16"
+            "index": 2,
+            "headwordIndices": [
+              0
             ],
-            "definitionTags": [
+            "dictionary": "Test Dictionary 2",
+            "tags": [
               {
                 "name": "tag1",
                 "category": "category1",
-                "notes": "tag1 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag1 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag2",
                 "category": "category2",
-                "notes": "tag2 notes",
-                "order": 0,
-                "score": 0,
-                "dictionary": "Test Dictionary 2",
-                "redundant": false
-              }
-            ],
-            "definitions": [
-              {
-                "type": "term",
-                "id": 8,
-                "source": "打ち込む",
-                "rawSource": "打ち込む",
-                "sourceTerm": "打ち込む",
-                "reasons": [],
-                "score": 1,
-                "isPrimary": true,
-                "sequence": 4,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "dictionaryNames": [
-                  "Test Dictionary 2"
-                ],
-                "expression": "打ち込む",
-                "reading": "うちこむ",
-                "expressions": [
-                  {
-                    "sourceTerm": "打ち込む",
-                    "expression": "打ち込む",
-                    "reading": "うちこむ",
-                    "termTags": [
-                      {
-                        "name": "tag5",
-                        "category": "category5",
-                        "notes": "tag5 notes",
-                        "order": 0,
-                        "score": 0,
-                        "dictionary": "Test Dictionary 2",
-                        "redundant": false
-                      },
-                      {
-                        "name": "tag6",
-                        "category": "default",
-                        "notes": "",
-                        "order": 0,
-                        "score": 0,
-                        "dictionary": "Test Dictionary 2",
-                        "redundant": false
-                      },
-                      {
-                        "name": "tag7",
-                        "category": "default",
-                        "notes": "",
-                        "order": 0,
-                        "score": 0,
-                        "dictionary": "Test Dictionary 2",
-                        "redundant": false
-                      }
-                    ],
-                    "frequencies": [
-                      {
-                        "index": 0,
-                        "expressionIndex": 0,
-                        "dictionary": "Test Dictionary 2",
-                        "dictionaryOrder": {
-                          "index": 0,
-                          "priority": 0
-                        },
-                        "expression": "打ち込む",
-                        "reading": "うちこむ",
-                        "hasReading": false,
-                        "frequency": 3
-                      },
-                      {
-                        "index": 1,
-                        "expressionIndex": 0,
-                        "dictionary": "Test Dictionary 2",
-                        "dictionaryOrder": {
-                          "index": 0,
-                          "priority": 0
-                        },
-                        "expression": "打ち込む",
-                        "reading": "うちこむ",
-                        "hasReading": true,
-                        "frequency": 8
-                      }
-                    ],
-                    "pitches": [
-                      {
-                        "index": 0,
-                        "expressionIndex": 0,
-                        "dictionary": "Test Dictionary 2",
-                        "dictionaryOrder": {
-                          "index": 0,
-                          "priority": 0
-                        },
-                        "expression": "打ち込む",
-                        "reading": "うちこむ",
-                        "pitches": [
-                          {
-                            "position": 0,
-                            "tags": []
-                          },
-                          {
-                            "position": 3,
-                            "tags": []
-                          }
-                        ]
-                      }
-                    ]
-                  }
-                ],
-                "glossary": [
-                  "definition15",
-                  "definition16"
-                ],
-                "definitionTags": [
-                  {
-                    "name": "tag1",
-                    "category": "category1",
-                    "notes": "tag1 notes",
-                    "order": 0,
-                    "score": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "redundant": false
-                  },
-                  {
-                    "name": "tag2",
-                    "category": "category2",
-                    "notes": "tag2 notes",
-                    "order": 0,
-                    "score": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "redundant": false
-                  }
-                ],
-                "termTags": [
-                  {
-                    "name": "tag5",
-                    "category": "category5",
-                    "notes": "tag5 notes",
-                    "order": 0,
-                    "score": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "redundant": false
-                  },
-                  {
-                    "name": "tag6",
-                    "category": "default",
-                    "notes": "",
-                    "order": 0,
-                    "score": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "redundant": false
-                  },
-                  {
-                    "name": "tag7",
-                    "category": "default",
-                    "notes": "",
-                    "order": 0,
-                    "score": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "redundant": false
-                  }
-                ],
-                "frequencies": [
-                  {
-                    "index": 0,
-                    "expressionIndex": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "dictionaryOrder": {
-                      "index": 0,
-                      "priority": 0
-                    },
-                    "expression": "打ち込む",
-                    "reading": "うちこむ",
-                    "hasReading": false,
-                    "frequency": 3
-                  },
-                  {
-                    "index": 1,
-                    "expressionIndex": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "dictionaryOrder": {
-                      "index": 0,
-                      "priority": 0
-                    },
-                    "expression": "打ち込む",
-                    "reading": "うちこむ",
-                    "hasReading": true,
-                    "frequency": 8
-                  }
-                ],
-                "pitches": [
-                  {
-                    "index": 0,
-                    "expressionIndex": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "dictionaryOrder": {
-                      "index": 0,
-                      "priority": 0
-                    },
-                    "expression": "打ち込む",
-                    "reading": "うちこむ",
-                    "pitches": [
-                      {
-                        "position": 0,
-                        "tags": []
-                      },
-                      {
-                        "position": 3,
-                        "tags": []
-                      }
-                    ]
-                  }
-                ],
-                "sourceTermExactMatchCount": 1
-              }
-            ],
-            "frequencies": [
-              {
-                "index": 0,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打ち込む",
-                "reading": "うちこむ",
-                "hasReading": false,
-                "frequency": 3
-              },
-              {
-                "index": 1,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打ち込む",
-                "reading": "うちこむ",
-                "hasReading": true,
-                "frequency": 8
+                "order": 0,
+                "score": 0,
+                "content": [
+                  "tag2 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
+                "redundant": false
               }
             ],
-            "pitches": [
-              {
-                "index": 0,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打ち込む",
-                "reading": "うちこむ",
-                "pitches": [
-                  {
-                    "position": 0,
-                    "tags": []
-                  },
-                  {
-                    "position": 3,
-                    "tags": []
-                  }
-                ]
-              }
-            ],
-            "only": [
-              "うちこむ"
-            ],
-            "sourceTermExactMatchCount": 1
+            "entries": [
+              "definition15",
+              "definition16"
+            ]
           },
           {
-            "type": "termMergedByGlossary",
-            "source": "打ち込む",
-            "rawSource": "打ち込む",
-            "reasons": [],
-            "score": 1,
-            "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "dictionaryNames": [
-              "Test Dictionary 2"
-            ],
-            "expression": [
-              "打ち込む"
-            ],
-            "reading": [
-              "ぶちこむ"
-            ],
-            "expressions": [
-              {
-                "sourceTerm": "打ち込む",
-                "expression": "打ち込む",
-                "reading": "ぶちこむ",
-                "termTags": [
-                  {
-                    "name": "tag3",
-                    "category": "category3",
-                    "notes": "tag3 notes",
-                    "order": 0,
-                    "score": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "redundant": false
-                  },
-                  {
-                    "name": "tag4",
-                    "category": "category4",
-                    "notes": "tag4 notes",
-                    "order": 0,
-                    "score": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "redundant": false
-                  },
-                  {
-                    "name": "tag5",
-                    "category": "category5",
-                    "notes": "tag5 notes",
-                    "order": 0,
-                    "score": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "redundant": false
-                  }
-                ],
-                "frequencies": [
-                  {
-                    "index": 0,
-                    "expressionIndex": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "dictionaryOrder": {
-                      "index": 0,
-                      "priority": 0
-                    },
-                    "expression": "打ち込む",
-                    "reading": "ぶちこむ",
-                    "hasReading": false,
-                    "frequency": 3
-                  },
-                  {
-                    "index": 1,
-                    "expressionIndex": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "dictionaryOrder": {
-                      "index": 0,
-                      "priority": 0
-                    },
-                    "expression": "打ち込む",
-                    "reading": "ぶちこむ",
-                    "hasReading": true,
-                    "frequency": 9
-                  }
-                ],
-                "pitches": [
-                  {
-                    "index": 0,
-                    "expressionIndex": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "dictionaryOrder": {
-                      "index": 0,
-                      "priority": 0
-                    },
-                    "expression": "打ち込む",
-                    "reading": "ぶちこむ",
-                    "pitches": [
-                      {
-                        "position": 0,
-                        "tags": []
-                      },
-                      {
-                        "position": 3,
-                        "tags": []
-                      }
-                    ]
-                  }
-                ]
-              }
-            ],
-            "glossary": [
-              "definition19",
-              "definition20"
+            "index": 3,
+            "headwordIndices": [
+              1
             ],
-            "definitionTags": [
+            "dictionary": "Test Dictionary 2",
+            "tags": [
               {
                 "name": "tag1",
                 "category": "category1",
-                "notes": "tag1 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag1 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag2",
                 "category": "category2",
-                "notes": "tag2 notes",
-                "order": 0,
-                "score": 0,
-                "dictionary": "Test Dictionary 2",
-                "redundant": false
-              }
-            ],
-            "definitions": [
-              {
-                "type": "term",
-                "id": 10,
-                "source": "打ち込む",
-                "rawSource": "打ち込む",
-                "sourceTerm": "打ち込む",
-                "reasons": [],
-                "score": 1,
-                "isPrimary": true,
-                "sequence": 4,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "dictionaryNames": [
-                  "Test Dictionary 2"
-                ],
-                "expression": "打ち込む",
-                "reading": "ぶちこむ",
-                "expressions": [
-                  {
-                    "sourceTerm": "打ち込む",
-                    "expression": "打ち込む",
-                    "reading": "ぶちこむ",
-                    "termTags": [
-                      {
-                        "name": "tag3",
-                        "category": "category3",
-                        "notes": "tag3 notes",
-                        "order": 0,
-                        "score": 0,
-                        "dictionary": "Test Dictionary 2",
-                        "redundant": false
-                      },
-                      {
-                        "name": "tag4",
-                        "category": "category4",
-                        "notes": "tag4 notes",
-                        "order": 0,
-                        "score": 0,
-                        "dictionary": "Test Dictionary 2",
-                        "redundant": false
-                      },
-                      {
-                        "name": "tag5",
-                        "category": "category5",
-                        "notes": "tag5 notes",
-                        "order": 0,
-                        "score": 0,
-                        "dictionary": "Test Dictionary 2",
-                        "redundant": false
-                      }
-                    ],
-                    "frequencies": [
-                      {
-                        "index": 0,
-                        "expressionIndex": 0,
-                        "dictionary": "Test Dictionary 2",
-                        "dictionaryOrder": {
-                          "index": 0,
-                          "priority": 0
-                        },
-                        "expression": "打ち込む",
-                        "reading": "ぶちこむ",
-                        "hasReading": false,
-                        "frequency": 3
-                      },
-                      {
-                        "index": 1,
-                        "expressionIndex": 0,
-                        "dictionary": "Test Dictionary 2",
-                        "dictionaryOrder": {
-                          "index": 0,
-                          "priority": 0
-                        },
-                        "expression": "打ち込む",
-                        "reading": "ぶちこむ",
-                        "hasReading": true,
-                        "frequency": 9
-                      }
-                    ],
-                    "pitches": [
-                      {
-                        "index": 0,
-                        "expressionIndex": 0,
-                        "dictionary": "Test Dictionary 2",
-                        "dictionaryOrder": {
-                          "index": 0,
-                          "priority": 0
-                        },
-                        "expression": "打ち込む",
-                        "reading": "ぶちこむ",
-                        "pitches": [
-                          {
-                            "position": 0,
-                            "tags": []
-                          },
-                          {
-                            "position": 3,
-                            "tags": []
-                          }
-                        ]
-                      }
-                    ]
-                  }
-                ],
-                "glossary": [
-                  "definition19",
-                  "definition20"
-                ],
-                "definitionTags": [
-                  {
-                    "name": "tag1",
-                    "category": "category1",
-                    "notes": "tag1 notes",
-                    "order": 0,
-                    "score": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "redundant": false
-                  },
-                  {
-                    "name": "tag2",
-                    "category": "category2",
-                    "notes": "tag2 notes",
-                    "order": 0,
-                    "score": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "redundant": false
-                  }
-                ],
-                "termTags": [
-                  {
-                    "name": "tag3",
-                    "category": "category3",
-                    "notes": "tag3 notes",
-                    "order": 0,
-                    "score": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "redundant": false
-                  },
-                  {
-                    "name": "tag4",
-                    "category": "category4",
-                    "notes": "tag4 notes",
-                    "order": 0,
-                    "score": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "redundant": false
-                  },
-                  {
-                    "name": "tag5",
-                    "category": "category5",
-                    "notes": "tag5 notes",
-                    "order": 0,
-                    "score": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "redundant": false
-                  }
-                ],
-                "frequencies": [
-                  {
-                    "index": 0,
-                    "expressionIndex": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "dictionaryOrder": {
-                      "index": 0,
-                      "priority": 0
-                    },
-                    "expression": "打ち込む",
-                    "reading": "ぶちこむ",
-                    "hasReading": false,
-                    "frequency": 3
-                  },
-                  {
-                    "index": 1,
-                    "expressionIndex": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "dictionaryOrder": {
-                      "index": 0,
-                      "priority": 0
-                    },
-                    "expression": "打ち込む",
-                    "reading": "ぶちこむ",
-                    "hasReading": true,
-                    "frequency": 9
-                  }
-                ],
-                "pitches": [
-                  {
-                    "index": 0,
-                    "expressionIndex": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "dictionaryOrder": {
-                      "index": 0,
-                      "priority": 0
-                    },
-                    "expression": "打ち込む",
-                    "reading": "ぶちこむ",
-                    "pitches": [
-                      {
-                        "position": 0,
-                        "tags": []
-                      },
-                      {
-                        "position": 3,
-                        "tags": []
-                      }
-                    ]
-                  }
-                ],
-                "sourceTermExactMatchCount": 1
-              }
-            ],
-            "frequencies": [
-              {
-                "index": 0,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打ち込む",
-                "reading": "ぶちこむ",
-                "hasReading": false,
-                "frequency": 3
-              },
-              {
-                "index": 1,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打ち込む",
-                "reading": "ぶちこむ",
-                "hasReading": true,
-                "frequency": 9
+                "order": 0,
+                "score": 0,
+                "content": [
+                  "tag2 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
+                "redundant": false
               }
             ],
-            "pitches": [
-              {
-                "index": 0,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打ち込む",
-                "reading": "ぶちこむ",
-                "pitches": [
-                  {
-                    "position": 0,
-                    "tags": []
-                  },
-                  {
-                    "position": 3,
-                    "tags": []
-                  }
-                ]
-              }
-            ],
-            "only": [
-              "ぶちこむ"
-            ],
-            "sourceTermExactMatchCount": 1
-          }
-        ],
-        "frequencies": [
-          {
-            "index": 0,
-            "expressionIndex": 0,
-            "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "expression": "打ち込む",
-            "reading": "うちこむ",
-            "hasReading": false,
-            "frequency": 3
-          },
-          {
-            "index": 2,
-            "expressionIndex": 0,
-            "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "expression": "打ち込む",
-            "reading": "うちこむ",
-            "hasReading": true,
-            "frequency": 8
-          },
-          {
-            "index": 1,
-            "expressionIndex": 1,
-            "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "expression": "打ち込む",
-            "reading": "ぶちこむ",
-            "hasReading": false,
-            "frequency": 3
-          },
-          {
-            "index": 3,
-            "expressionIndex": 1,
-            "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "expression": "打ち込む",
-            "reading": "ぶちこむ",
-            "hasReading": true,
-            "frequency": 9
+            "entries": [
+              "definition19",
+              "definition20"
+            ]
           }
         ],
-        "pitches": [
+        "pronunciations": [
           {
             "index": 0,
-            "expressionIndex": 0,
+            "headwordIndex": 0,
             "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "expression": "打ち込む",
-            "reading": "うちこむ",
+            "dictionaryIndex": 0,
+            "dictionaryPriority": 0,
             "pitches": [
               {
                 "position": 0,
@@ -12271,14 +6655,10 @@
           },
           {
             "index": 1,
-            "expressionIndex": 1,
+            "headwordIndex": 1,
             "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "expression": "打ち込む",
-            "reading": "ぶちこむ",
+            "dictionaryIndex": 0,
+            "dictionaryPriority": 0,
             "pitches": [
               {
                 "position": 0,
@@ -12291,10099 +6671,5323 @@
             ]
           }
         ],
-        "sourceTermExactMatchCount": 4
+        "frequencies": [
+          {
+            "index": 0,
+            "headwordIndex": 0,
+            "dictionary": "Test Dictionary 2",
+            "dictionaryIndex": 0,
+            "dictionaryPriority": 0,
+            "hasReading": false,
+            "frequency": 3
+          },
+          {
+            "index": 2,
+            "headwordIndex": 0,
+            "dictionary": "Test Dictionary 2",
+            "dictionaryIndex": 0,
+            "dictionaryPriority": 0,
+            "hasReading": true,
+            "frequency": 8
+          },
+          {
+            "index": 1,
+            "headwordIndex": 1,
+            "dictionary": "Test Dictionary 2",
+            "dictionaryIndex": 0,
+            "dictionaryPriority": 0,
+            "hasReading": false,
+            "frequency": 3
+          },
+          {
+            "index": 3,
+            "headwordIndex": 1,
+            "dictionary": "Test Dictionary 2",
+            "dictionaryIndex": 0,
+            "dictionaryPriority": 0,
+            "hasReading": true,
+            "frequency": 9
+          }
+        ]
       },
       {
-        "type": "termMerged",
-        "source": "打ち",
-        "rawSource": "打ち",
-        "reasons": [
+        "type": "term",
+        "id": -1,
+        "isPrimary": true,
+        "sequence": -1,
+        "inflections": [
           "masu stem"
         ],
         "score": 10,
-        "dictionary": "Test Dictionary 2",
-        "dictionaryOrder": {
-          "index": 0,
-          "priority": 0
-        },
-        "dictionaryNames": [
-          "Test Dictionary 2"
-        ],
-        "expression": [
-          "打つ"
-        ],
-        "reading": [
-          "うつ",
-          "ぶつ"
-        ],
-        "expressions": [
+        "dictionaryIndex": 0,
+        "dictionaryPriority": 0,
+        "sourceTermExactMatchCount": 4,
+        "maxDeinflectedTextLength": 2,
+        "headwords": [
           {
-            "sourceTerm": "打つ",
-            "expression": "打つ",
+            "index": 0,
+            "term": "打つ",
             "reading": "うつ",
-            "termTags": [
+            "sources": [
+              {
+                "originalText": "打ち",
+                "transformedText": "打ち",
+                "deinflectedText": "打つ",
+                "isPrimary": true
+              }
+            ],
+            "tags": [
               {
                 "name": "tag3",
                 "category": "category3",
-                "notes": "tag3 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag3 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag4",
                 "category": "category4",
-                "notes": "tag4 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag4 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag5",
                 "category": "category5",
-                "notes": "tag5 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag5 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               }
-            ],
-            "frequencies": [
-              {
-                "index": 0,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打つ",
-                "reading": "うつ",
-                "hasReading": false,
-                "frequency": 2
-              },
-              {
-                "index": 1,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打つ",
-                "reading": "うつ",
-                "hasReading": true,
-                "frequency": 6
-              }
-            ],
-            "pitches": []
+            ]
           },
           {
-            "sourceTerm": "打つ",
-            "expression": "打つ",
+            "index": 1,
+            "term": "打つ",
             "reading": "ぶつ",
-            "termTags": [
+            "sources": [
+              {
+                "originalText": "打ち",
+                "transformedText": "打ち",
+                "deinflectedText": "打つ",
+                "isPrimary": true
+              }
+            ],
+            "tags": [
               {
                 "name": "tag3",
                 "category": "category3",
-                "notes": "tag3 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag3 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag4",
                 "category": "category4",
-                "notes": "tag4 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag4 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag5",
                 "category": "category5",
-                "notes": "tag5 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag5 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               }
-            ],
-            "frequencies": [
-              {
-                "index": 0,
-                "expressionIndex": 1,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打つ",
-                "reading": "ぶつ",
-                "hasReading": false,
-                "frequency": 2
-              },
-              {
-                "index": 1,
-                "expressionIndex": 1,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打つ",
-                "reading": "ぶつ",
-                "hasReading": true,
-                "frequency": 7
-              }
-            ],
-            "pitches": []
+            ]
           }
         ],
         "definitions": [
           {
-            "type": "termMergedByGlossary",
-            "source": "打ち",
-            "rawSource": "打ち",
-            "reasons": [],
-            "score": 10,
-            "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "dictionaryNames": [
-              "Test Dictionary 2"
-            ],
-            "expression": [
-              "打つ"
-            ],
-            "reading": [
-              "うつ"
-            ],
-            "expressions": [
-              {
-                "sourceTerm": "打つ",
-                "expression": "打つ",
-                "reading": "うつ",
-                "termTags": [
-                  {
-                    "name": "tag3",
-                    "category": "category3",
-                    "notes": "tag3 notes",
-                    "order": 0,
-                    "score": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "redundant": false
-                  },
-                  {
-                    "name": "tag4",
-                    "category": "category4",
-                    "notes": "tag4 notes",
-                    "order": 0,
-                    "score": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "redundant": false
-                  },
-                  {
-                    "name": "tag5",
-                    "category": "category5",
-                    "notes": "tag5 notes",
-                    "order": 0,
-                    "score": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "redundant": false
-                  }
-                ],
-                "frequencies": [
-                  {
-                    "index": 0,
-                    "expressionIndex": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "dictionaryOrder": {
-                      "index": 0,
-                      "priority": 0
-                    },
-                    "expression": "打つ",
-                    "reading": "うつ",
-                    "hasReading": false,
-                    "frequency": 2
-                  },
-                  {
-                    "index": 1,
-                    "expressionIndex": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "dictionaryOrder": {
-                      "index": 0,
-                      "priority": 0
-                    },
-                    "expression": "打つ",
-                    "reading": "うつ",
-                    "hasReading": true,
-                    "frequency": 6
-                  }
-                ],
-                "pitches": []
-              }
-            ],
-            "glossary": [
-              "definition5",
-              "definition6"
+            "index": 0,
+            "headwordIndices": [
+              0
             ],
-            "definitionTags": [
+            "dictionary": "Test Dictionary 2",
+            "tags": [
               {
                 "name": "tag1",
                 "category": "category1",
-                "notes": "tag1 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag1 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag2",
                 "category": "category2",
-                "notes": "tag2 notes",
-                "order": 0,
-                "score": 0,
-                "dictionary": "Test Dictionary 2",
-                "redundant": false
-              }
-            ],
-            "definitions": [
-              {
-                "type": "term",
-                "id": 3,
-                "source": "打ち",
-                "rawSource": "打ち",
-                "sourceTerm": "打つ",
-                "reasons": [
-                  "masu stem"
-                ],
-                "score": 10,
-                "isPrimary": true,
-                "sequence": 3,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "dictionaryNames": [
-                  "Test Dictionary 2"
-                ],
-                "expression": "打つ",
-                "reading": "うつ",
-                "expressions": [
-                  {
-                    "sourceTerm": "打つ",
-                    "expression": "打つ",
-                    "reading": "うつ",
-                    "termTags": [
-                      {
-                        "name": "tag3",
-                        "category": "category3",
-                        "notes": "tag3 notes",
-                        "order": 0,
-                        "score": 0,
-                        "dictionary": "Test Dictionary 2",
-                        "redundant": false
-                      },
-                      {
-                        "name": "tag4",
-                        "category": "category4",
-                        "notes": "tag4 notes",
-                        "order": 0,
-                        "score": 0,
-                        "dictionary": "Test Dictionary 2",
-                        "redundant": false
-                      },
-                      {
-                        "name": "tag5",
-                        "category": "category5",
-                        "notes": "tag5 notes",
-                        "order": 0,
-                        "score": 0,
-                        "dictionary": "Test Dictionary 2",
-                        "redundant": false
-                      }
-                    ],
-                    "frequencies": [
-                      {
-                        "index": 0,
-                        "expressionIndex": 0,
-                        "dictionary": "Test Dictionary 2",
-                        "dictionaryOrder": {
-                          "index": 0,
-                          "priority": 0
-                        },
-                        "expression": "打つ",
-                        "reading": "うつ",
-                        "hasReading": false,
-                        "frequency": 2
-                      },
-                      {
-                        "index": 1,
-                        "expressionIndex": 0,
-                        "dictionary": "Test Dictionary 2",
-                        "dictionaryOrder": {
-                          "index": 0,
-                          "priority": 0
-                        },
-                        "expression": "打つ",
-                        "reading": "うつ",
-                        "hasReading": true,
-                        "frequency": 6
-                      }
-                    ],
-                    "pitches": []
-                  }
-                ],
-                "glossary": [
-                  "definition5",
-                  "definition6"
-                ],
-                "definitionTags": [
-                  {
-                    "name": "tag1",
-                    "category": "category1",
-                    "notes": "tag1 notes",
-                    "order": 0,
-                    "score": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "redundant": false
-                  },
-                  {
-                    "name": "tag2",
-                    "category": "category2",
-                    "notes": "tag2 notes",
-                    "order": 0,
-                    "score": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "redundant": false
-                  }
-                ],
-                "termTags": [
-                  {
-                    "name": "tag3",
-                    "category": "category3",
-                    "notes": "tag3 notes",
-                    "order": 0,
-                    "score": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "redundant": false
-                  },
-                  {
-                    "name": "tag4",
-                    "category": "category4",
-                    "notes": "tag4 notes",
-                    "order": 0,
-                    "score": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "redundant": false
-                  },
-                  {
-                    "name": "tag5",
-                    "category": "category5",
-                    "notes": "tag5 notes",
-                    "order": 0,
-                    "score": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "redundant": false
-                  }
-                ],
-                "frequencies": [
-                  {
-                    "index": 0,
-                    "expressionIndex": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "dictionaryOrder": {
-                      "index": 0,
-                      "priority": 0
-                    },
-                    "expression": "打つ",
-                    "reading": "うつ",
-                    "hasReading": false,
-                    "frequency": 2
-                  },
-                  {
-                    "index": 1,
-                    "expressionIndex": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "dictionaryOrder": {
-                      "index": 0,
-                      "priority": 0
-                    },
-                    "expression": "打つ",
-                    "reading": "うつ",
-                    "hasReading": true,
-                    "frequency": 6
-                  }
-                ],
-                "pitches": [],
-                "sourceTermExactMatchCount": 1
-              }
-            ],
-            "frequencies": [
-              {
-                "index": 0,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打つ",
-                "reading": "うつ",
-                "hasReading": false,
-                "frequency": 2
-              },
-              {
-                "index": 1,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打つ",
-                "reading": "うつ",
-                "hasReading": true,
-                "frequency": 6
-              }
-            ],
-            "pitches": [],
-            "only": [
-              "うつ"
-            ],
-            "sourceTermExactMatchCount": 1
+                "order": 0,
+                "score": 0,
+                "content": [
+                  "tag2 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
+                "redundant": false
+              }
+            ],
+            "entries": [
+              "definition5",
+              "definition6"
+            ]
           },
           {
-            "type": "termMergedByGlossary",
-            "source": "打ち",
-            "rawSource": "打ち",
-            "reasons": [],
-            "score": 10,
-            "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "dictionaryNames": [
-              "Test Dictionary 2"
-            ],
-            "expression": [
-              "打つ"
-            ],
-            "reading": [
-              "ぶつ"
-            ],
-            "expressions": [
-              {
-                "sourceTerm": "打つ",
-                "expression": "打つ",
-                "reading": "ぶつ",
-                "termTags": [
-                  {
-                    "name": "tag3",
-                    "category": "category3",
-                    "notes": "tag3 notes",
-                    "order": 0,
-                    "score": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "redundant": false
-                  },
-                  {
-                    "name": "tag4",
-                    "category": "category4",
-                    "notes": "tag4 notes",
-                    "order": 0,
-                    "score": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "redundant": false
-                  },
-                  {
-                    "name": "tag5",
-                    "category": "category5",
-                    "notes": "tag5 notes",
-                    "order": 0,
-                    "score": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "redundant": false
-                  }
-                ],
-                "frequencies": [
-                  {
-                    "index": 0,
-                    "expressionIndex": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "dictionaryOrder": {
-                      "index": 0,
-                      "priority": 0
-                    },
-                    "expression": "打つ",
-                    "reading": "ぶつ",
-                    "hasReading": false,
-                    "frequency": 2
-                  },
-                  {
-                    "index": 1,
-                    "expressionIndex": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "dictionaryOrder": {
-                      "index": 0,
-                      "priority": 0
-                    },
-                    "expression": "打つ",
-                    "reading": "ぶつ",
-                    "hasReading": true,
-                    "frequency": 7
-                  }
-                ],
-                "pitches": []
-              }
-            ],
-            "glossary": [
-              "definition9",
-              "definition10"
+            "index": 1,
+            "headwordIndices": [
+              1
             ],
-            "definitionTags": [
+            "dictionary": "Test Dictionary 2",
+            "tags": [
               {
                 "name": "tag1",
                 "category": "category1",
-                "notes": "tag1 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag1 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag2",
                 "category": "category2",
-                "notes": "tag2 notes",
-                "order": 0,
-                "score": 0,
-                "dictionary": "Test Dictionary 2",
-                "redundant": false
-              }
-            ],
-            "definitions": [
-              {
-                "type": "term",
-                "id": 5,
-                "source": "打ち",
-                "rawSource": "打ち",
-                "sourceTerm": "打つ",
-                "reasons": [
-                  "masu stem"
-                ],
-                "score": 10,
-                "isPrimary": true,
-                "sequence": 3,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "dictionaryNames": [
-                  "Test Dictionary 2"
-                ],
-                "expression": "打つ",
-                "reading": "ぶつ",
-                "expressions": [
-                  {
-                    "sourceTerm": "打つ",
-                    "expression": "打つ",
-                    "reading": "ぶつ",
-                    "termTags": [
-                      {
-                        "name": "tag3",
-                        "category": "category3",
-                        "notes": "tag3 notes",
-                        "order": 0,
-                        "score": 0,
-                        "dictionary": "Test Dictionary 2",
-                        "redundant": false
-                      },
-                      {
-                        "name": "tag4",
-                        "category": "category4",
-                        "notes": "tag4 notes",
-                        "order": 0,
-                        "score": 0,
-                        "dictionary": "Test Dictionary 2",
-                        "redundant": false
-                      },
-                      {
-                        "name": "tag5",
-                        "category": "category5",
-                        "notes": "tag5 notes",
-                        "order": 0,
-                        "score": 0,
-                        "dictionary": "Test Dictionary 2",
-                        "redundant": false
-                      }
-                    ],
-                    "frequencies": [
-                      {
-                        "index": 0,
-                        "expressionIndex": 0,
-                        "dictionary": "Test Dictionary 2",
-                        "dictionaryOrder": {
-                          "index": 0,
-                          "priority": 0
-                        },
-                        "expression": "打つ",
-                        "reading": "ぶつ",
-                        "hasReading": false,
-                        "frequency": 2
-                      },
-                      {
-                        "index": 1,
-                        "expressionIndex": 0,
-                        "dictionary": "Test Dictionary 2",
-                        "dictionaryOrder": {
-                          "index": 0,
-                          "priority": 0
-                        },
-                        "expression": "打つ",
-                        "reading": "ぶつ",
-                        "hasReading": true,
-                        "frequency": 7
-                      }
-                    ],
-                    "pitches": []
-                  }
-                ],
-                "glossary": [
-                  "definition9",
-                  "definition10"
-                ],
-                "definitionTags": [
-                  {
-                    "name": "tag1",
-                    "category": "category1",
-                    "notes": "tag1 notes",
-                    "order": 0,
-                    "score": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "redundant": false
-                  },
-                  {
-                    "name": "tag2",
-                    "category": "category2",
-                    "notes": "tag2 notes",
-                    "order": 0,
-                    "score": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "redundant": false
-                  }
-                ],
-                "termTags": [
-                  {
-                    "name": "tag3",
-                    "category": "category3",
-                    "notes": "tag3 notes",
-                    "order": 0,
-                    "score": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "redundant": false
-                  },
-                  {
-                    "name": "tag4",
-                    "category": "category4",
-                    "notes": "tag4 notes",
-                    "order": 0,
-                    "score": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "redundant": false
-                  },
-                  {
-                    "name": "tag5",
-                    "category": "category5",
-                    "notes": "tag5 notes",
-                    "order": 0,
-                    "score": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "redundant": false
-                  }
-                ],
-                "frequencies": [
-                  {
-                    "index": 0,
-                    "expressionIndex": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "dictionaryOrder": {
-                      "index": 0,
-                      "priority": 0
-                    },
-                    "expression": "打つ",
-                    "reading": "ぶつ",
-                    "hasReading": false,
-                    "frequency": 2
-                  },
-                  {
-                    "index": 1,
-                    "expressionIndex": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "dictionaryOrder": {
-                      "index": 0,
-                      "priority": 0
-                    },
-                    "expression": "打つ",
-                    "reading": "ぶつ",
-                    "hasReading": true,
-                    "frequency": 7
-                  }
-                ],
-                "pitches": [],
-                "sourceTermExactMatchCount": 1
-              }
-            ],
-            "frequencies": [
-              {
-                "index": 0,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打つ",
-                "reading": "ぶつ",
-                "hasReading": false,
-                "frequency": 2
-              },
-              {
-                "index": 1,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打つ",
-                "reading": "ぶつ",
-                "hasReading": true,
-                "frequency": 7
-              }
-            ],
-            "pitches": [],
-            "only": [
-              "ぶつ"
-            ],
-            "sourceTermExactMatchCount": 1
+                "order": 0,
+                "score": 0,
+                "content": [
+                  "tag2 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
+                "redundant": false
+              }
+            ],
+            "entries": [
+              "definition9",
+              "definition10"
+            ]
           },
           {
-            "type": "termMergedByGlossary",
-            "source": "打ち",
-            "rawSource": "打ち",
-            "reasons": [],
-            "score": 1,
-            "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "dictionaryNames": [
-              "Test Dictionary 2"
-            ],
-            "expression": [
-              "打つ"
-            ],
-            "reading": [
-              "うつ"
-            ],
-            "expressions": [
-              {
-                "sourceTerm": "打つ",
-                "expression": "打つ",
-                "reading": "うつ",
-                "termTags": [
-                  {
-                    "name": "tag3",
-                    "category": "category3",
-                    "notes": "tag3 notes",
-                    "order": 0,
-                    "score": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "redundant": false
-                  },
-                  {
-                    "name": "tag4",
-                    "category": "category4",
-                    "notes": "tag4 notes",
-                    "order": 0,
-                    "score": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "redundant": false
-                  },
-                  {
-                    "name": "tag5",
-                    "category": "category5",
-                    "notes": "tag5 notes",
-                    "order": 0,
-                    "score": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "redundant": false
-                  }
-                ],
-                "frequencies": [
-                  {
-                    "index": 0,
-                    "expressionIndex": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "dictionaryOrder": {
-                      "index": 0,
-                      "priority": 0
-                    },
-                    "expression": "打つ",
-                    "reading": "うつ",
-                    "hasReading": false,
-                    "frequency": 2
-                  },
-                  {
-                    "index": 1,
-                    "expressionIndex": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "dictionaryOrder": {
-                      "index": 0,
-                      "priority": 0
-                    },
-                    "expression": "打つ",
-                    "reading": "うつ",
-                    "hasReading": true,
-                    "frequency": 6
-                  }
-                ],
-                "pitches": []
-              }
-            ],
-            "glossary": [
-              "definition7",
-              "definition8"
+            "index": 2,
+            "headwordIndices": [
+              0
             ],
-            "definitionTags": [
+            "dictionary": "Test Dictionary 2",
+            "tags": [
               {
                 "name": "tag1",
                 "category": "category1",
-                "notes": "tag1 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag1 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag2",
                 "category": "category2",
-                "notes": "tag2 notes",
-                "order": 0,
-                "score": 0,
-                "dictionary": "Test Dictionary 2",
-                "redundant": false
-              }
-            ],
-            "definitions": [
-              {
-                "type": "term",
-                "id": 4,
-                "source": "打ち",
-                "rawSource": "打ち",
-                "sourceTerm": "打つ",
-                "reasons": [
-                  "masu stem"
-                ],
-                "score": 1,
-                "isPrimary": true,
-                "sequence": 3,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "dictionaryNames": [
-                  "Test Dictionary 2"
-                ],
-                "expression": "打つ",
-                "reading": "うつ",
-                "expressions": [
-                  {
-                    "sourceTerm": "打つ",
-                    "expression": "打つ",
-                    "reading": "うつ",
-                    "termTags": [
-                      {
-                        "name": "tag3",
-                        "category": "category3",
-                        "notes": "tag3 notes",
-                        "order": 0,
-                        "score": 0,
-                        "dictionary": "Test Dictionary 2",
-                        "redundant": false
-                      },
-                      {
-                        "name": "tag4",
-                        "category": "category4",
-                        "notes": "tag4 notes",
-                        "order": 0,
-                        "score": 0,
-                        "dictionary": "Test Dictionary 2",
-                        "redundant": false
-                      },
-                      {
-                        "name": "tag5",
-                        "category": "category5",
-                        "notes": "tag5 notes",
-                        "order": 0,
-                        "score": 0,
-                        "dictionary": "Test Dictionary 2",
-                        "redundant": false
-                      }
-                    ],
-                    "frequencies": [
-                      {
-                        "index": 0,
-                        "expressionIndex": 0,
-                        "dictionary": "Test Dictionary 2",
-                        "dictionaryOrder": {
-                          "index": 0,
-                          "priority": 0
-                        },
-                        "expression": "打つ",
-                        "reading": "うつ",
-                        "hasReading": false,
-                        "frequency": 2
-                      },
-                      {
-                        "index": 1,
-                        "expressionIndex": 0,
-                        "dictionary": "Test Dictionary 2",
-                        "dictionaryOrder": {
-                          "index": 0,
-                          "priority": 0
-                        },
-                        "expression": "打つ",
-                        "reading": "うつ",
-                        "hasReading": true,
-                        "frequency": 6
-                      }
-                    ],
-                    "pitches": []
-                  }
-                ],
-                "glossary": [
-                  "definition7",
-                  "definition8"
-                ],
-                "definitionTags": [
-                  {
-                    "name": "tag1",
-                    "category": "category1",
-                    "notes": "tag1 notes",
-                    "order": 0,
-                    "score": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "redundant": false
-                  },
-                  {
-                    "name": "tag2",
-                    "category": "category2",
-                    "notes": "tag2 notes",
-                    "order": 0,
-                    "score": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "redundant": false
-                  }
-                ],
-                "termTags": [
-                  {
-                    "name": "tag3",
-                    "category": "category3",
-                    "notes": "tag3 notes",
-                    "order": 0,
-                    "score": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "redundant": false
-                  },
-                  {
-                    "name": "tag4",
-                    "category": "category4",
-                    "notes": "tag4 notes",
-                    "order": 0,
-                    "score": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "redundant": false
-                  },
-                  {
-                    "name": "tag5",
-                    "category": "category5",
-                    "notes": "tag5 notes",
-                    "order": 0,
-                    "score": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "redundant": false
-                  }
-                ],
-                "frequencies": [
-                  {
-                    "index": 0,
-                    "expressionIndex": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "dictionaryOrder": {
-                      "index": 0,
-                      "priority": 0
-                    },
-                    "expression": "打つ",
-                    "reading": "うつ",
-                    "hasReading": false,
-                    "frequency": 2
-                  },
-                  {
-                    "index": 1,
-                    "expressionIndex": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "dictionaryOrder": {
-                      "index": 0,
-                      "priority": 0
-                    },
-                    "expression": "打つ",
-                    "reading": "うつ",
-                    "hasReading": true,
-                    "frequency": 6
-                  }
-                ],
-                "pitches": [],
-                "sourceTermExactMatchCount": 1
-              }
-            ],
-            "frequencies": [
-              {
-                "index": 0,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打つ",
-                "reading": "うつ",
-                "hasReading": false,
-                "frequency": 2
-              },
-              {
-                "index": 1,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打つ",
-                "reading": "うつ",
-                "hasReading": true,
-                "frequency": 6
-              }
-            ],
-            "pitches": [],
-            "only": [
-              "うつ"
-            ],
-            "sourceTermExactMatchCount": 1
+                "order": 0,
+                "score": 0,
+                "content": [
+                  "tag2 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
+                "redundant": false
+              }
+            ],
+            "entries": [
+              "definition7",
+              "definition8"
+            ]
           },
           {
-            "type": "termMergedByGlossary",
-            "source": "打ち",
-            "rawSource": "打ち",
-            "reasons": [],
-            "score": 1,
-            "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "dictionaryNames": [
-              "Test Dictionary 2"
-            ],
-            "expression": [
-              "打つ"
-            ],
-            "reading": [
-              "ぶつ"
-            ],
-            "expressions": [
-              {
-                "sourceTerm": "打つ",
-                "expression": "打つ",
-                "reading": "ぶつ",
-                "termTags": [
-                  {
-                    "name": "tag3",
-                    "category": "category3",
-                    "notes": "tag3 notes",
-                    "order": 0,
-                    "score": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "redundant": false
-                  },
-                  {
-                    "name": "tag4",
-                    "category": "category4",
-                    "notes": "tag4 notes",
-                    "order": 0,
-                    "score": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "redundant": false
-                  },
-                  {
-                    "name": "tag5",
-                    "category": "category5",
-                    "notes": "tag5 notes",
-                    "order": 0,
-                    "score": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "redundant": false
-                  }
-                ],
-                "frequencies": [
-                  {
-                    "index": 0,
-                    "expressionIndex": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "dictionaryOrder": {
-                      "index": 0,
-                      "priority": 0
-                    },
-                    "expression": "打つ",
-                    "reading": "ぶつ",
-                    "hasReading": false,
-                    "frequency": 2
-                  },
-                  {
-                    "index": 1,
-                    "expressionIndex": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "dictionaryOrder": {
-                      "index": 0,
-                      "priority": 0
-                    },
-                    "expression": "打つ",
-                    "reading": "ぶつ",
-                    "hasReading": true,
-                    "frequency": 7
-                  }
-                ],
-                "pitches": []
-              }
-            ],
-            "glossary": [
-              "definition11",
-              "definition12"
+            "index": 3,
+            "headwordIndices": [
+              1
             ],
-            "definitionTags": [
+            "dictionary": "Test Dictionary 2",
+            "tags": [
               {
                 "name": "tag1",
                 "category": "category1",
-                "notes": "tag1 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag1 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag2",
                 "category": "category2",
-                "notes": "tag2 notes",
-                "order": 0,
-                "score": 0,
-                "dictionary": "Test Dictionary 2",
-                "redundant": false
-              }
-            ],
-            "definitions": [
-              {
-                "type": "term",
-                "id": 6,
-                "source": "打ち",
-                "rawSource": "打ち",
-                "sourceTerm": "打つ",
-                "reasons": [
-                  "masu stem"
-                ],
-                "score": 1,
-                "isPrimary": true,
-                "sequence": 3,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "dictionaryNames": [
-                  "Test Dictionary 2"
-                ],
-                "expression": "打つ",
-                "reading": "ぶつ",
-                "expressions": [
-                  {
-                    "sourceTerm": "打つ",
-                    "expression": "打つ",
-                    "reading": "ぶつ",
-                    "termTags": [
-                      {
-                        "name": "tag3",
-                        "category": "category3",
-                        "notes": "tag3 notes",
-                        "order": 0,
-                        "score": 0,
-                        "dictionary": "Test Dictionary 2",
-                        "redundant": false
-                      },
-                      {
-                        "name": "tag4",
-                        "category": "category4",
-                        "notes": "tag4 notes",
-                        "order": 0,
-                        "score": 0,
-                        "dictionary": "Test Dictionary 2",
-                        "redundant": false
-                      },
-                      {
-                        "name": "tag5",
-                        "category": "category5",
-                        "notes": "tag5 notes",
-                        "order": 0,
-                        "score": 0,
-                        "dictionary": "Test Dictionary 2",
-                        "redundant": false
-                      }
-                    ],
-                    "frequencies": [
-                      {
-                        "index": 0,
-                        "expressionIndex": 0,
-                        "dictionary": "Test Dictionary 2",
-                        "dictionaryOrder": {
-                          "index": 0,
-                          "priority": 0
-                        },
-                        "expression": "打つ",
-                        "reading": "ぶつ",
-                        "hasReading": false,
-                        "frequency": 2
-                      },
-                      {
-                        "index": 1,
-                        "expressionIndex": 0,
-                        "dictionary": "Test Dictionary 2",
-                        "dictionaryOrder": {
-                          "index": 0,
-                          "priority": 0
-                        },
-                        "expression": "打つ",
-                        "reading": "ぶつ",
-                        "hasReading": true,
-                        "frequency": 7
-                      }
-                    ],
-                    "pitches": []
-                  }
-                ],
-                "glossary": [
-                  "definition11",
-                  "definition12"
-                ],
-                "definitionTags": [
-                  {
-                    "name": "tag1",
-                    "category": "category1",
-                    "notes": "tag1 notes",
-                    "order": 0,
-                    "score": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "redundant": false
-                  },
-                  {
-                    "name": "tag2",
-                    "category": "category2",
-                    "notes": "tag2 notes",
-                    "order": 0,
-                    "score": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "redundant": false
-                  }
-                ],
-                "termTags": [
-                  {
-                    "name": "tag3",
-                    "category": "category3",
-                    "notes": "tag3 notes",
-                    "order": 0,
-                    "score": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "redundant": false
-                  },
-                  {
-                    "name": "tag4",
-                    "category": "category4",
-                    "notes": "tag4 notes",
-                    "order": 0,
-                    "score": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "redundant": false
-                  },
-                  {
-                    "name": "tag5",
-                    "category": "category5",
-                    "notes": "tag5 notes",
-                    "order": 0,
-                    "score": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "redundant": false
-                  }
-                ],
-                "frequencies": [
-                  {
-                    "index": 0,
-                    "expressionIndex": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "dictionaryOrder": {
-                      "index": 0,
-                      "priority": 0
-                    },
-                    "expression": "打つ",
-                    "reading": "ぶつ",
-                    "hasReading": false,
-                    "frequency": 2
-                  },
-                  {
-                    "index": 1,
-                    "expressionIndex": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "dictionaryOrder": {
-                      "index": 0,
-                      "priority": 0
-                    },
-                    "expression": "打つ",
-                    "reading": "ぶつ",
-                    "hasReading": true,
-                    "frequency": 7
-                  }
-                ],
-                "pitches": [],
-                "sourceTermExactMatchCount": 1
-              }
-            ],
-            "frequencies": [
-              {
-                "index": 0,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打つ",
-                "reading": "ぶつ",
-                "hasReading": false,
-                "frequency": 2
-              },
-              {
-                "index": 1,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打つ",
-                "reading": "ぶつ",
-                "hasReading": true,
-                "frequency": 7
-              }
-            ],
-            "pitches": [],
-            "only": [
-              "ぶつ"
-            ],
-            "sourceTermExactMatchCount": 1
+                "order": 0,
+                "score": 0,
+                "content": [
+                  "tag2 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
+                "redundant": false
+              }
+            ],
+            "entries": [
+              "definition11",
+              "definition12"
+            ]
           }
         ],
+        "pronunciations": [],
         "frequencies": [
           {
             "index": 0,
-            "expressionIndex": 0,
+            "headwordIndex": 0,
             "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "expression": "打つ",
-            "reading": "うつ",
+            "dictionaryIndex": 0,
+            "dictionaryPriority": 0,
             "hasReading": false,
             "frequency": 2
           },
           {
             "index": 2,
-            "expressionIndex": 0,
+            "headwordIndex": 0,
             "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "expression": "打つ",
-            "reading": "うつ",
+            "dictionaryIndex": 0,
+            "dictionaryPriority": 0,
             "hasReading": true,
             "frequency": 6
           },
           {
             "index": 1,
-            "expressionIndex": 1,
+            "headwordIndex": 1,
             "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "expression": "打つ",
-            "reading": "ぶつ",
+            "dictionaryIndex": 0,
+            "dictionaryPriority": 0,
             "hasReading": false,
             "frequency": 2
           },
           {
             "index": 3,
-            "expressionIndex": 1,
+            "headwordIndex": 1,
             "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "expression": "打つ",
-            "reading": "ぶつ",
+            "dictionaryIndex": 0,
+            "dictionaryPriority": 0,
             "hasReading": true,
             "frequency": 7
           }
-        ],
-        "pitches": [],
-        "sourceTermExactMatchCount": 4
+        ]
       },
       {
-        "type": "termMerged",
-        "source": "打",
-        "rawSource": "打",
-        "reasons": [],
+        "type": "term",
+        "id": -1,
+        "isPrimary": true,
+        "sequence": -1,
+        "inflections": [],
         "score": 1,
-        "dictionary": "Test Dictionary 2",
-        "dictionaryOrder": {
-          "index": 0,
-          "priority": 0
-        },
-        "dictionaryNames": [
-          "Test Dictionary 2"
-        ],
-        "expression": [
-          "打"
-        ],
-        "reading": [
-          "だ"
-        ],
-        "expressions": [
+        "dictionaryIndex": 0,
+        "dictionaryPriority": 0,
+        "sourceTermExactMatchCount": 1,
+        "maxDeinflectedTextLength": 1,
+        "headwords": [
           {
-            "sourceTerm": "打",
-            "expression": "打",
+            "index": 0,
+            "term": "打",
             "reading": "だ",
-            "termTags": [
+            "sources": [
+              {
+                "originalText": "打",
+                "transformedText": "打",
+                "deinflectedText": "打",
+                "isPrimary": true
+              }
+            ],
+            "tags": [
               {
                 "name": "tag3",
                 "category": "category3",
-                "notes": "tag3 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag3 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag4",
                 "category": "category4",
-                "notes": "tag4 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag4 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag5",
                 "category": "category5",
-                "notes": "tag5 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag5 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               }
-            ],
-            "frequencies": [
-              {
-                "index": 0,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打",
-                "reading": "だ",
-                "hasReading": false,
-                "frequency": 1
-              },
-              {
-                "index": 1,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打",
-                "reading": "だ",
-                "hasReading": true,
-                "frequency": 4
-              }
-            ],
-            "pitches": []
+            ]
           }
         ],
         "definitions": [
           {
-            "type": "termMergedByGlossary",
-            "source": "打",
-            "rawSource": "打",
-            "reasons": [],
-            "score": 1,
-            "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "dictionaryNames": [
-              "Test Dictionary 2"
-            ],
-            "expression": [
-              "打"
-            ],
-            "reading": [
-              "だ"
-            ],
-            "expressions": [
-              {
-                "sourceTerm": "打",
-                "expression": "打",
-                "reading": "だ",
-                "termTags": [
-                  {
-                    "name": "tag3",
-                    "category": "category3",
-                    "notes": "tag3 notes",
-                    "order": 0,
-                    "score": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "redundant": false
-                  },
-                  {
-                    "name": "tag4",
-                    "category": "category4",
-                    "notes": "tag4 notes",
-                    "order": 0,
-                    "score": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "redundant": false
-                  },
-                  {
-                    "name": "tag5",
-                    "category": "category5",
-                    "notes": "tag5 notes",
-                    "order": 0,
-                    "score": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "redundant": false
-                  }
-                ],
-                "frequencies": [
-                  {
-                    "index": 0,
-                    "expressionIndex": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "dictionaryOrder": {
-                      "index": 0,
-                      "priority": 0
-                    },
-                    "expression": "打",
-                    "reading": "だ",
-                    "hasReading": false,
-                    "frequency": 1
-                  },
-                  {
-                    "index": 1,
-                    "expressionIndex": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "dictionaryOrder": {
-                      "index": 0,
-                      "priority": 0
-                    },
-                    "expression": "打",
-                    "reading": "だ",
-                    "hasReading": true,
-                    "frequency": 4
-                  }
-                ],
-                "pitches": []
-              }
-            ],
-            "glossary": [
-              "definition1",
-              "definition2"
+            "index": 0,
+            "headwordIndices": [
+              0
             ],
-            "definitionTags": [
+            "dictionary": "Test Dictionary 2",
+            "tags": [
               {
                 "name": "tag1",
                 "category": "category1",
-                "notes": "tag1 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag1 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag2",
                 "category": "category2",
-                "notes": "tag2 notes",
-                "order": 0,
-                "score": 0,
-                "dictionary": "Test Dictionary 2",
-                "redundant": false
-              }
-            ],
-            "definitions": [
-              {
-                "type": "term",
-                "id": 1,
-                "source": "打",
-                "rawSource": "打",
-                "sourceTerm": "打",
-                "reasons": [],
-                "score": 1,
-                "isPrimary": true,
-                "sequence": 1,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "dictionaryNames": [
-                  "Test Dictionary 2"
-                ],
-                "expression": "打",
-                "reading": "だ",
-                "expressions": [
-                  {
-                    "sourceTerm": "打",
-                    "expression": "打",
-                    "reading": "だ",
-                    "termTags": [
-                      {
-                        "name": "tag3",
-                        "category": "category3",
-                        "notes": "tag3 notes",
-                        "order": 0,
-                        "score": 0,
-                        "dictionary": "Test Dictionary 2",
-                        "redundant": false
-                      },
-                      {
-                        "name": "tag4",
-                        "category": "category4",
-                        "notes": "tag4 notes",
-                        "order": 0,
-                        "score": 0,
-                        "dictionary": "Test Dictionary 2",
-                        "redundant": false
-                      },
-                      {
-                        "name": "tag5",
-                        "category": "category5",
-                        "notes": "tag5 notes",
-                        "order": 0,
-                        "score": 0,
-                        "dictionary": "Test Dictionary 2",
-                        "redundant": false
-                      }
-                    ],
-                    "frequencies": [
-                      {
-                        "index": 0,
-                        "expressionIndex": 0,
-                        "dictionary": "Test Dictionary 2",
-                        "dictionaryOrder": {
-                          "index": 0,
-                          "priority": 0
-                        },
-                        "expression": "打",
-                        "reading": "だ",
-                        "hasReading": false,
-                        "frequency": 1
-                      },
-                      {
-                        "index": 1,
-                        "expressionIndex": 0,
-                        "dictionary": "Test Dictionary 2",
-                        "dictionaryOrder": {
-                          "index": 0,
-                          "priority": 0
-                        },
-                        "expression": "打",
-                        "reading": "だ",
-                        "hasReading": true,
-                        "frequency": 4
-                      }
-                    ],
-                    "pitches": []
-                  }
-                ],
-                "glossary": [
-                  "definition1",
-                  "definition2"
-                ],
-                "definitionTags": [
-                  {
-                    "name": "tag1",
-                    "category": "category1",
-                    "notes": "tag1 notes",
-                    "order": 0,
-                    "score": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "redundant": false
-                  },
-                  {
-                    "name": "tag2",
-                    "category": "category2",
-                    "notes": "tag2 notes",
-                    "order": 0,
-                    "score": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "redundant": false
-                  }
-                ],
-                "termTags": [
-                  {
-                    "name": "tag3",
-                    "category": "category3",
-                    "notes": "tag3 notes",
-                    "order": 0,
-                    "score": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "redundant": false
-                  },
-                  {
-                    "name": "tag4",
-                    "category": "category4",
-                    "notes": "tag4 notes",
-                    "order": 0,
-                    "score": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "redundant": false
-                  },
-                  {
-                    "name": "tag5",
-                    "category": "category5",
-                    "notes": "tag5 notes",
-                    "order": 0,
-                    "score": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "redundant": false
-                  }
-                ],
-                "frequencies": [
-                  {
-                    "index": 0,
-                    "expressionIndex": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "dictionaryOrder": {
-                      "index": 0,
-                      "priority": 0
-                    },
-                    "expression": "打",
-                    "reading": "だ",
-                    "hasReading": false,
-                    "frequency": 1
-                  },
-                  {
-                    "index": 1,
-                    "expressionIndex": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "dictionaryOrder": {
-                      "index": 0,
-                      "priority": 0
-                    },
-                    "expression": "打",
-                    "reading": "だ",
-                    "hasReading": true,
-                    "frequency": 4
-                  }
-                ],
-                "pitches": [],
-                "sourceTermExactMatchCount": 1
-              }
-            ],
-            "frequencies": [
-              {
-                "index": 0,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打",
-                "reading": "だ",
-                "hasReading": false,
-                "frequency": 1
-              },
-              {
-                "index": 1,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打",
-                "reading": "だ",
-                "hasReading": true,
-                "frequency": 4
-              }
-            ],
-            "pitches": [],
-            "only": [],
-            "sourceTermExactMatchCount": 1
+                "order": 0,
+                "score": 0,
+                "content": [
+                  "tag2 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
+                "redundant": false
+              }
+            ],
+            "entries": [
+              "definition1",
+              "definition2"
+            ]
           }
         ],
+        "pronunciations": [],
         "frequencies": [
           {
             "index": 0,
-            "expressionIndex": 0,
+            "headwordIndex": 0,
             "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "expression": "打",
-            "reading": "だ",
+            "dictionaryIndex": 0,
+            "dictionaryPriority": 0,
             "hasReading": false,
             "frequency": 1
           },
           {
             "index": 1,
-            "expressionIndex": 0,
+            "headwordIndex": 0,
             "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "expression": "打",
-            "reading": "だ",
+            "dictionaryIndex": 0,
+            "dictionaryPriority": 0,
             "hasReading": true,
             "frequency": 4
           }
-        ],
-        "pitches": [],
-        "sourceTermExactMatchCount": 1
+        ]
       },
       {
-        "type": "termMerged",
-        "source": "打",
-        "rawSource": "打",
-        "reasons": [],
+        "type": "term",
+        "id": -1,
+        "isPrimary": true,
+        "sequence": -1,
+        "inflections": [],
         "score": 1,
-        "dictionary": "Test Dictionary 2",
-        "dictionaryOrder": {
-          "index": 0,
-          "priority": 0
-        },
-        "dictionaryNames": [
-          "Test Dictionary 2"
-        ],
-        "expression": [
-          "打"
-        ],
-        "reading": [
-          "ダース"
-        ],
-        "expressions": [
+        "dictionaryIndex": 0,
+        "dictionaryPriority": 0,
+        "sourceTermExactMatchCount": 1,
+        "maxDeinflectedTextLength": 1,
+        "headwords": [
           {
-            "sourceTerm": "打",
-            "expression": "打",
+            "index": 0,
+            "term": "打",
             "reading": "ダース",
-            "termTags": [
+            "sources": [
+              {
+                "originalText": "打",
+                "transformedText": "打",
+                "deinflectedText": "打",
+                "isPrimary": true
+              }
+            ],
+            "tags": [
               {
                 "name": "tag3",
                 "category": "category3",
-                "notes": "tag3 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag3 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag4",
                 "category": "category4",
-                "notes": "tag4 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag4 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag5",
                 "category": "category5",
-                "notes": "tag5 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag5 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               }
-            ],
-            "frequencies": [
-              {
-                "index": 0,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打",
-                "reading": "ダース",
-                "hasReading": false,
-                "frequency": 1
-              },
-              {
-                "index": 1,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打",
-                "reading": "ダース",
-                "hasReading": true,
-                "frequency": 5
-              }
-            ],
-            "pitches": []
+            ]
           }
         ],
         "definitions": [
           {
-            "type": "termMergedByGlossary",
-            "source": "打",
-            "rawSource": "打",
-            "reasons": [],
-            "score": 1,
-            "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "dictionaryNames": [
-              "Test Dictionary 2"
-            ],
-            "expression": [
-              "打"
-            ],
-            "reading": [
-              "ダース"
-            ],
-            "expressions": [
-              {
-                "sourceTerm": "打",
-                "expression": "打",
-                "reading": "ダース",
-                "termTags": [
-                  {
-                    "name": "tag3",
-                    "category": "category3",
-                    "notes": "tag3 notes",
-                    "order": 0,
-                    "score": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "redundant": false
-                  },
-                  {
-                    "name": "tag4",
-                    "category": "category4",
-                    "notes": "tag4 notes",
-                    "order": 0,
-                    "score": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "redundant": false
-                  },
-                  {
-                    "name": "tag5",
-                    "category": "category5",
-                    "notes": "tag5 notes",
-                    "order": 0,
-                    "score": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "redundant": false
-                  }
-                ],
-                "frequencies": [
-                  {
-                    "index": 0,
-                    "expressionIndex": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "dictionaryOrder": {
-                      "index": 0,
-                      "priority": 0
-                    },
-                    "expression": "打",
-                    "reading": "ダース",
-                    "hasReading": false,
-                    "frequency": 1
-                  },
-                  {
-                    "index": 1,
-                    "expressionIndex": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "dictionaryOrder": {
-                      "index": 0,
-                      "priority": 0
-                    },
-                    "expression": "打",
-                    "reading": "ダース",
-                    "hasReading": true,
-                    "frequency": 5
-                  }
-                ],
-                "pitches": []
-              }
-            ],
-            "glossary": [
-              "definition3",
-              "definition4"
+            "index": 0,
+            "headwordIndices": [
+              0
             ],
-            "definitionTags": [
+            "dictionary": "Test Dictionary 2",
+            "tags": [
               {
                 "name": "tag1",
                 "category": "category1",
-                "notes": "tag1 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag1 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag2",
                 "category": "category2",
-                "notes": "tag2 notes",
-                "order": 0,
-                "score": 0,
-                "dictionary": "Test Dictionary 2",
-                "redundant": false
-              }
-            ],
-            "definitions": [
-              {
-                "type": "term",
-                "id": 2,
-                "source": "打",
-                "rawSource": "打",
-                "sourceTerm": "打",
-                "reasons": [],
-                "score": 1,
-                "isPrimary": true,
-                "sequence": 2,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "dictionaryNames": [
-                  "Test Dictionary 2"
-                ],
-                "expression": "打",
-                "reading": "ダース",
-                "expressions": [
-                  {
-                    "sourceTerm": "打",
-                    "expression": "打",
-                    "reading": "ダース",
-                    "termTags": [
-                      {
-                        "name": "tag3",
-                        "category": "category3",
-                        "notes": "tag3 notes",
-                        "order": 0,
-                        "score": 0,
-                        "dictionary": "Test Dictionary 2",
-                        "redundant": false
-                      },
-                      {
-                        "name": "tag4",
-                        "category": "category4",
-                        "notes": "tag4 notes",
-                        "order": 0,
-                        "score": 0,
-                        "dictionary": "Test Dictionary 2",
-                        "redundant": false
-                      },
-                      {
-                        "name": "tag5",
-                        "category": "category5",
-                        "notes": "tag5 notes",
-                        "order": 0,
-                        "score": 0,
-                        "dictionary": "Test Dictionary 2",
-                        "redundant": false
-                      }
-                    ],
-                    "frequencies": [
-                      {
-                        "index": 0,
-                        "expressionIndex": 0,
-                        "dictionary": "Test Dictionary 2",
-                        "dictionaryOrder": {
-                          "index": 0,
-                          "priority": 0
-                        },
-                        "expression": "打",
-                        "reading": "ダース",
-                        "hasReading": false,
-                        "frequency": 1
-                      },
-                      {
-                        "index": 1,
-                        "expressionIndex": 0,
-                        "dictionary": "Test Dictionary 2",
-                        "dictionaryOrder": {
-                          "index": 0,
-                          "priority": 0
-                        },
-                        "expression": "打",
-                        "reading": "ダース",
-                        "hasReading": true,
-                        "frequency": 5
-                      }
-                    ],
-                    "pitches": []
-                  }
-                ],
-                "glossary": [
-                  "definition3",
-                  "definition4"
-                ],
-                "definitionTags": [
-                  {
-                    "name": "tag1",
-                    "category": "category1",
-                    "notes": "tag1 notes",
-                    "order": 0,
-                    "score": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "redundant": false
-                  },
-                  {
-                    "name": "tag2",
-                    "category": "category2",
-                    "notes": "tag2 notes",
-                    "order": 0,
-                    "score": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "redundant": false
-                  }
-                ],
-                "termTags": [
-                  {
-                    "name": "tag3",
-                    "category": "category3",
-                    "notes": "tag3 notes",
-                    "order": 0,
-                    "score": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "redundant": false
-                  },
-                  {
-                    "name": "tag4",
-                    "category": "category4",
-                    "notes": "tag4 notes",
-                    "order": 0,
-                    "score": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "redundant": false
-                  },
-                  {
-                    "name": "tag5",
-                    "category": "category5",
-                    "notes": "tag5 notes",
-                    "order": 0,
-                    "score": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "redundant": false
-                  }
-                ],
-                "frequencies": [
-                  {
-                    "index": 0,
-                    "expressionIndex": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "dictionaryOrder": {
-                      "index": 0,
-                      "priority": 0
-                    },
-                    "expression": "打",
-                    "reading": "ダース",
-                    "hasReading": false,
-                    "frequency": 1
-                  },
-                  {
-                    "index": 1,
-                    "expressionIndex": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "dictionaryOrder": {
-                      "index": 0,
-                      "priority": 0
-                    },
-                    "expression": "打",
-                    "reading": "ダース",
-                    "hasReading": true,
-                    "frequency": 5
-                  }
-                ],
-                "pitches": [],
-                "sourceTermExactMatchCount": 1
-              }
-            ],
-            "frequencies": [
-              {
-                "index": 0,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打",
-                "reading": "ダース",
-                "hasReading": false,
-                "frequency": 1
-              },
-              {
-                "index": 1,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打",
-                "reading": "ダース",
-                "hasReading": true,
-                "frequency": 5
-              }
-            ],
-            "pitches": [],
-            "only": [],
-            "sourceTermExactMatchCount": 1
+                "order": 0,
+                "score": 0,
+                "content": [
+                  "tag2 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
+                "redundant": false
+              }
+            ],
+            "entries": [
+              "definition3",
+              "definition4"
+            ]
           }
         ],
+        "pronunciations": [],
         "frequencies": [
           {
             "index": 0,
-            "expressionIndex": 0,
+            "headwordIndex": 0,
             "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "expression": "打",
-            "reading": "ダース",
+            "dictionaryIndex": 0,
+            "dictionaryPriority": 0,
             "hasReading": false,
             "frequency": 1
           },
           {
             "index": 1,
-            "expressionIndex": 0,
+            "headwordIndex": 0,
             "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "expression": "打",
-            "reading": "ダース",
+            "dictionaryIndex": 0,
+            "dictionaryPriority": 0,
             "hasReading": true,
             "frequency": 5
           }
-        ],
-        "pitches": [],
-        "sourceTermExactMatchCount": 1
+        ]
       }
     ]
   },
   {
     "name": "Search inflected term",
-    "length": 12,
-    "definitions": [
+    "originalTextLength": 12,
+    "dictionaryEntries": [
       {
         "type": "term",
         "id": 7,
-        "source": "打ち込んでいませんでした",
-        "rawSource": "打ち込んでいませんでした",
-        "sourceTerm": "打ち込む",
-        "reasons": [
+        "isPrimary": true,
+        "sequence": 4,
+        "inflections": [
           "-te",
           "progressive or perfect",
           "polite past negative"
         ],
         "score": 10,
-        "isPrimary": true,
-        "sequence": 4,
-        "dictionary": "Test Dictionary 2",
-        "dictionaryOrder": {
-          "index": 0,
-          "priority": 0
-        },
-        "dictionaryNames": [
-          "Test Dictionary 2"
-        ],
-        "expression": "打ち込む",
-        "reading": "うちこむ",
-        "expressions": [
+        "dictionaryIndex": 0,
+        "dictionaryPriority": 0,
+        "sourceTermExactMatchCount": 1,
+        "maxDeinflectedTextLength": 4,
+        "headwords": [
           {
-            "sourceTerm": "打ち込む",
-            "expression": "打ち込む",
+            "index": 0,
+            "term": "打ち込む",
             "reading": "うちこむ",
-            "termTags": [
+            "sources": [
+              {
+                "originalText": "打ち込んでいませんでした",
+                "transformedText": "打ち込んでいませんでした",
+                "deinflectedText": "打ち込む",
+                "isPrimary": true
+              }
+            ],
+            "tags": [
               {
                 "name": "tag3",
                 "category": "category3",
-                "notes": "tag3 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag3 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag4",
                 "category": "category4",
-                "notes": "tag4 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag4 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag5",
                 "category": "category5",
-                "notes": "tag5 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag5 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               }
+            ]
+          }
+        ],
+        "definitions": [
+          {
+            "index": 0,
+            "headwordIndices": [
+              0
             ],
-            "frequencies": [
+            "dictionary": "Test Dictionary 2",
+            "tags": [
               {
-                "index": 0,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打ち込む",
-                "reading": "うちこむ",
-                "hasReading": false,
-                "frequency": 3
+                "name": "tag1",
+                "category": "category1",
+                "order": 0,
+                "score": 0,
+                "content": [
+                  "tag1 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
+                "redundant": false
               },
               {
-                "index": 1,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打ち込む",
-                "reading": "うちこむ",
-                "hasReading": true,
-                "frequency": 8
+                "name": "tag2",
+                "category": "category2",
+                "order": 0,
+                "score": 0,
+                "content": [
+                  "tag2 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
+                "redundant": false
               }
             ],
-            "pitches": [
-              {
-                "index": 0,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打ち込む",
-                "reading": "うちこむ",
-                "pitches": [
-                  {
-                    "position": 0,
-                    "tags": []
-                  },
-                  {
-                    "position": 3,
-                    "tags": []
-                  }
-                ]
-              }
+            "entries": [
+              "definition13",
+              "definition14"
             ]
           }
         ],
-        "glossary": [
-          "definition13",
-          "definition14"
-        ],
-        "definitionTags": [
-          {
-            "name": "tag1",
-            "category": "category1",
-            "notes": "tag1 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag2",
-            "category": "category2",
-            "notes": "tag2 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          }
-        ],
-        "termTags": [
-          {
-            "name": "tag3",
-            "category": "category3",
-            "notes": "tag3 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag4",
-            "category": "category4",
-            "notes": "tag4 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
+        "pronunciations": [
           {
-            "name": "tag5",
-            "category": "category5",
-            "notes": "tag5 notes",
-            "order": 0,
-            "score": 0,
+            "index": 0,
+            "headwordIndex": 0,
             "dictionary": "Test Dictionary 2",
-            "redundant": false
+            "dictionaryIndex": 0,
+            "dictionaryPriority": 0,
+            "pitches": [
+              {
+                "position": 0,
+                "tags": []
+              },
+              {
+                "position": 3,
+                "tags": []
+              }
+            ]
           }
         ],
         "frequencies": [
           {
             "index": 0,
-            "expressionIndex": 0,
+            "headwordIndex": 0,
             "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "expression": "打ち込む",
-            "reading": "うちこむ",
+            "dictionaryIndex": 0,
+            "dictionaryPriority": 0,
             "hasReading": false,
             "frequency": 3
           },
           {
             "index": 1,
-            "expressionIndex": 0,
+            "headwordIndex": 0,
             "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "expression": "打ち込む",
-            "reading": "うちこむ",
+            "dictionaryIndex": 0,
+            "dictionaryPriority": 0,
             "hasReading": true,
             "frequency": 8
           }
-        ],
-        "pitches": [
-          {
-            "index": 0,
-            "expressionIndex": 0,
-            "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "expression": "打ち込む",
-            "reading": "うちこむ",
-            "pitches": [
-              {
-                "position": 0,
-                "tags": []
-              },
-              {
-                "position": 3,
-                "tags": []
-              }
-            ]
-          }
-        ],
-        "sourceTermExactMatchCount": 1
+        ]
       },
       {
         "type": "term",
         "id": 9,
-        "source": "打ち込んでいませんでした",
-        "rawSource": "打ち込んでいませんでした",
-        "sourceTerm": "打ち込む",
-        "reasons": [
+        "isPrimary": true,
+        "sequence": 4,
+        "inflections": [
           "-te",
           "progressive or perfect",
           "polite past negative"
         ],
         "score": 10,
-        "isPrimary": true,
-        "sequence": 4,
-        "dictionary": "Test Dictionary 2",
-        "dictionaryOrder": {
-          "index": 0,
-          "priority": 0
-        },
-        "dictionaryNames": [
-          "Test Dictionary 2"
-        ],
-        "expression": "打ち込む",
-        "reading": "ぶちこむ",
-        "expressions": [
+        "dictionaryIndex": 0,
+        "dictionaryPriority": 0,
+        "sourceTermExactMatchCount": 1,
+        "maxDeinflectedTextLength": 4,
+        "headwords": [
           {
-            "sourceTerm": "打ち込む",
-            "expression": "打ち込む",
+            "index": 0,
+            "term": "打ち込む",
             "reading": "ぶちこむ",
-            "termTags": [
+            "sources": [
+              {
+                "originalText": "打ち込んでいませんでした",
+                "transformedText": "打ち込んでいませんでした",
+                "deinflectedText": "打ち込む",
+                "isPrimary": true
+              }
+            ],
+            "tags": [
               {
                 "name": "tag3",
                 "category": "category3",
-                "notes": "tag3 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag3 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag4",
                 "category": "category4",
-                "notes": "tag4 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag4 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag5",
                 "category": "category5",
-                "notes": "tag5 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag5 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               }
+            ]
+          }
+        ],
+        "definitions": [
+          {
+            "index": 0,
+            "headwordIndices": [
+              0
             ],
-            "frequencies": [
+            "dictionary": "Test Dictionary 2",
+            "tags": [
               {
-                "index": 0,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打ち込む",
-                "reading": "ぶちこむ",
-                "hasReading": false,
-                "frequency": 3
+                "name": "tag1",
+                "category": "category1",
+                "order": 0,
+                "score": 0,
+                "content": [
+                  "tag1 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
+                "redundant": false
               },
               {
-                "index": 1,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打ち込む",
-                "reading": "ぶちこむ",
-                "hasReading": true,
-                "frequency": 9
+                "name": "tag2",
+                "category": "category2",
+                "order": 0,
+                "score": 0,
+                "content": [
+                  "tag2 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
+                "redundant": false
               }
             ],
-            "pitches": [
-              {
-                "index": 0,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打ち込む",
-                "reading": "ぶちこむ",
-                "pitches": [
-                  {
-                    "position": 0,
-                    "tags": []
-                  },
-                  {
-                    "position": 3,
-                    "tags": []
-                  }
-                ]
-              }
+            "entries": [
+              "definition17",
+              "definition18"
             ]
           }
         ],
-        "glossary": [
-          "definition17",
-          "definition18"
-        ],
-        "definitionTags": [
-          {
-            "name": "tag1",
-            "category": "category1",
-            "notes": "tag1 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag2",
-            "category": "category2",
-            "notes": "tag2 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          }
-        ],
-        "termTags": [
-          {
-            "name": "tag3",
-            "category": "category3",
-            "notes": "tag3 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag4",
-            "category": "category4",
-            "notes": "tag4 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
+        "pronunciations": [
           {
-            "name": "tag5",
-            "category": "category5",
-            "notes": "tag5 notes",
-            "order": 0,
-            "score": 0,
+            "index": 0,
+            "headwordIndex": 0,
             "dictionary": "Test Dictionary 2",
-            "redundant": false
+            "dictionaryIndex": 0,
+            "dictionaryPriority": 0,
+            "pitches": [
+              {
+                "position": 0,
+                "tags": []
+              },
+              {
+                "position": 3,
+                "tags": []
+              }
+            ]
           }
         ],
         "frequencies": [
           {
             "index": 0,
-            "expressionIndex": 0,
+            "headwordIndex": 0,
             "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "expression": "打ち込む",
-            "reading": "ぶちこむ",
+            "dictionaryIndex": 0,
+            "dictionaryPriority": 0,
             "hasReading": false,
             "frequency": 3
           },
           {
             "index": 1,
-            "expressionIndex": 0,
+            "headwordIndex": 0,
             "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "expression": "打ち込む",
-            "reading": "ぶちこむ",
+            "dictionaryIndex": 0,
+            "dictionaryPriority": 0,
             "hasReading": true,
             "frequency": 9
           }
-        ],
-        "pitches": [
-          {
-            "index": 0,
-            "expressionIndex": 0,
-            "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "expression": "打ち込む",
-            "reading": "ぶちこむ",
-            "pitches": [
-              {
-                "position": 0,
-                "tags": []
-              },
-              {
-                "position": 3,
-                "tags": []
-              }
-            ]
-          }
-        ],
-        "sourceTermExactMatchCount": 1
+        ]
       },
       {
         "type": "term",
         "id": 8,
-        "source": "打ち込んでいませんでした",
-        "rawSource": "打ち込んでいませんでした",
-        "sourceTerm": "打ち込む",
-        "reasons": [
+        "isPrimary": true,
+        "sequence": 4,
+        "inflections": [
           "-te",
           "progressive or perfect",
           "polite past negative"
         ],
         "score": 1,
-        "isPrimary": true,
-        "sequence": 4,
-        "dictionary": "Test Dictionary 2",
-        "dictionaryOrder": {
-          "index": 0,
-          "priority": 0
-        },
-        "dictionaryNames": [
-          "Test Dictionary 2"
-        ],
-        "expression": "打ち込む",
-        "reading": "うちこむ",
-        "expressions": [
+        "dictionaryIndex": 0,
+        "dictionaryPriority": 0,
+        "sourceTermExactMatchCount": 1,
+        "maxDeinflectedTextLength": 4,
+        "headwords": [
           {
-            "sourceTerm": "打ち込む",
-            "expression": "打ち込む",
+            "index": 0,
+            "term": "打ち込む",
             "reading": "うちこむ",
-            "termTags": [
+            "sources": [
+              {
+                "originalText": "打ち込んでいませんでした",
+                "transformedText": "打ち込んでいませんでした",
+                "deinflectedText": "打ち込む",
+                "isPrimary": true
+              }
+            ],
+            "tags": [
               {
                 "name": "tag5",
                 "category": "category5",
-                "notes": "tag5 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag5 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag6",
                 "category": "default",
-                "notes": "",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag7",
                 "category": "default",
-                "notes": "",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               }
+            ]
+          }
+        ],
+        "definitions": [
+          {
+            "index": 0,
+            "headwordIndices": [
+              0
             ],
-            "frequencies": [
+            "dictionary": "Test Dictionary 2",
+            "tags": [
               {
-                "index": 0,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打ち込む",
-                "reading": "うちこむ",
-                "hasReading": false,
-                "frequency": 3
+                "name": "tag1",
+                "category": "category1",
+                "order": 0,
+                "score": 0,
+                "content": [
+                  "tag1 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
+                "redundant": false
               },
               {
-                "index": 1,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打ち込む",
-                "reading": "うちこむ",
-                "hasReading": true,
-                "frequency": 8
+                "name": "tag2",
+                "category": "category2",
+                "order": 0,
+                "score": 0,
+                "content": [
+                  "tag2 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
+                "redundant": false
               }
             ],
-            "pitches": [
-              {
-                "index": 0,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打ち込む",
-                "reading": "うちこむ",
-                "pitches": [
-                  {
-                    "position": 0,
-                    "tags": []
-                  },
-                  {
-                    "position": 3,
-                    "tags": []
-                  }
-                ]
-              }
+            "entries": [
+              "definition15",
+              "definition16"
             ]
           }
         ],
-        "glossary": [
-          "definition15",
-          "definition16"
-        ],
-        "definitionTags": [
-          {
-            "name": "tag1",
-            "category": "category1",
-            "notes": "tag1 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag2",
-            "category": "category2",
-            "notes": "tag2 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          }
-        ],
-        "termTags": [
+        "pronunciations": [
           {
-            "name": "tag5",
-            "category": "category5",
-            "notes": "tag5 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag6",
-            "category": "default",
-            "notes": "",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag7",
-            "category": "default",
-            "notes": "",
-            "order": 0,
-            "score": 0,
+            "index": 0,
+            "headwordIndex": 0,
             "dictionary": "Test Dictionary 2",
-            "redundant": false
+            "dictionaryIndex": 0,
+            "dictionaryPriority": 0,
+            "pitches": [
+              {
+                "position": 0,
+                "tags": []
+              },
+              {
+                "position": 3,
+                "tags": []
+              }
+            ]
           }
         ],
         "frequencies": [
           {
             "index": 0,
-            "expressionIndex": 0,
+            "headwordIndex": 0,
             "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "expression": "打ち込む",
-            "reading": "うちこむ",
+            "dictionaryIndex": 0,
+            "dictionaryPriority": 0,
             "hasReading": false,
             "frequency": 3
           },
           {
             "index": 1,
-            "expressionIndex": 0,
+            "headwordIndex": 0,
             "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "expression": "打ち込む",
-            "reading": "うちこむ",
+            "dictionaryIndex": 0,
+            "dictionaryPriority": 0,
             "hasReading": true,
             "frequency": 8
           }
-        ],
-        "pitches": [
-          {
-            "index": 0,
-            "expressionIndex": 0,
-            "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "expression": "打ち込む",
-            "reading": "うちこむ",
-            "pitches": [
-              {
-                "position": 0,
-                "tags": []
-              },
-              {
-                "position": 3,
-                "tags": []
-              }
-            ]
-          }
-        ],
-        "sourceTermExactMatchCount": 1
+        ]
       },
       {
         "type": "term",
         "id": 10,
-        "source": "打ち込んでいませんでした",
-        "rawSource": "打ち込んでいませんでした",
-        "sourceTerm": "打ち込む",
-        "reasons": [
+        "isPrimary": true,
+        "sequence": 4,
+        "inflections": [
           "-te",
           "progressive or perfect",
           "polite past negative"
         ],
         "score": 1,
-        "isPrimary": true,
-        "sequence": 4,
-        "dictionary": "Test Dictionary 2",
-        "dictionaryOrder": {
-          "index": 0,
-          "priority": 0
-        },
-        "dictionaryNames": [
-          "Test Dictionary 2"
-        ],
-        "expression": "打ち込む",
-        "reading": "ぶちこむ",
-        "expressions": [
+        "dictionaryIndex": 0,
+        "dictionaryPriority": 0,
+        "sourceTermExactMatchCount": 1,
+        "maxDeinflectedTextLength": 4,
+        "headwords": [
           {
-            "sourceTerm": "打ち込む",
-            "expression": "打ち込む",
+            "index": 0,
+            "term": "打ち込む",
             "reading": "ぶちこむ",
-            "termTags": [
+            "sources": [
+              {
+                "originalText": "打ち込んでいませんでした",
+                "transformedText": "打ち込んでいませんでした",
+                "deinflectedText": "打ち込む",
+                "isPrimary": true
+              }
+            ],
+            "tags": [
               {
                 "name": "tag3",
                 "category": "category3",
-                "notes": "tag3 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag3 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag4",
                 "category": "category4",
-                "notes": "tag4 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag4 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag5",
                 "category": "category5",
-                "notes": "tag5 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag5 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               }
+            ]
+          }
+        ],
+        "definitions": [
+          {
+            "index": 0,
+            "headwordIndices": [
+              0
             ],
-            "frequencies": [
+            "dictionary": "Test Dictionary 2",
+            "tags": [
               {
-                "index": 0,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打ち込む",
-                "reading": "ぶちこむ",
-                "hasReading": false,
-                "frequency": 3
+                "name": "tag1",
+                "category": "category1",
+                "order": 0,
+                "score": 0,
+                "content": [
+                  "tag1 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
+                "redundant": false
               },
               {
-                "index": 1,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打ち込む",
-                "reading": "ぶちこむ",
-                "hasReading": true,
-                "frequency": 9
+                "name": "tag2",
+                "category": "category2",
+                "order": 0,
+                "score": 0,
+                "content": [
+                  "tag2 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
+                "redundant": false
               }
             ],
-            "pitches": [
-              {
-                "index": 0,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打ち込む",
-                "reading": "ぶちこむ",
-                "pitches": [
-                  {
-                    "position": 0,
-                    "tags": []
-                  },
-                  {
-                    "position": 3,
-                    "tags": []
-                  }
-                ]
-              }
+            "entries": [
+              "definition19",
+              "definition20"
             ]
           }
         ],
-        "glossary": [
-          "definition19",
-          "definition20"
-        ],
-        "definitionTags": [
+        "pronunciations": [
           {
-            "name": "tag1",
-            "category": "category1",
-            "notes": "tag1 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag2",
-            "category": "category2",
-            "notes": "tag2 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          }
-        ],
-        "termTags": [
-          {
-            "name": "tag3",
-            "category": "category3",
-            "notes": "tag3 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag4",
-            "category": "category4",
-            "notes": "tag4 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag5",
-            "category": "category5",
-            "notes": "tag5 notes",
-            "order": 0,
-            "score": 0,
+            "index": 0,
+            "headwordIndex": 0,
             "dictionary": "Test Dictionary 2",
-            "redundant": false
+            "dictionaryIndex": 0,
+            "dictionaryPriority": 0,
+            "pitches": [
+              {
+                "position": 0,
+                "tags": []
+              },
+              {
+                "position": 3,
+                "tags": []
+              }
+            ]
           }
         ],
         "frequencies": [
           {
             "index": 0,
-            "expressionIndex": 0,
+            "headwordIndex": 0,
             "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "expression": "打ち込む",
-            "reading": "ぶちこむ",
+            "dictionaryIndex": 0,
+            "dictionaryPriority": 0,
             "hasReading": false,
             "frequency": 3
           },
           {
             "index": 1,
-            "expressionIndex": 0,
+            "headwordIndex": 0,
             "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "expression": "打ち込む",
-            "reading": "ぶちこむ",
+            "dictionaryIndex": 0,
+            "dictionaryPriority": 0,
             "hasReading": true,
             "frequency": 9
           }
-        ],
-        "pitches": [
-          {
-            "index": 0,
-            "expressionIndex": 0,
-            "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "expression": "打ち込む",
-            "reading": "ぶちこむ",
-            "pitches": [
-              {
-                "position": 0,
-                "tags": []
-              },
-              {
-                "position": 3,
-                "tags": []
-              }
-            ]
-          }
-        ],
-        "sourceTermExactMatchCount": 1
+        ]
       },
       {
         "type": "term",
         "id": 3,
-        "source": "打ち",
-        "rawSource": "打ち",
-        "sourceTerm": "打つ",
-        "reasons": [
-          "masu stem"
-        ],
-        "score": 10,
         "isPrimary": true,
         "sequence": 3,
-        "dictionary": "Test Dictionary 2",
-        "dictionaryOrder": {
-          "index": 0,
-          "priority": 0
-        },
-        "dictionaryNames": [
-          "Test Dictionary 2"
+        "inflections": [
+          "masu stem"
         ],
-        "expression": "打つ",
-        "reading": "うつ",
-        "expressions": [
+        "score": 10,
+        "dictionaryIndex": 0,
+        "dictionaryPriority": 0,
+        "sourceTermExactMatchCount": 1,
+        "maxDeinflectedTextLength": 2,
+        "headwords": [
           {
-            "sourceTerm": "打つ",
-            "expression": "打つ",
+            "index": 0,
+            "term": "打つ",
             "reading": "うつ",
-            "termTags": [
+            "sources": [
+              {
+                "originalText": "打ち",
+                "transformedText": "打ち",
+                "deinflectedText": "打つ",
+                "isPrimary": true
+              }
+            ],
+            "tags": [
               {
                 "name": "tag3",
                 "category": "category3",
-                "notes": "tag3 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag3 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag4",
                 "category": "category4",
-                "notes": "tag4 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag4 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag5",
                 "category": "category5",
-                "notes": "tag5 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag5 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               }
+            ]
+          }
+        ],
+        "definitions": [
+          {
+            "index": 0,
+            "headwordIndices": [
+              0
             ],
-            "frequencies": [
+            "dictionary": "Test Dictionary 2",
+            "tags": [
               {
-                "index": 0,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打つ",
-                "reading": "うつ",
-                "hasReading": false,
-                "frequency": 2
+                "name": "tag1",
+                "category": "category1",
+                "order": 0,
+                "score": 0,
+                "content": [
+                  "tag1 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
+                "redundant": false
               },
               {
-                "index": 1,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打つ",
-                "reading": "うつ",
-                "hasReading": true,
-                "frequency": 6
+                "name": "tag2",
+                "category": "category2",
+                "order": 0,
+                "score": 0,
+                "content": [
+                  "tag2 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
+                "redundant": false
               }
             ],
-            "pitches": []
-          }
-        ],
-        "glossary": [
-          "definition5",
-          "definition6"
-        ],
-        "definitionTags": [
-          {
-            "name": "tag1",
-            "category": "category1",
-            "notes": "tag1 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag2",
-            "category": "category2",
-            "notes": "tag2 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          }
-        ],
-        "termTags": [
-          {
-            "name": "tag3",
-            "category": "category3",
-            "notes": "tag3 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag4",
-            "category": "category4",
-            "notes": "tag4 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag5",
-            "category": "category5",
-            "notes": "tag5 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
+            "entries": [
+              "definition5",
+              "definition6"
+            ]
           }
         ],
+        "pronunciations": [],
         "frequencies": [
           {
             "index": 0,
-            "expressionIndex": 0,
+            "headwordIndex": 0,
             "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "expression": "打つ",
-            "reading": "うつ",
+            "dictionaryIndex": 0,
+            "dictionaryPriority": 0,
             "hasReading": false,
             "frequency": 2
           },
           {
             "index": 1,
-            "expressionIndex": 0,
+            "headwordIndex": 0,
             "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "expression": "打つ",
-            "reading": "うつ",
+            "dictionaryIndex": 0,
+            "dictionaryPriority": 0,
             "hasReading": true,
             "frequency": 6
           }
-        ],
-        "pitches": [],
-        "sourceTermExactMatchCount": 1
+        ]
       },
       {
         "type": "term",
         "id": 5,
-        "source": "打ち",
-        "rawSource": "打ち",
-        "sourceTerm": "打つ",
-        "reasons": [
-          "masu stem"
-        ],
-        "score": 10,
         "isPrimary": true,
         "sequence": 3,
-        "dictionary": "Test Dictionary 2",
-        "dictionaryOrder": {
-          "index": 0,
-          "priority": 0
-        },
-        "dictionaryNames": [
-          "Test Dictionary 2"
+        "inflections": [
+          "masu stem"
         ],
-        "expression": "打つ",
-        "reading": "ぶつ",
-        "expressions": [
+        "score": 10,
+        "dictionaryIndex": 0,
+        "dictionaryPriority": 0,
+        "sourceTermExactMatchCount": 1,
+        "maxDeinflectedTextLength": 2,
+        "headwords": [
           {
-            "sourceTerm": "打つ",
-            "expression": "打つ",
+            "index": 0,
+            "term": "打つ",
             "reading": "ぶつ",
-            "termTags": [
+            "sources": [
+              {
+                "originalText": "打ち",
+                "transformedText": "打ち",
+                "deinflectedText": "打つ",
+                "isPrimary": true
+              }
+            ],
+            "tags": [
               {
                 "name": "tag3",
                 "category": "category3",
-                "notes": "tag3 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag3 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag4",
                 "category": "category4",
-                "notes": "tag4 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag4 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag5",
                 "category": "category5",
-                "notes": "tag5 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag5 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               }
+            ]
+          }
+        ],
+        "definitions": [
+          {
+            "index": 0,
+            "headwordIndices": [
+              0
             ],
-            "frequencies": [
+            "dictionary": "Test Dictionary 2",
+            "tags": [
               {
-                "index": 0,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打つ",
-                "reading": "ぶつ",
-                "hasReading": false,
-                "frequency": 2
+                "name": "tag1",
+                "category": "category1",
+                "order": 0,
+                "score": 0,
+                "content": [
+                  "tag1 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
+                "redundant": false
               },
               {
-                "index": 1,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打つ",
-                "reading": "ぶつ",
-                "hasReading": true,
-                "frequency": 7
+                "name": "tag2",
+                "category": "category2",
+                "order": 0,
+                "score": 0,
+                "content": [
+                  "tag2 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
+                "redundant": false
               }
             ],
-            "pitches": []
-          }
-        ],
-        "glossary": [
-          "definition9",
-          "definition10"
-        ],
-        "definitionTags": [
-          {
-            "name": "tag1",
-            "category": "category1",
-            "notes": "tag1 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag2",
-            "category": "category2",
-            "notes": "tag2 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          }
-        ],
-        "termTags": [
-          {
-            "name": "tag3",
-            "category": "category3",
-            "notes": "tag3 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag4",
-            "category": "category4",
-            "notes": "tag4 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag5",
-            "category": "category5",
-            "notes": "tag5 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
+            "entries": [
+              "definition9",
+              "definition10"
+            ]
           }
         ],
+        "pronunciations": [],
         "frequencies": [
           {
             "index": 0,
-            "expressionIndex": 0,
+            "headwordIndex": 0,
             "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "expression": "打つ",
-            "reading": "ぶつ",
+            "dictionaryIndex": 0,
+            "dictionaryPriority": 0,
             "hasReading": false,
             "frequency": 2
           },
           {
             "index": 1,
-            "expressionIndex": 0,
+            "headwordIndex": 0,
             "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "expression": "打つ",
-            "reading": "ぶつ",
+            "dictionaryIndex": 0,
+            "dictionaryPriority": 0,
             "hasReading": true,
             "frequency": 7
           }
-        ],
-        "pitches": [],
-        "sourceTermExactMatchCount": 1
+        ]
       },
       {
         "type": "term",
         "id": 4,
-        "source": "打ち",
-        "rawSource": "打ち",
-        "sourceTerm": "打つ",
-        "reasons": [
-          "masu stem"
-        ],
-        "score": 1,
         "isPrimary": true,
         "sequence": 3,
-        "dictionary": "Test Dictionary 2",
-        "dictionaryOrder": {
-          "index": 0,
-          "priority": 0
-        },
-        "dictionaryNames": [
-          "Test Dictionary 2"
+        "inflections": [
+          "masu stem"
         ],
-        "expression": "打つ",
-        "reading": "うつ",
-        "expressions": [
+        "score": 1,
+        "dictionaryIndex": 0,
+        "dictionaryPriority": 0,
+        "sourceTermExactMatchCount": 1,
+        "maxDeinflectedTextLength": 2,
+        "headwords": [
           {
-            "sourceTerm": "打つ",
-            "expression": "打つ",
+            "index": 0,
+            "term": "打つ",
             "reading": "うつ",
-            "termTags": [
+            "sources": [
+              {
+                "originalText": "打ち",
+                "transformedText": "打ち",
+                "deinflectedText": "打つ",
+                "isPrimary": true
+              }
+            ],
+            "tags": [
               {
                 "name": "tag3",
                 "category": "category3",
-                "notes": "tag3 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag3 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag4",
                 "category": "category4",
-                "notes": "tag4 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag4 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag5",
                 "category": "category5",
-                "notes": "tag5 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag5 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               }
+            ]
+          }
+        ],
+        "definitions": [
+          {
+            "index": 0,
+            "headwordIndices": [
+              0
             ],
-            "frequencies": [
+            "dictionary": "Test Dictionary 2",
+            "tags": [
               {
-                "index": 0,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打つ",
-                "reading": "うつ",
-                "hasReading": false,
-                "frequency": 2
+                "name": "tag1",
+                "category": "category1",
+                "order": 0,
+                "score": 0,
+                "content": [
+                  "tag1 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
+                "redundant": false
               },
               {
-                "index": 1,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打つ",
-                "reading": "うつ",
-                "hasReading": true,
-                "frequency": 6
+                "name": "tag2",
+                "category": "category2",
+                "order": 0,
+                "score": 0,
+                "content": [
+                  "tag2 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
+                "redundant": false
               }
             ],
-            "pitches": []
-          }
-        ],
-        "glossary": [
-          "definition7",
-          "definition8"
-        ],
-        "definitionTags": [
-          {
-            "name": "tag1",
-            "category": "category1",
-            "notes": "tag1 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag2",
-            "category": "category2",
-            "notes": "tag2 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          }
-        ],
-        "termTags": [
-          {
-            "name": "tag3",
-            "category": "category3",
-            "notes": "tag3 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag4",
-            "category": "category4",
-            "notes": "tag4 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag5",
-            "category": "category5",
-            "notes": "tag5 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
+            "entries": [
+              "definition7",
+              "definition8"
+            ]
           }
         ],
+        "pronunciations": [],
         "frequencies": [
           {
             "index": 0,
-            "expressionIndex": 0,
+            "headwordIndex": 0,
             "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "expression": "打つ",
-            "reading": "うつ",
+            "dictionaryIndex": 0,
+            "dictionaryPriority": 0,
             "hasReading": false,
             "frequency": 2
           },
           {
             "index": 1,
-            "expressionIndex": 0,
+            "headwordIndex": 0,
             "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "expression": "打つ",
-            "reading": "うつ",
+            "dictionaryIndex": 0,
+            "dictionaryPriority": 0,
             "hasReading": true,
             "frequency": 6
           }
-        ],
-        "pitches": [],
-        "sourceTermExactMatchCount": 1
+        ]
       },
       {
         "type": "term",
         "id": 6,
-        "source": "打ち",
-        "rawSource": "打ち",
-        "sourceTerm": "打つ",
-        "reasons": [
-          "masu stem"
-        ],
-        "score": 1,
         "isPrimary": true,
         "sequence": 3,
-        "dictionary": "Test Dictionary 2",
-        "dictionaryOrder": {
-          "index": 0,
-          "priority": 0
-        },
-        "dictionaryNames": [
-          "Test Dictionary 2"
+        "inflections": [
+          "masu stem"
         ],
-        "expression": "打つ",
-        "reading": "ぶつ",
-        "expressions": [
+        "score": 1,
+        "dictionaryIndex": 0,
+        "dictionaryPriority": 0,
+        "sourceTermExactMatchCount": 1,
+        "maxDeinflectedTextLength": 2,
+        "headwords": [
           {
-            "sourceTerm": "打つ",
-            "expression": "打つ",
+            "index": 0,
+            "term": "打つ",
             "reading": "ぶつ",
-            "termTags": [
+            "sources": [
+              {
+                "originalText": "打ち",
+                "transformedText": "打ち",
+                "deinflectedText": "打つ",
+                "isPrimary": true
+              }
+            ],
+            "tags": [
               {
                 "name": "tag3",
                 "category": "category3",
-                "notes": "tag3 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag3 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag4",
                 "category": "category4",
-                "notes": "tag4 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag4 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag5",
                 "category": "category5",
-                "notes": "tag5 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag5 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               }
+            ]
+          }
+        ],
+        "definitions": [
+          {
+            "index": 0,
+            "headwordIndices": [
+              0
             ],
-            "frequencies": [
+            "dictionary": "Test Dictionary 2",
+            "tags": [
               {
-                "index": 0,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打つ",
-                "reading": "ぶつ",
-                "hasReading": false,
-                "frequency": 2
+                "name": "tag1",
+                "category": "category1",
+                "order": 0,
+                "score": 0,
+                "content": [
+                  "tag1 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
+                "redundant": false
               },
               {
-                "index": 1,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打つ",
-                "reading": "ぶつ",
-                "hasReading": true,
-                "frequency": 7
+                "name": "tag2",
+                "category": "category2",
+                "order": 0,
+                "score": 0,
+                "content": [
+                  "tag2 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
+                "redundant": false
               }
             ],
-            "pitches": []
-          }
-        ],
-        "glossary": [
-          "definition11",
-          "definition12"
-        ],
-        "definitionTags": [
-          {
-            "name": "tag1",
-            "category": "category1",
-            "notes": "tag1 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag2",
-            "category": "category2",
-            "notes": "tag2 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          }
-        ],
-        "termTags": [
-          {
-            "name": "tag3",
-            "category": "category3",
-            "notes": "tag3 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag4",
-            "category": "category4",
-            "notes": "tag4 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag5",
-            "category": "category5",
-            "notes": "tag5 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
+            "entries": [
+              "definition11",
+              "definition12"
+            ]
           }
         ],
+        "pronunciations": [],
         "frequencies": [
           {
             "index": 0,
-            "expressionIndex": 0,
+            "headwordIndex": 0,
             "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "expression": "打つ",
-            "reading": "ぶつ",
+            "dictionaryIndex": 0,
+            "dictionaryPriority": 0,
             "hasReading": false,
             "frequency": 2
           },
           {
             "index": 1,
-            "expressionIndex": 0,
+            "headwordIndex": 0,
             "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "expression": "打つ",
-            "reading": "ぶつ",
+            "dictionaryIndex": 0,
+            "dictionaryPriority": 0,
             "hasReading": true,
             "frequency": 7
           }
-        ],
-        "pitches": [],
-        "sourceTermExactMatchCount": 1
+        ]
       },
       {
         "type": "term",
         "id": 1,
-        "source": "打",
-        "rawSource": "打",
-        "sourceTerm": "打",
-        "reasons": [],
-        "score": 1,
         "isPrimary": true,
         "sequence": 1,
-        "dictionary": "Test Dictionary 2",
-        "dictionaryOrder": {
-          "index": 0,
-          "priority": 0
-        },
-        "dictionaryNames": [
-          "Test Dictionary 2"
-        ],
-        "expression": "打",
-        "reading": "だ",
-        "expressions": [
+        "inflections": [],
+        "score": 1,
+        "dictionaryIndex": 0,
+        "dictionaryPriority": 0,
+        "sourceTermExactMatchCount": 1,
+        "maxDeinflectedTextLength": 1,
+        "headwords": [
           {
-            "sourceTerm": "打",
-            "expression": "打",
+            "index": 0,
+            "term": "打",
             "reading": "だ",
-            "termTags": [
+            "sources": [
+              {
+                "originalText": "打",
+                "transformedText": "打",
+                "deinflectedText": "打",
+                "isPrimary": true
+              }
+            ],
+            "tags": [
               {
                 "name": "tag3",
                 "category": "category3",
-                "notes": "tag3 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag3 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag4",
                 "category": "category4",
-                "notes": "tag4 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag4 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag5",
                 "category": "category5",
-                "notes": "tag5 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag5 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               }
+            ]
+          }
+        ],
+        "definitions": [
+          {
+            "index": 0,
+            "headwordIndices": [
+              0
             ],
-            "frequencies": [
+            "dictionary": "Test Dictionary 2",
+            "tags": [
               {
-                "index": 0,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打",
-                "reading": "だ",
-                "hasReading": false,
-                "frequency": 1
+                "name": "tag1",
+                "category": "category1",
+                "order": 0,
+                "score": 0,
+                "content": [
+                  "tag1 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
+                "redundant": false
               },
               {
-                "index": 1,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打",
-                "reading": "だ",
-                "hasReading": true,
-                "frequency": 4
+                "name": "tag2",
+                "category": "category2",
+                "order": 0,
+                "score": 0,
+                "content": [
+                  "tag2 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
+                "redundant": false
               }
             ],
-            "pitches": []
-          }
-        ],
-        "glossary": [
-          "definition1",
-          "definition2"
-        ],
-        "definitionTags": [
-          {
-            "name": "tag1",
-            "category": "category1",
-            "notes": "tag1 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag2",
-            "category": "category2",
-            "notes": "tag2 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          }
-        ],
-        "termTags": [
-          {
-            "name": "tag3",
-            "category": "category3",
-            "notes": "tag3 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag4",
-            "category": "category4",
-            "notes": "tag4 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag5",
-            "category": "category5",
-            "notes": "tag5 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
+            "entries": [
+              "definition1",
+              "definition2"
+            ]
           }
         ],
+        "pronunciations": [],
         "frequencies": [
           {
             "index": 0,
-            "expressionIndex": 0,
+            "headwordIndex": 0,
             "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "expression": "打",
-            "reading": "だ",
+            "dictionaryIndex": 0,
+            "dictionaryPriority": 0,
             "hasReading": false,
             "frequency": 1
           },
           {
             "index": 1,
-            "expressionIndex": 0,
+            "headwordIndex": 0,
             "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "expression": "打",
-            "reading": "だ",
+            "dictionaryIndex": 0,
+            "dictionaryPriority": 0,
             "hasReading": true,
             "frequency": 4
           }
-        ],
-        "pitches": [],
-        "sourceTermExactMatchCount": 1
+        ]
       },
       {
         "type": "term",
         "id": 2,
-        "source": "打",
-        "rawSource": "打",
-        "sourceTerm": "打",
-        "reasons": [],
-        "score": 1,
         "isPrimary": true,
         "sequence": 2,
-        "dictionary": "Test Dictionary 2",
-        "dictionaryOrder": {
-          "index": 0,
-          "priority": 0
-        },
-        "dictionaryNames": [
-          "Test Dictionary 2"
-        ],
-        "expression": "打",
-        "reading": "ダース",
-        "expressions": [
+        "inflections": [],
+        "score": 1,
+        "dictionaryIndex": 0,
+        "dictionaryPriority": 0,
+        "sourceTermExactMatchCount": 1,
+        "maxDeinflectedTextLength": 1,
+        "headwords": [
           {
-            "sourceTerm": "打",
-            "expression": "打",
+            "index": 0,
+            "term": "打",
             "reading": "ダース",
-            "termTags": [
+            "sources": [
+              {
+                "originalText": "打",
+                "transformedText": "打",
+                "deinflectedText": "打",
+                "isPrimary": true
+              }
+            ],
+            "tags": [
               {
                 "name": "tag3",
                 "category": "category3",
-                "notes": "tag3 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag3 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag4",
                 "category": "category4",
-                "notes": "tag4 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag4 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag5",
                 "category": "category5",
-                "notes": "tag5 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag5 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               }
+            ]
+          }
+        ],
+        "definitions": [
+          {
+            "index": 0,
+            "headwordIndices": [
+              0
             ],
-            "frequencies": [
+            "dictionary": "Test Dictionary 2",
+            "tags": [
               {
-                "index": 0,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打",
-                "reading": "ダース",
-                "hasReading": false,
-                "frequency": 1
+                "name": "tag1",
+                "category": "category1",
+                "order": 0,
+                "score": 0,
+                "content": [
+                  "tag1 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
+                "redundant": false
               },
               {
-                "index": 1,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打",
-                "reading": "ダース",
-                "hasReading": true,
-                "frequency": 5
+                "name": "tag2",
+                "category": "category2",
+                "order": 0,
+                "score": 0,
+                "content": [
+                  "tag2 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
+                "redundant": false
               }
             ],
-            "pitches": []
-          }
-        ],
-        "glossary": [
-          "definition3",
-          "definition4"
-        ],
-        "definitionTags": [
-          {
-            "name": "tag1",
-            "category": "category1",
-            "notes": "tag1 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag2",
-            "category": "category2",
-            "notes": "tag2 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          }
-        ],
-        "termTags": [
-          {
-            "name": "tag3",
-            "category": "category3",
-            "notes": "tag3 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag4",
-            "category": "category4",
-            "notes": "tag4 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag5",
-            "category": "category5",
-            "notes": "tag5 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
+            "entries": [
+              "definition3",
+              "definition4"
+            ]
           }
         ],
+        "pronunciations": [],
         "frequencies": [
           {
             "index": 0,
-            "expressionIndex": 0,
+            "headwordIndex": 0,
             "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "expression": "打",
-            "reading": "ダース",
+            "dictionaryIndex": 0,
+            "dictionaryPriority": 0,
             "hasReading": false,
             "frequency": 1
           },
           {
             "index": 1,
-            "expressionIndex": 0,
+            "headwordIndex": 0,
             "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "expression": "打",
-            "reading": "ダース",
+            "dictionaryIndex": 0,
+            "dictionaryPriority": 0,
             "hasReading": true,
             "frequency": 5
           }
-        ],
-        "pitches": [],
-        "sourceTermExactMatchCount": 1
+        ]
       }
     ]
   },
   {
     "name": "Ignore text inside parentheses",
-    "length": 10,
-    "definitions": [
+    "originalTextLength": 10,
+    "dictionaryEntries": [
       {
         "type": "term",
         "id": 7,
-        "source": "打ち込む",
-        "rawSource": "打(う)ち込(こ)む",
-        "sourceTerm": "打ち込む",
-        "reasons": [],
-        "score": 10,
         "isPrimary": true,
         "sequence": 4,
-        "dictionary": "Test Dictionary 2",
-        "dictionaryOrder": {
-          "index": 0,
-          "priority": 0
-        },
-        "dictionaryNames": [
-          "Test Dictionary 2"
-        ],
-        "expression": "打ち込む",
-        "reading": "うちこむ",
-        "expressions": [
+        "inflections": [],
+        "score": 10,
+        "dictionaryIndex": 0,
+        "dictionaryPriority": 0,
+        "sourceTermExactMatchCount": 1,
+        "maxDeinflectedTextLength": 4,
+        "headwords": [
           {
-            "sourceTerm": "打ち込む",
-            "expression": "打ち込む",
+            "index": 0,
+            "term": "打ち込む",
             "reading": "うちこむ",
-            "termTags": [
+            "sources": [
+              {
+                "originalText": "打(う)ち込(こ)む",
+                "transformedText": "打ち込む",
+                "deinflectedText": "打ち込む",
+                "isPrimary": true
+              }
+            ],
+            "tags": [
               {
                 "name": "tag3",
                 "category": "category3",
-                "notes": "tag3 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag3 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag4",
                 "category": "category4",
-                "notes": "tag4 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag4 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag5",
                 "category": "category5",
-                "notes": "tag5 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag5 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               }
+            ]
+          }
+        ],
+        "definitions": [
+          {
+            "index": 0,
+            "headwordIndices": [
+              0
             ],
-            "frequencies": [
+            "dictionary": "Test Dictionary 2",
+            "tags": [
               {
-                "index": 0,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打ち込む",
-                "reading": "うちこむ",
-                "hasReading": false,
-                "frequency": 3
+                "name": "tag1",
+                "category": "category1",
+                "order": 0,
+                "score": 0,
+                "content": [
+                  "tag1 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
+                "redundant": false
               },
               {
-                "index": 1,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打ち込む",
-                "reading": "うちこむ",
-                "hasReading": true,
-                "frequency": 8
+                "name": "tag2",
+                "category": "category2",
+                "order": 0,
+                "score": 0,
+                "content": [
+                  "tag2 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
+                "redundant": false
               }
             ],
-            "pitches": [
-              {
-                "index": 0,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打ち込む",
-                "reading": "うちこむ",
-                "pitches": [
-                  {
-                    "position": 0,
-                    "tags": []
-                  },
-                  {
-                    "position": 3,
-                    "tags": []
-                  }
-                ]
-              }
+            "entries": [
+              "definition13",
+              "definition14"
             ]
           }
         ],
-        "glossary": [
-          "definition13",
-          "definition14"
-        ],
-        "definitionTags": [
-          {
-            "name": "tag1",
-            "category": "category1",
-            "notes": "tag1 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
+        "pronunciations": [
           {
-            "name": "tag2",
-            "category": "category2",
-            "notes": "tag2 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          }
-        ],
-        "termTags": [
-          {
-            "name": "tag3",
-            "category": "category3",
-            "notes": "tag3 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag4",
-            "category": "category4",
-            "notes": "tag4 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag5",
-            "category": "category5",
-            "notes": "tag5 notes",
-            "order": 0,
-            "score": 0,
+            "index": 0,
+            "headwordIndex": 0,
             "dictionary": "Test Dictionary 2",
-            "redundant": false
+            "dictionaryIndex": 0,
+            "dictionaryPriority": 0,
+            "pitches": [
+              {
+                "position": 0,
+                "tags": []
+              },
+              {
+                "position": 3,
+                "tags": []
+              }
+            ]
           }
         ],
         "frequencies": [
           {
             "index": 0,
-            "expressionIndex": 0,
+            "headwordIndex": 0,
             "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "expression": "打ち込む",
-            "reading": "うちこむ",
+            "dictionaryIndex": 0,
+            "dictionaryPriority": 0,
             "hasReading": false,
             "frequency": 3
           },
           {
             "index": 1,
-            "expressionIndex": 0,
+            "headwordIndex": 0,
             "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "expression": "打ち込む",
-            "reading": "うちこむ",
+            "dictionaryIndex": 0,
+            "dictionaryPriority": 0,
             "hasReading": true,
             "frequency": 8
           }
-        ],
-        "pitches": [
-          {
-            "index": 0,
-            "expressionIndex": 0,
-            "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "expression": "打ち込む",
-            "reading": "うちこむ",
-            "pitches": [
-              {
-                "position": 0,
-                "tags": []
-              },
-              {
-                "position": 3,
-                "tags": []
-              }
-            ]
-          }
-        ],
-        "sourceTermExactMatchCount": 1
+        ]
       },
       {
         "type": "term",
         "id": 9,
-        "source": "打ち込む",
-        "rawSource": "打(う)ち込(こ)む",
-        "sourceTerm": "打ち込む",
-        "reasons": [],
-        "score": 10,
         "isPrimary": true,
         "sequence": 4,
-        "dictionary": "Test Dictionary 2",
-        "dictionaryOrder": {
-          "index": 0,
-          "priority": 0
-        },
-        "dictionaryNames": [
-          "Test Dictionary 2"
-        ],
-        "expression": "打ち込む",
-        "reading": "ぶちこむ",
-        "expressions": [
+        "inflections": [],
+        "score": 10,
+        "dictionaryIndex": 0,
+        "dictionaryPriority": 0,
+        "sourceTermExactMatchCount": 1,
+        "maxDeinflectedTextLength": 4,
+        "headwords": [
           {
-            "sourceTerm": "打ち込む",
-            "expression": "打ち込む",
+            "index": 0,
+            "term": "打ち込む",
             "reading": "ぶちこむ",
-            "termTags": [
+            "sources": [
+              {
+                "originalText": "打(う)ち込(こ)む",
+                "transformedText": "打ち込む",
+                "deinflectedText": "打ち込む",
+                "isPrimary": true
+              }
+            ],
+            "tags": [
               {
                 "name": "tag3",
                 "category": "category3",
-                "notes": "tag3 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag3 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag4",
                 "category": "category4",
-                "notes": "tag4 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag4 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag5",
                 "category": "category5",
-                "notes": "tag5 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag5 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               }
+            ]
+          }
+        ],
+        "definitions": [
+          {
+            "index": 0,
+            "headwordIndices": [
+              0
             ],
-            "frequencies": [
+            "dictionary": "Test Dictionary 2",
+            "tags": [
               {
-                "index": 0,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打ち込む",
-                "reading": "ぶちこむ",
-                "hasReading": false,
-                "frequency": 3
+                "name": "tag1",
+                "category": "category1",
+                "order": 0,
+                "score": 0,
+                "content": [
+                  "tag1 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
+                "redundant": false
               },
               {
-                "index": 1,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打ち込む",
-                "reading": "ぶちこむ",
-                "hasReading": true,
-                "frequency": 9
+                "name": "tag2",
+                "category": "category2",
+                "order": 0,
+                "score": 0,
+                "content": [
+                  "tag2 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
+                "redundant": false
               }
             ],
-            "pitches": [
-              {
-                "index": 0,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打ち込む",
-                "reading": "ぶちこむ",
-                "pitches": [
-                  {
-                    "position": 0,
-                    "tags": []
-                  },
-                  {
-                    "position": 3,
-                    "tags": []
-                  }
-                ]
-              }
+            "entries": [
+              "definition17",
+              "definition18"
             ]
           }
         ],
-        "glossary": [
-          "definition17",
-          "definition18"
-        ],
-        "definitionTags": [
-          {
-            "name": "tag1",
-            "category": "category1",
-            "notes": "tag1 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag2",
-            "category": "category2",
-            "notes": "tag2 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          }
-        ],
-        "termTags": [
+        "pronunciations": [
           {
-            "name": "tag3",
-            "category": "category3",
-            "notes": "tag3 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag4",
-            "category": "category4",
-            "notes": "tag4 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag5",
-            "category": "category5",
-            "notes": "tag5 notes",
-            "order": 0,
-            "score": 0,
+            "index": 0,
+            "headwordIndex": 0,
             "dictionary": "Test Dictionary 2",
-            "redundant": false
+            "dictionaryIndex": 0,
+            "dictionaryPriority": 0,
+            "pitches": [
+              {
+                "position": 0,
+                "tags": []
+              },
+              {
+                "position": 3,
+                "tags": []
+              }
+            ]
           }
         ],
         "frequencies": [
           {
             "index": 0,
-            "expressionIndex": 0,
+            "headwordIndex": 0,
             "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "expression": "打ち込む",
-            "reading": "ぶちこむ",
+            "dictionaryIndex": 0,
+            "dictionaryPriority": 0,
             "hasReading": false,
             "frequency": 3
           },
           {
             "index": 1,
-            "expressionIndex": 0,
+            "headwordIndex": 0,
             "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "expression": "打ち込む",
-            "reading": "ぶちこむ",
+            "dictionaryIndex": 0,
+            "dictionaryPriority": 0,
             "hasReading": true,
             "frequency": 9
           }
-        ],
-        "pitches": [
-          {
-            "index": 0,
-            "expressionIndex": 0,
-            "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "expression": "打ち込む",
-            "reading": "ぶちこむ",
-            "pitches": [
-              {
-                "position": 0,
-                "tags": []
-              },
-              {
-                "position": 3,
-                "tags": []
-              }
-            ]
-          }
-        ],
-        "sourceTermExactMatchCount": 1
+        ]
       },
       {
         "type": "term",
         "id": 8,
-        "source": "打ち込む",
-        "rawSource": "打(う)ち込(こ)む",
-        "sourceTerm": "打ち込む",
-        "reasons": [],
-        "score": 1,
         "isPrimary": true,
         "sequence": 4,
-        "dictionary": "Test Dictionary 2",
-        "dictionaryOrder": {
-          "index": 0,
-          "priority": 0
-        },
-        "dictionaryNames": [
-          "Test Dictionary 2"
-        ],
-        "expression": "打ち込む",
-        "reading": "うちこむ",
-        "expressions": [
+        "inflections": [],
+        "score": 1,
+        "dictionaryIndex": 0,
+        "dictionaryPriority": 0,
+        "sourceTermExactMatchCount": 1,
+        "maxDeinflectedTextLength": 4,
+        "headwords": [
           {
-            "sourceTerm": "打ち込む",
-            "expression": "打ち込む",
+            "index": 0,
+            "term": "打ち込む",
             "reading": "うちこむ",
-            "termTags": [
+            "sources": [
+              {
+                "originalText": "打(う)ち込(こ)む",
+                "transformedText": "打ち込む",
+                "deinflectedText": "打ち込む",
+                "isPrimary": true
+              }
+            ],
+            "tags": [
               {
                 "name": "tag5",
                 "category": "category5",
-                "notes": "tag5 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag5 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag6",
                 "category": "default",
-                "notes": "",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag7",
                 "category": "default",
-                "notes": "",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               }
+            ]
+          }
+        ],
+        "definitions": [
+          {
+            "index": 0,
+            "headwordIndices": [
+              0
             ],
-            "frequencies": [
+            "dictionary": "Test Dictionary 2",
+            "tags": [
               {
-                "index": 0,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打ち込む",
-                "reading": "うちこむ",
-                "hasReading": false,
-                "frequency": 3
+                "name": "tag1",
+                "category": "category1",
+                "order": 0,
+                "score": 0,
+                "content": [
+                  "tag1 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
+                "redundant": false
               },
               {
-                "index": 1,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打ち込む",
-                "reading": "うちこむ",
-                "hasReading": true,
-                "frequency": 8
+                "name": "tag2",
+                "category": "category2",
+                "order": 0,
+                "score": 0,
+                "content": [
+                  "tag2 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
+                "redundant": false
               }
             ],
-            "pitches": [
-              {
-                "index": 0,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打ち込む",
-                "reading": "うちこむ",
-                "pitches": [
-                  {
-                    "position": 0,
-                    "tags": []
-                  },
-                  {
-                    "position": 3,
-                    "tags": []
-                  }
-                ]
-              }
+            "entries": [
+              "definition15",
+              "definition16"
             ]
           }
         ],
-        "glossary": [
-          "definition15",
-          "definition16"
-        ],
-        "definitionTags": [
-          {
-            "name": "tag1",
-            "category": "category1",
-            "notes": "tag1 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag2",
-            "category": "category2",
-            "notes": "tag2 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          }
-        ],
-        "termTags": [
-          {
-            "name": "tag5",
-            "category": "category5",
-            "notes": "tag5 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
+        "pronunciations": [
           {
-            "name": "tag6",
-            "category": "default",
-            "notes": "",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag7",
-            "category": "default",
-            "notes": "",
-            "order": 0,
-            "score": 0,
+            "index": 0,
+            "headwordIndex": 0,
             "dictionary": "Test Dictionary 2",
-            "redundant": false
+            "dictionaryIndex": 0,
+            "dictionaryPriority": 0,
+            "pitches": [
+              {
+                "position": 0,
+                "tags": []
+              },
+              {
+                "position": 3,
+                "tags": []
+              }
+            ]
           }
         ],
         "frequencies": [
           {
             "index": 0,
-            "expressionIndex": 0,
+            "headwordIndex": 0,
             "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "expression": "打ち込む",
-            "reading": "うちこむ",
+            "dictionaryIndex": 0,
+            "dictionaryPriority": 0,
             "hasReading": false,
             "frequency": 3
           },
           {
             "index": 1,
-            "expressionIndex": 0,
+            "headwordIndex": 0,
             "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "expression": "打ち込む",
-            "reading": "うちこむ",
+            "dictionaryIndex": 0,
+            "dictionaryPriority": 0,
             "hasReading": true,
             "frequency": 8
           }
-        ],
-        "pitches": [
-          {
-            "index": 0,
-            "expressionIndex": 0,
-            "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "expression": "打ち込む",
-            "reading": "うちこむ",
-            "pitches": [
-              {
-                "position": 0,
-                "tags": []
-              },
-              {
-                "position": 3,
-                "tags": []
-              }
-            ]
-          }
-        ],
-        "sourceTermExactMatchCount": 1
+        ]
       },
       {
         "type": "term",
         "id": 10,
-        "source": "打ち込む",
-        "rawSource": "打(う)ち込(こ)む",
-        "sourceTerm": "打ち込む",
-        "reasons": [],
-        "score": 1,
         "isPrimary": true,
         "sequence": 4,
-        "dictionary": "Test Dictionary 2",
-        "dictionaryOrder": {
-          "index": 0,
-          "priority": 0
-        },
-        "dictionaryNames": [
-          "Test Dictionary 2"
-        ],
-        "expression": "打ち込む",
-        "reading": "ぶちこむ",
-        "expressions": [
+        "inflections": [],
+        "score": 1,
+        "dictionaryIndex": 0,
+        "dictionaryPriority": 0,
+        "sourceTermExactMatchCount": 1,
+        "maxDeinflectedTextLength": 4,
+        "headwords": [
           {
-            "sourceTerm": "打ち込む",
-            "expression": "打ち込む",
+            "index": 0,
+            "term": "打ち込む",
             "reading": "ぶちこむ",
-            "termTags": [
+            "sources": [
+              {
+                "originalText": "打(う)ち込(こ)む",
+                "transformedText": "打ち込む",
+                "deinflectedText": "打ち込む",
+                "isPrimary": true
+              }
+            ],
+            "tags": [
               {
                 "name": "tag3",
                 "category": "category3",
-                "notes": "tag3 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag3 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag4",
                 "category": "category4",
-                "notes": "tag4 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag4 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag5",
                 "category": "category5",
-                "notes": "tag5 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag5 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               }
+            ]
+          }
+        ],
+        "definitions": [
+          {
+            "index": 0,
+            "headwordIndices": [
+              0
             ],
-            "frequencies": [
+            "dictionary": "Test Dictionary 2",
+            "tags": [
               {
-                "index": 0,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打ち込む",
-                "reading": "ぶちこむ",
-                "hasReading": false,
-                "frequency": 3
+                "name": "tag1",
+                "category": "category1",
+                "order": 0,
+                "score": 0,
+                "content": [
+                  "tag1 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
+                "redundant": false
               },
               {
-                "index": 1,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打ち込む",
-                "reading": "ぶちこむ",
-                "hasReading": true,
-                "frequency": 9
+                "name": "tag2",
+                "category": "category2",
+                "order": 0,
+                "score": 0,
+                "content": [
+                  "tag2 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
+                "redundant": false
               }
             ],
-            "pitches": [
-              {
-                "index": 0,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打ち込む",
-                "reading": "ぶちこむ",
-                "pitches": [
-                  {
-                    "position": 0,
-                    "tags": []
-                  },
-                  {
-                    "position": 3,
-                    "tags": []
-                  }
-                ]
-              }
+            "entries": [
+              "definition19",
+              "definition20"
             ]
           }
         ],
-        "glossary": [
-          "definition19",
-          "definition20"
-        ],
-        "definitionTags": [
+        "pronunciations": [
           {
-            "name": "tag1",
-            "category": "category1",
-            "notes": "tag1 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag2",
-            "category": "category2",
-            "notes": "tag2 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          }
-        ],
-        "termTags": [
-          {
-            "name": "tag3",
-            "category": "category3",
-            "notes": "tag3 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag4",
-            "category": "category4",
-            "notes": "tag4 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag5",
-            "category": "category5",
-            "notes": "tag5 notes",
-            "order": 0,
-            "score": 0,
+            "index": 0,
+            "headwordIndex": 0,
             "dictionary": "Test Dictionary 2",
-            "redundant": false
+            "dictionaryIndex": 0,
+            "dictionaryPriority": 0,
+            "pitches": [
+              {
+                "position": 0,
+                "tags": []
+              },
+              {
+                "position": 3,
+                "tags": []
+              }
+            ]
           }
         ],
         "frequencies": [
           {
             "index": 0,
-            "expressionIndex": 0,
+            "headwordIndex": 0,
             "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "expression": "打ち込む",
-            "reading": "ぶちこむ",
+            "dictionaryIndex": 0,
+            "dictionaryPriority": 0,
             "hasReading": false,
             "frequency": 3
           },
           {
             "index": 1,
-            "expressionIndex": 0,
+            "headwordIndex": 0,
             "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "expression": "打ち込む",
-            "reading": "ぶちこむ",
+            "dictionaryIndex": 0,
+            "dictionaryPriority": 0,
             "hasReading": true,
             "frequency": 9
           }
-        ],
-        "pitches": [
-          {
-            "index": 0,
-            "expressionIndex": 0,
-            "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "expression": "打ち込む",
-            "reading": "ぶちこむ",
-            "pitches": [
-              {
-                "position": 0,
-                "tags": []
-              },
-              {
-                "position": 3,
-                "tags": []
-              }
-            ]
-          }
-        ],
-        "sourceTermExactMatchCount": 1
+        ]
       },
       {
         "type": "term",
         "id": 3,
-        "source": "打ち",
-        "rawSource": "打(う)ち",
-        "sourceTerm": "打つ",
-        "reasons": [
-          "masu stem"
-        ],
-        "score": 10,
         "isPrimary": true,
         "sequence": 3,
-        "dictionary": "Test Dictionary 2",
-        "dictionaryOrder": {
-          "index": 0,
-          "priority": 0
-        },
-        "dictionaryNames": [
-          "Test Dictionary 2"
+        "inflections": [
+          "masu stem"
         ],
-        "expression": "打つ",
-        "reading": "うつ",
-        "expressions": [
+        "score": 10,
+        "dictionaryIndex": 0,
+        "dictionaryPriority": 0,
+        "sourceTermExactMatchCount": 1,
+        "maxDeinflectedTextLength": 2,
+        "headwords": [
           {
-            "sourceTerm": "打つ",
-            "expression": "打つ",
+            "index": 0,
+            "term": "打つ",
             "reading": "うつ",
-            "termTags": [
+            "sources": [
+              {
+                "originalText": "打(う)ち",
+                "transformedText": "打ち",
+                "deinflectedText": "打つ",
+                "isPrimary": true
+              }
+            ],
+            "tags": [
               {
                 "name": "tag3",
                 "category": "category3",
-                "notes": "tag3 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag3 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag4",
                 "category": "category4",
-                "notes": "tag4 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag4 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag5",
                 "category": "category5",
-                "notes": "tag5 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag5 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               }
+            ]
+          }
+        ],
+        "definitions": [
+          {
+            "index": 0,
+            "headwordIndices": [
+              0
             ],
-            "frequencies": [
+            "dictionary": "Test Dictionary 2",
+            "tags": [
               {
-                "index": 0,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打つ",
-                "reading": "うつ",
-                "hasReading": false,
-                "frequency": 2
+                "name": "tag1",
+                "category": "category1",
+                "order": 0,
+                "score": 0,
+                "content": [
+                  "tag1 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
+                "redundant": false
               },
               {
-                "index": 1,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打つ",
-                "reading": "うつ",
-                "hasReading": true,
-                "frequency": 6
+                "name": "tag2",
+                "category": "category2",
+                "order": 0,
+                "score": 0,
+                "content": [
+                  "tag2 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
+                "redundant": false
               }
             ],
-            "pitches": []
-          }
-        ],
-        "glossary": [
-          "definition5",
-          "definition6"
-        ],
-        "definitionTags": [
-          {
-            "name": "tag1",
-            "category": "category1",
-            "notes": "tag1 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag2",
-            "category": "category2",
-            "notes": "tag2 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          }
-        ],
-        "termTags": [
-          {
-            "name": "tag3",
-            "category": "category3",
-            "notes": "tag3 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag4",
-            "category": "category4",
-            "notes": "tag4 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag5",
-            "category": "category5",
-            "notes": "tag5 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
+            "entries": [
+              "definition5",
+              "definition6"
+            ]
           }
         ],
+        "pronunciations": [],
         "frequencies": [
           {
             "index": 0,
-            "expressionIndex": 0,
+            "headwordIndex": 0,
             "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "expression": "打つ",
-            "reading": "うつ",
+            "dictionaryIndex": 0,
+            "dictionaryPriority": 0,
             "hasReading": false,
             "frequency": 2
           },
           {
             "index": 1,
-            "expressionIndex": 0,
+            "headwordIndex": 0,
             "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "expression": "打つ",
-            "reading": "うつ",
+            "dictionaryIndex": 0,
+            "dictionaryPriority": 0,
             "hasReading": true,
             "frequency": 6
           }
-        ],
-        "pitches": [],
-        "sourceTermExactMatchCount": 1
+        ]
       },
       {
         "type": "term",
         "id": 5,
-        "source": "打ち",
-        "rawSource": "打(う)ち",
-        "sourceTerm": "打つ",
-        "reasons": [
-          "masu stem"
-        ],
-        "score": 10,
         "isPrimary": true,
         "sequence": 3,
-        "dictionary": "Test Dictionary 2",
-        "dictionaryOrder": {
-          "index": 0,
-          "priority": 0
-        },
-        "dictionaryNames": [
-          "Test Dictionary 2"
+        "inflections": [
+          "masu stem"
         ],
-        "expression": "打つ",
-        "reading": "ぶつ",
-        "expressions": [
+        "score": 10,
+        "dictionaryIndex": 0,
+        "dictionaryPriority": 0,
+        "sourceTermExactMatchCount": 1,
+        "maxDeinflectedTextLength": 2,
+        "headwords": [
           {
-            "sourceTerm": "打つ",
-            "expression": "打つ",
+            "index": 0,
+            "term": "打つ",
             "reading": "ぶつ",
-            "termTags": [
+            "sources": [
+              {
+                "originalText": "打(う)ち",
+                "transformedText": "打ち",
+                "deinflectedText": "打つ",
+                "isPrimary": true
+              }
+            ],
+            "tags": [
               {
                 "name": "tag3",
                 "category": "category3",
-                "notes": "tag3 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag3 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag4",
                 "category": "category4",
-                "notes": "tag4 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag4 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag5",
                 "category": "category5",
-                "notes": "tag5 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag5 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               }
+            ]
+          }
+        ],
+        "definitions": [
+          {
+            "index": 0,
+            "headwordIndices": [
+              0
             ],
-            "frequencies": [
+            "dictionary": "Test Dictionary 2",
+            "tags": [
               {
-                "index": 0,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打つ",
-                "reading": "ぶつ",
-                "hasReading": false,
-                "frequency": 2
+                "name": "tag1",
+                "category": "category1",
+                "order": 0,
+                "score": 0,
+                "content": [
+                  "tag1 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
+                "redundant": false
               },
               {
-                "index": 1,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打つ",
-                "reading": "ぶつ",
-                "hasReading": true,
-                "frequency": 7
+                "name": "tag2",
+                "category": "category2",
+                "order": 0,
+                "score": 0,
+                "content": [
+                  "tag2 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
+                "redundant": false
               }
             ],
-            "pitches": []
-          }
-        ],
-        "glossary": [
-          "definition9",
-          "definition10"
-        ],
-        "definitionTags": [
-          {
-            "name": "tag1",
-            "category": "category1",
-            "notes": "tag1 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag2",
-            "category": "category2",
-            "notes": "tag2 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          }
-        ],
-        "termTags": [
-          {
-            "name": "tag3",
-            "category": "category3",
-            "notes": "tag3 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag4",
-            "category": "category4",
-            "notes": "tag4 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag5",
-            "category": "category5",
-            "notes": "tag5 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
+            "entries": [
+              "definition9",
+              "definition10"
+            ]
           }
         ],
+        "pronunciations": [],
         "frequencies": [
           {
             "index": 0,
-            "expressionIndex": 0,
+            "headwordIndex": 0,
             "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "expression": "打つ",
-            "reading": "ぶつ",
+            "dictionaryIndex": 0,
+            "dictionaryPriority": 0,
             "hasReading": false,
             "frequency": 2
           },
           {
             "index": 1,
-            "expressionIndex": 0,
+            "headwordIndex": 0,
             "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "expression": "打つ",
-            "reading": "ぶつ",
+            "dictionaryIndex": 0,
+            "dictionaryPriority": 0,
             "hasReading": true,
             "frequency": 7
           }
-        ],
-        "pitches": [],
-        "sourceTermExactMatchCount": 1
+        ]
       },
       {
         "type": "term",
         "id": 4,
-        "source": "打ち",
-        "rawSource": "打(う)ち",
-        "sourceTerm": "打つ",
-        "reasons": [
-          "masu stem"
-        ],
-        "score": 1,
         "isPrimary": true,
         "sequence": 3,
-        "dictionary": "Test Dictionary 2",
-        "dictionaryOrder": {
-          "index": 0,
-          "priority": 0
-        },
-        "dictionaryNames": [
-          "Test Dictionary 2"
+        "inflections": [
+          "masu stem"
         ],
-        "expression": "打つ",
-        "reading": "うつ",
-        "expressions": [
+        "score": 1,
+        "dictionaryIndex": 0,
+        "dictionaryPriority": 0,
+        "sourceTermExactMatchCount": 1,
+        "maxDeinflectedTextLength": 2,
+        "headwords": [
           {
-            "sourceTerm": "打つ",
-            "expression": "打つ",
+            "index": 0,
+            "term": "打つ",
             "reading": "うつ",
-            "termTags": [
+            "sources": [
+              {
+                "originalText": "打(う)ち",
+                "transformedText": "打ち",
+                "deinflectedText": "打つ",
+                "isPrimary": true
+              }
+            ],
+            "tags": [
               {
                 "name": "tag3",
                 "category": "category3",
-                "notes": "tag3 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag3 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag4",
                 "category": "category4",
-                "notes": "tag4 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag4 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag5",
                 "category": "category5",
-                "notes": "tag5 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag5 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               }
+            ]
+          }
+        ],
+        "definitions": [
+          {
+            "index": 0,
+            "headwordIndices": [
+              0
             ],
-            "frequencies": [
+            "dictionary": "Test Dictionary 2",
+            "tags": [
               {
-                "index": 0,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打つ",
-                "reading": "うつ",
-                "hasReading": false,
-                "frequency": 2
+                "name": "tag1",
+                "category": "category1",
+                "order": 0,
+                "score": 0,
+                "content": [
+                  "tag1 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
+                "redundant": false
               },
               {
-                "index": 1,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打つ",
-                "reading": "うつ",
-                "hasReading": true,
-                "frequency": 6
+                "name": "tag2",
+                "category": "category2",
+                "order": 0,
+                "score": 0,
+                "content": [
+                  "tag2 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
+                "redundant": false
               }
             ],
-            "pitches": []
-          }
-        ],
-        "glossary": [
-          "definition7",
-          "definition8"
-        ],
-        "definitionTags": [
-          {
-            "name": "tag1",
-            "category": "category1",
-            "notes": "tag1 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag2",
-            "category": "category2",
-            "notes": "tag2 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          }
-        ],
-        "termTags": [
-          {
-            "name": "tag3",
-            "category": "category3",
-            "notes": "tag3 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag4",
-            "category": "category4",
-            "notes": "tag4 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag5",
-            "category": "category5",
-            "notes": "tag5 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
+            "entries": [
+              "definition7",
+              "definition8"
+            ]
           }
         ],
+        "pronunciations": [],
         "frequencies": [
           {
             "index": 0,
-            "expressionIndex": 0,
+            "headwordIndex": 0,
             "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "expression": "打つ",
-            "reading": "うつ",
+            "dictionaryIndex": 0,
+            "dictionaryPriority": 0,
             "hasReading": false,
             "frequency": 2
           },
           {
             "index": 1,
-            "expressionIndex": 0,
+            "headwordIndex": 0,
             "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "expression": "打つ",
-            "reading": "うつ",
+            "dictionaryIndex": 0,
+            "dictionaryPriority": 0,
             "hasReading": true,
             "frequency": 6
           }
-        ],
-        "pitches": [],
-        "sourceTermExactMatchCount": 1
+        ]
       },
       {
         "type": "term",
         "id": 6,
-        "source": "打ち",
-        "rawSource": "打(う)ち",
-        "sourceTerm": "打つ",
-        "reasons": [
-          "masu stem"
-        ],
-        "score": 1,
         "isPrimary": true,
         "sequence": 3,
-        "dictionary": "Test Dictionary 2",
-        "dictionaryOrder": {
-          "index": 0,
-          "priority": 0
-        },
-        "dictionaryNames": [
-          "Test Dictionary 2"
+        "inflections": [
+          "masu stem"
         ],
-        "expression": "打つ",
-        "reading": "ぶつ",
-        "expressions": [
+        "score": 1,
+        "dictionaryIndex": 0,
+        "dictionaryPriority": 0,
+        "sourceTermExactMatchCount": 1,
+        "maxDeinflectedTextLength": 2,
+        "headwords": [
           {
-            "sourceTerm": "打つ",
-            "expression": "打つ",
+            "index": 0,
+            "term": "打つ",
             "reading": "ぶつ",
-            "termTags": [
+            "sources": [
+              {
+                "originalText": "打(う)ち",
+                "transformedText": "打ち",
+                "deinflectedText": "打つ",
+                "isPrimary": true
+              }
+            ],
+            "tags": [
               {
                 "name": "tag3",
                 "category": "category3",
-                "notes": "tag3 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag3 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag4",
                 "category": "category4",
-                "notes": "tag4 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag4 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag5",
                 "category": "category5",
-                "notes": "tag5 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag5 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               }
+            ]
+          }
+        ],
+        "definitions": [
+          {
+            "index": 0,
+            "headwordIndices": [
+              0
             ],
-            "frequencies": [
+            "dictionary": "Test Dictionary 2",
+            "tags": [
               {
-                "index": 0,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打つ",
-                "reading": "ぶつ",
-                "hasReading": false,
-                "frequency": 2
+                "name": "tag1",
+                "category": "category1",
+                "order": 0,
+                "score": 0,
+                "content": [
+                  "tag1 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
+                "redundant": false
               },
               {
-                "index": 1,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打つ",
-                "reading": "ぶつ",
-                "hasReading": true,
-                "frequency": 7
+                "name": "tag2",
+                "category": "category2",
+                "order": 0,
+                "score": 0,
+                "content": [
+                  "tag2 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
+                "redundant": false
               }
             ],
-            "pitches": []
-          }
-        ],
-        "glossary": [
-          "definition11",
-          "definition12"
-        ],
-        "definitionTags": [
-          {
-            "name": "tag1",
-            "category": "category1",
-            "notes": "tag1 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag2",
-            "category": "category2",
-            "notes": "tag2 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          }
-        ],
-        "termTags": [
-          {
-            "name": "tag3",
-            "category": "category3",
-            "notes": "tag3 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag4",
-            "category": "category4",
-            "notes": "tag4 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag5",
-            "category": "category5",
-            "notes": "tag5 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
+            "entries": [
+              "definition11",
+              "definition12"
+            ]
           }
         ],
+        "pronunciations": [],
         "frequencies": [
           {
             "index": 0,
-            "expressionIndex": 0,
+            "headwordIndex": 0,
             "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "expression": "打つ",
-            "reading": "ぶつ",
+            "dictionaryIndex": 0,
+            "dictionaryPriority": 0,
             "hasReading": false,
             "frequency": 2
           },
           {
             "index": 1,
-            "expressionIndex": 0,
+            "headwordIndex": 0,
             "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "expression": "打つ",
-            "reading": "ぶつ",
+            "dictionaryIndex": 0,
+            "dictionaryPriority": 0,
             "hasReading": true,
             "frequency": 7
           }
-        ],
-        "pitches": [],
-        "sourceTermExactMatchCount": 1
+        ]
       },
       {
         "type": "term",
         "id": 1,
-        "source": "打",
-        "rawSource": "打",
-        "sourceTerm": "打",
-        "reasons": [],
-        "score": 1,
         "isPrimary": true,
         "sequence": 1,
-        "dictionary": "Test Dictionary 2",
-        "dictionaryOrder": {
-          "index": 0,
-          "priority": 0
-        },
-        "dictionaryNames": [
-          "Test Dictionary 2"
-        ],
-        "expression": "打",
-        "reading": "だ",
-        "expressions": [
+        "inflections": [],
+        "score": 1,
+        "dictionaryIndex": 0,
+        "dictionaryPriority": 0,
+        "sourceTermExactMatchCount": 1,
+        "maxDeinflectedTextLength": 1,
+        "headwords": [
           {
-            "sourceTerm": "打",
-            "expression": "打",
+            "index": 0,
+            "term": "打",
             "reading": "だ",
-            "termTags": [
+            "sources": [
+              {
+                "originalText": "打",
+                "transformedText": "打",
+                "deinflectedText": "打",
+                "isPrimary": true
+              }
+            ],
+            "tags": [
               {
                 "name": "tag3",
                 "category": "category3",
-                "notes": "tag3 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag3 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag4",
                 "category": "category4",
-                "notes": "tag4 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag4 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag5",
                 "category": "category5",
-                "notes": "tag5 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag5 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               }
+            ]
+          }
+        ],
+        "definitions": [
+          {
+            "index": 0,
+            "headwordIndices": [
+              0
             ],
-            "frequencies": [
+            "dictionary": "Test Dictionary 2",
+            "tags": [
               {
-                "index": 0,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打",
-                "reading": "だ",
-                "hasReading": false,
-                "frequency": 1
+                "name": "tag1",
+                "category": "category1",
+                "order": 0,
+                "score": 0,
+                "content": [
+                  "tag1 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
+                "redundant": false
               },
               {
-                "index": 1,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打",
-                "reading": "だ",
-                "hasReading": true,
-                "frequency": 4
+                "name": "tag2",
+                "category": "category2",
+                "order": 0,
+                "score": 0,
+                "content": [
+                  "tag2 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
+                "redundant": false
               }
             ],
-            "pitches": []
-          }
-        ],
-        "glossary": [
-          "definition1",
-          "definition2"
-        ],
-        "definitionTags": [
-          {
-            "name": "tag1",
-            "category": "category1",
-            "notes": "tag1 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag2",
-            "category": "category2",
-            "notes": "tag2 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          }
-        ],
-        "termTags": [
-          {
-            "name": "tag3",
-            "category": "category3",
-            "notes": "tag3 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag4",
-            "category": "category4",
-            "notes": "tag4 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag5",
-            "category": "category5",
-            "notes": "tag5 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
+            "entries": [
+              "definition1",
+              "definition2"
+            ]
           }
         ],
+        "pronunciations": [],
         "frequencies": [
           {
             "index": 0,
-            "expressionIndex": 0,
+            "headwordIndex": 0,
             "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "expression": "打",
-            "reading": "だ",
+            "dictionaryIndex": 0,
+            "dictionaryPriority": 0,
             "hasReading": false,
             "frequency": 1
           },
           {
             "index": 1,
-            "expressionIndex": 0,
+            "headwordIndex": 0,
             "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "expression": "打",
-            "reading": "だ",
+            "dictionaryIndex": 0,
+            "dictionaryPriority": 0,
             "hasReading": true,
             "frequency": 4
           }
-        ],
-        "pitches": [],
-        "sourceTermExactMatchCount": 1
+        ]
       },
       {
         "type": "term",
         "id": 2,
-        "source": "打",
-        "rawSource": "打",
-        "sourceTerm": "打",
-        "reasons": [],
-        "score": 1,
         "isPrimary": true,
         "sequence": 2,
-        "dictionary": "Test Dictionary 2",
-        "dictionaryOrder": {
-          "index": 0,
-          "priority": 0
-        },
-        "dictionaryNames": [
-          "Test Dictionary 2"
-        ],
-        "expression": "打",
-        "reading": "ダース",
-        "expressions": [
+        "inflections": [],
+        "score": 1,
+        "dictionaryIndex": 0,
+        "dictionaryPriority": 0,
+        "sourceTermExactMatchCount": 1,
+        "maxDeinflectedTextLength": 1,
+        "headwords": [
           {
-            "sourceTerm": "打",
-            "expression": "打",
+            "index": 0,
+            "term": "打",
             "reading": "ダース",
-            "termTags": [
+            "sources": [
+              {
+                "originalText": "打",
+                "transformedText": "打",
+                "deinflectedText": "打",
+                "isPrimary": true
+              }
+            ],
+            "tags": [
               {
                 "name": "tag3",
                 "category": "category3",
-                "notes": "tag3 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag3 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag4",
                 "category": "category4",
-                "notes": "tag4 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag4 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag5",
                 "category": "category5",
-                "notes": "tag5 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag5 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               }
+            ]
+          }
+        ],
+        "definitions": [
+          {
+            "index": 0,
+            "headwordIndices": [
+              0
             ],
-            "frequencies": [
+            "dictionary": "Test Dictionary 2",
+            "tags": [
               {
-                "index": 0,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打",
-                "reading": "ダース",
-                "hasReading": false,
-                "frequency": 1
+                "name": "tag1",
+                "category": "category1",
+                "order": 0,
+                "score": 0,
+                "content": [
+                  "tag1 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
+                "redundant": false
               },
               {
-                "index": 1,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打",
-                "reading": "ダース",
-                "hasReading": true,
-                "frequency": 5
+                "name": "tag2",
+                "category": "category2",
+                "order": 0,
+                "score": 0,
+                "content": [
+                  "tag2 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
+                "redundant": false
               }
             ],
-            "pitches": []
-          }
-        ],
-        "glossary": [
-          "definition3",
-          "definition4"
-        ],
-        "definitionTags": [
-          {
-            "name": "tag1",
-            "category": "category1",
-            "notes": "tag1 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag2",
-            "category": "category2",
-            "notes": "tag2 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          }
-        ],
-        "termTags": [
-          {
-            "name": "tag3",
-            "category": "category3",
-            "notes": "tag3 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag4",
-            "category": "category4",
-            "notes": "tag4 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag5",
-            "category": "category5",
-            "notes": "tag5 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
+            "entries": [
+              "definition3",
+              "definition4"
+            ]
           }
         ],
+        "pronunciations": [],
         "frequencies": [
           {
             "index": 0,
-            "expressionIndex": 0,
+            "headwordIndex": 0,
             "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "expression": "打",
-            "reading": "ダース",
+            "dictionaryIndex": 0,
+            "dictionaryPriority": 0,
             "hasReading": false,
             "frequency": 1
           },
           {
             "index": 1,
-            "expressionIndex": 0,
+            "headwordIndex": 0,
             "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "expression": "打",
-            "reading": "ダース",
+            "dictionaryIndex": 0,
+            "dictionaryPriority": 0,
             "hasReading": true,
             "frequency": 5
           }
-        ],
-        "pitches": [],
-        "sourceTermExactMatchCount": 1
+        ]
       }
     ]
   },
   {
     "name": "Remove parentheses around text",
-    "length": 12,
-    "definitions": [
+    "originalTextLength": 12,
+    "dictionaryEntries": [
       {
         "type": "term",
         "id": 7,
-        "source": "打ち込む",
-        "rawSource": "(打)(ち)(込)(む)",
-        "sourceTerm": "打ち込む",
-        "reasons": [],
-        "score": 10,
         "isPrimary": true,
         "sequence": 4,
-        "dictionary": "Test Dictionary 2",
-        "dictionaryOrder": {
-          "index": 0,
-          "priority": 0
-        },
-        "dictionaryNames": [
-          "Test Dictionary 2"
-        ],
-        "expression": "打ち込む",
-        "reading": "うちこむ",
-        "expressions": [
+        "inflections": [],
+        "score": 10,
+        "dictionaryIndex": 0,
+        "dictionaryPriority": 0,
+        "sourceTermExactMatchCount": 1,
+        "maxDeinflectedTextLength": 4,
+        "headwords": [
           {
-            "sourceTerm": "打ち込む",
-            "expression": "打ち込む",
+            "index": 0,
+            "term": "打ち込む",
             "reading": "うちこむ",
-            "termTags": [
+            "sources": [
+              {
+                "originalText": "(打)(ち)(込)(む)",
+                "transformedText": "打ち込む",
+                "deinflectedText": "打ち込む",
+                "isPrimary": true
+              }
+            ],
+            "tags": [
               {
                 "name": "tag3",
                 "category": "category3",
-                "notes": "tag3 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag3 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag4",
                 "category": "category4",
-                "notes": "tag4 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag4 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag5",
                 "category": "category5",
-                "notes": "tag5 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag5 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               }
+            ]
+          }
+        ],
+        "definitions": [
+          {
+            "index": 0,
+            "headwordIndices": [
+              0
             ],
-            "frequencies": [
+            "dictionary": "Test Dictionary 2",
+            "tags": [
               {
-                "index": 0,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打ち込む",
-                "reading": "うちこむ",
-                "hasReading": false,
-                "frequency": 3
+                "name": "tag1",
+                "category": "category1",
+                "order": 0,
+                "score": 0,
+                "content": [
+                  "tag1 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
+                "redundant": false
               },
               {
-                "index": 1,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打ち込む",
-                "reading": "うちこむ",
-                "hasReading": true,
-                "frequency": 8
+                "name": "tag2",
+                "category": "category2",
+                "order": 0,
+                "score": 0,
+                "content": [
+                  "tag2 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
+                "redundant": false
               }
             ],
-            "pitches": [
-              {
-                "index": 0,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打ち込む",
-                "reading": "うちこむ",
-                "pitches": [
-                  {
-                    "position": 0,
-                    "tags": []
-                  },
-                  {
-                    "position": 3,
-                    "tags": []
-                  }
-                ]
-              }
+            "entries": [
+              "definition13",
+              "definition14"
             ]
           }
         ],
-        "glossary": [
-          "definition13",
-          "definition14"
-        ],
-        "definitionTags": [
-          {
-            "name": "tag1",
-            "category": "category1",
-            "notes": "tag1 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag2",
-            "category": "category2",
-            "notes": "tag2 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          }
-        ],
-        "termTags": [
-          {
-            "name": "tag3",
-            "category": "category3",
-            "notes": "tag3 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag4",
-            "category": "category4",
-            "notes": "tag4 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
+        "pronunciations": [
           {
-            "name": "tag5",
-            "category": "category5",
-            "notes": "tag5 notes",
-            "order": 0,
-            "score": 0,
+            "index": 0,
+            "headwordIndex": 0,
             "dictionary": "Test Dictionary 2",
-            "redundant": false
+            "dictionaryIndex": 0,
+            "dictionaryPriority": 0,
+            "pitches": [
+              {
+                "position": 0,
+                "tags": []
+              },
+              {
+                "position": 3,
+                "tags": []
+              }
+            ]
           }
         ],
         "frequencies": [
           {
             "index": 0,
-            "expressionIndex": 0,
+            "headwordIndex": 0,
             "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "expression": "打ち込む",
-            "reading": "うちこむ",
+            "dictionaryIndex": 0,
+            "dictionaryPriority": 0,
             "hasReading": false,
             "frequency": 3
           },
           {
             "index": 1,
-            "expressionIndex": 0,
+            "headwordIndex": 0,
             "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "expression": "打ち込む",
-            "reading": "うちこむ",
+            "dictionaryIndex": 0,
+            "dictionaryPriority": 0,
             "hasReading": true,
             "frequency": 8
           }
-        ],
-        "pitches": [
-          {
-            "index": 0,
-            "expressionIndex": 0,
-            "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "expression": "打ち込む",
-            "reading": "うちこむ",
-            "pitches": [
-              {
-                "position": 0,
-                "tags": []
-              },
-              {
-                "position": 3,
-                "tags": []
-              }
-            ]
-          }
-        ],
-        "sourceTermExactMatchCount": 1
+        ]
       },
       {
         "type": "term",
         "id": 9,
-        "source": "打ち込む",
-        "rawSource": "(打)(ち)(込)(む)",
-        "sourceTerm": "打ち込む",
-        "reasons": [],
-        "score": 10,
         "isPrimary": true,
         "sequence": 4,
-        "dictionary": "Test Dictionary 2",
-        "dictionaryOrder": {
-          "index": 0,
-          "priority": 0
-        },
-        "dictionaryNames": [
-          "Test Dictionary 2"
-        ],
-        "expression": "打ち込む",
-        "reading": "ぶちこむ",
-        "expressions": [
+        "inflections": [],
+        "score": 10,
+        "dictionaryIndex": 0,
+        "dictionaryPriority": 0,
+        "sourceTermExactMatchCount": 1,
+        "maxDeinflectedTextLength": 4,
+        "headwords": [
           {
-            "sourceTerm": "打ち込む",
-            "expression": "打ち込む",
+            "index": 0,
+            "term": "打ち込む",
             "reading": "ぶちこむ",
-            "termTags": [
+            "sources": [
+              {
+                "originalText": "(打)(ち)(込)(む)",
+                "transformedText": "打ち込む",
+                "deinflectedText": "打ち込む",
+                "isPrimary": true
+              }
+            ],
+            "tags": [
               {
                 "name": "tag3",
                 "category": "category3",
-                "notes": "tag3 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag3 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag4",
                 "category": "category4",
-                "notes": "tag4 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag4 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag5",
                 "category": "category5",
-                "notes": "tag5 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag5 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               }
+            ]
+          }
+        ],
+        "definitions": [
+          {
+            "index": 0,
+            "headwordIndices": [
+              0
             ],
-            "frequencies": [
+            "dictionary": "Test Dictionary 2",
+            "tags": [
               {
-                "index": 0,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打ち込む",
-                "reading": "ぶちこむ",
-                "hasReading": false,
-                "frequency": 3
+                "name": "tag1",
+                "category": "category1",
+                "order": 0,
+                "score": 0,
+                "content": [
+                  "tag1 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
+                "redundant": false
               },
               {
-                "index": 1,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打ち込む",
-                "reading": "ぶちこむ",
-                "hasReading": true,
-                "frequency": 9
+                "name": "tag2",
+                "category": "category2",
+                "order": 0,
+                "score": 0,
+                "content": [
+                  "tag2 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
+                "redundant": false
               }
             ],
-            "pitches": [
-              {
-                "index": 0,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打ち込む",
-                "reading": "ぶちこむ",
-                "pitches": [
-                  {
-                    "position": 0,
-                    "tags": []
-                  },
-                  {
-                    "position": 3,
-                    "tags": []
-                  }
-                ]
-              }
+            "entries": [
+              "definition17",
+              "definition18"
             ]
           }
         ],
-        "glossary": [
-          "definition17",
-          "definition18"
-        ],
-        "definitionTags": [
-          {
-            "name": "tag1",
-            "category": "category1",
-            "notes": "tag1 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
+        "pronunciations": [
           {
-            "name": "tag2",
-            "category": "category2",
-            "notes": "tag2 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          }
-        ],
-        "termTags": [
-          {
-            "name": "tag3",
-            "category": "category3",
-            "notes": "tag3 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag4",
-            "category": "category4",
-            "notes": "tag4 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag5",
-            "category": "category5",
-            "notes": "tag5 notes",
-            "order": 0,
-            "score": 0,
+            "index": 0,
+            "headwordIndex": 0,
             "dictionary": "Test Dictionary 2",
-            "redundant": false
+            "dictionaryIndex": 0,
+            "dictionaryPriority": 0,
+            "pitches": [
+              {
+                "position": 0,
+                "tags": []
+              },
+              {
+                "position": 3,
+                "tags": []
+              }
+            ]
           }
         ],
         "frequencies": [
           {
             "index": 0,
-            "expressionIndex": 0,
+            "headwordIndex": 0,
             "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "expression": "打ち込む",
-            "reading": "ぶちこむ",
+            "dictionaryIndex": 0,
+            "dictionaryPriority": 0,
             "hasReading": false,
             "frequency": 3
           },
           {
             "index": 1,
-            "expressionIndex": 0,
+            "headwordIndex": 0,
             "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "expression": "打ち込む",
-            "reading": "ぶちこむ",
+            "dictionaryIndex": 0,
+            "dictionaryPriority": 0,
             "hasReading": true,
             "frequency": 9
           }
-        ],
-        "pitches": [
-          {
-            "index": 0,
-            "expressionIndex": 0,
-            "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "expression": "打ち込む",
-            "reading": "ぶちこむ",
-            "pitches": [
-              {
-                "position": 0,
-                "tags": []
-              },
-              {
-                "position": 3,
-                "tags": []
-              }
-            ]
-          }
-        ],
-        "sourceTermExactMatchCount": 1
+        ]
       },
       {
         "type": "term",
         "id": 8,
-        "source": "打ち込む",
-        "rawSource": "(打)(ち)(込)(む)",
-        "sourceTerm": "打ち込む",
-        "reasons": [],
-        "score": 1,
         "isPrimary": true,
         "sequence": 4,
-        "dictionary": "Test Dictionary 2",
-        "dictionaryOrder": {
-          "index": 0,
-          "priority": 0
-        },
-        "dictionaryNames": [
-          "Test Dictionary 2"
-        ],
-        "expression": "打ち込む",
-        "reading": "うちこむ",
-        "expressions": [
+        "inflections": [],
+        "score": 1,
+        "dictionaryIndex": 0,
+        "dictionaryPriority": 0,
+        "sourceTermExactMatchCount": 1,
+        "maxDeinflectedTextLength": 4,
+        "headwords": [
           {
-            "sourceTerm": "打ち込む",
-            "expression": "打ち込む",
+            "index": 0,
+            "term": "打ち込む",
             "reading": "うちこむ",
-            "termTags": [
+            "sources": [
+              {
+                "originalText": "(打)(ち)(込)(む)",
+                "transformedText": "打ち込む",
+                "deinflectedText": "打ち込む",
+                "isPrimary": true
+              }
+            ],
+            "tags": [
               {
                 "name": "tag5",
                 "category": "category5",
-                "notes": "tag5 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag5 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag6",
                 "category": "default",
-                "notes": "",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag7",
                 "category": "default",
-                "notes": "",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               }
+            ]
+          }
+        ],
+        "definitions": [
+          {
+            "index": 0,
+            "headwordIndices": [
+              0
             ],
-            "frequencies": [
+            "dictionary": "Test Dictionary 2",
+            "tags": [
               {
-                "index": 0,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打ち込む",
-                "reading": "うちこむ",
-                "hasReading": false,
-                "frequency": 3
+                "name": "tag1",
+                "category": "category1",
+                "order": 0,
+                "score": 0,
+                "content": [
+                  "tag1 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
+                "redundant": false
               },
               {
-                "index": 1,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打ち込む",
-                "reading": "うちこむ",
-                "hasReading": true,
-                "frequency": 8
+                "name": "tag2",
+                "category": "category2",
+                "order": 0,
+                "score": 0,
+                "content": [
+                  "tag2 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
+                "redundant": false
               }
             ],
-            "pitches": [
-              {
-                "index": 0,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打ち込む",
-                "reading": "うちこむ",
-                "pitches": [
-                  {
-                    "position": 0,
-                    "tags": []
-                  },
-                  {
-                    "position": 3,
-                    "tags": []
-                  }
-                ]
-              }
+            "entries": [
+              "definition15",
+              "definition16"
             ]
           }
         ],
-        "glossary": [
-          "definition15",
-          "definition16"
-        ],
-        "definitionTags": [
-          {
-            "name": "tag1",
-            "category": "category1",
-            "notes": "tag1 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
+        "pronunciations": [
           {
-            "name": "tag2",
-            "category": "category2",
-            "notes": "tag2 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          }
-        ],
-        "termTags": [
-          {
-            "name": "tag5",
-            "category": "category5",
-            "notes": "tag5 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag6",
-            "category": "default",
-            "notes": "",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag7",
-            "category": "default",
-            "notes": "",
-            "order": 0,
-            "score": 0,
+            "index": 0,
+            "headwordIndex": 0,
             "dictionary": "Test Dictionary 2",
-            "redundant": false
+            "dictionaryIndex": 0,
+            "dictionaryPriority": 0,
+            "pitches": [
+              {
+                "position": 0,
+                "tags": []
+              },
+              {
+                "position": 3,
+                "tags": []
+              }
+            ]
           }
         ],
         "frequencies": [
           {
             "index": 0,
-            "expressionIndex": 0,
+            "headwordIndex": 0,
             "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "expression": "打ち込む",
-            "reading": "うちこむ",
+            "dictionaryIndex": 0,
+            "dictionaryPriority": 0,
             "hasReading": false,
             "frequency": 3
           },
           {
             "index": 1,
-            "expressionIndex": 0,
+            "headwordIndex": 0,
             "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "expression": "打ち込む",
-            "reading": "うちこむ",
+            "dictionaryIndex": 0,
+            "dictionaryPriority": 0,
             "hasReading": true,
             "frequency": 8
           }
-        ],
-        "pitches": [
-          {
-            "index": 0,
-            "expressionIndex": 0,
-            "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "expression": "打ち込む",
-            "reading": "うちこむ",
-            "pitches": [
-              {
-                "position": 0,
-                "tags": []
-              },
-              {
-                "position": 3,
-                "tags": []
-              }
-            ]
-          }
-        ],
-        "sourceTermExactMatchCount": 1
+        ]
       },
       {
         "type": "term",
         "id": 10,
-        "source": "打ち込む",
-        "rawSource": "(打)(ち)(込)(む)",
-        "sourceTerm": "打ち込む",
-        "reasons": [],
-        "score": 1,
         "isPrimary": true,
         "sequence": 4,
-        "dictionary": "Test Dictionary 2",
-        "dictionaryOrder": {
-          "index": 0,
-          "priority": 0
-        },
-        "dictionaryNames": [
-          "Test Dictionary 2"
-        ],
-        "expression": "打ち込む",
-        "reading": "ぶちこむ",
-        "expressions": [
+        "inflections": [],
+        "score": 1,
+        "dictionaryIndex": 0,
+        "dictionaryPriority": 0,
+        "sourceTermExactMatchCount": 1,
+        "maxDeinflectedTextLength": 4,
+        "headwords": [
           {
-            "sourceTerm": "打ち込む",
-            "expression": "打ち込む",
+            "index": 0,
+            "term": "打ち込む",
             "reading": "ぶちこむ",
-            "termTags": [
+            "sources": [
+              {
+                "originalText": "(打)(ち)(込)(む)",
+                "transformedText": "打ち込む",
+                "deinflectedText": "打ち込む",
+                "isPrimary": true
+              }
+            ],
+            "tags": [
               {
                 "name": "tag3",
                 "category": "category3",
-                "notes": "tag3 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag3 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag4",
                 "category": "category4",
-                "notes": "tag4 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag4 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag5",
                 "category": "category5",
-                "notes": "tag5 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag5 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               }
+            ]
+          }
+        ],
+        "definitions": [
+          {
+            "index": 0,
+            "headwordIndices": [
+              0
             ],
-            "frequencies": [
+            "dictionary": "Test Dictionary 2",
+            "tags": [
               {
-                "index": 0,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打ち込む",
-                "reading": "ぶちこむ",
-                "hasReading": false,
-                "frequency": 3
+                "name": "tag1",
+                "category": "category1",
+                "order": 0,
+                "score": 0,
+                "content": [
+                  "tag1 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
+                "redundant": false
               },
               {
-                "index": 1,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打ち込む",
-                "reading": "ぶちこむ",
-                "hasReading": true,
-                "frequency": 9
+                "name": "tag2",
+                "category": "category2",
+                "order": 0,
+                "score": 0,
+                "content": [
+                  "tag2 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
+                "redundant": false
               }
             ],
-            "pitches": [
-              {
-                "index": 0,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打ち込む",
-                "reading": "ぶちこむ",
-                "pitches": [
-                  {
-                    "position": 0,
-                    "tags": []
-                  },
-                  {
-                    "position": 3,
-                    "tags": []
-                  }
-                ]
-              }
+            "entries": [
+              "definition19",
+              "definition20"
             ]
           }
         ],
-        "glossary": [
-          "definition19",
-          "definition20"
-        ],
-        "definitionTags": [
-          {
-            "name": "tag1",
-            "category": "category1",
-            "notes": "tag1 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag2",
-            "category": "category2",
-            "notes": "tag2 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          }
-        ],
-        "termTags": [
+        "pronunciations": [
           {
-            "name": "tag3",
-            "category": "category3",
-            "notes": "tag3 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag4",
-            "category": "category4",
-            "notes": "tag4 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag5",
-            "category": "category5",
-            "notes": "tag5 notes",
-            "order": 0,
-            "score": 0,
+            "index": 0,
+            "headwordIndex": 0,
             "dictionary": "Test Dictionary 2",
-            "redundant": false
+            "dictionaryIndex": 0,
+            "dictionaryPriority": 0,
+            "pitches": [
+              {
+                "position": 0,
+                "tags": []
+              },
+              {
+                "position": 3,
+                "tags": []
+              }
+            ]
           }
         ],
         "frequencies": [
           {
             "index": 0,
-            "expressionIndex": 0,
+            "headwordIndex": 0,
             "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "expression": "打ち込む",
-            "reading": "ぶちこむ",
+            "dictionaryIndex": 0,
+            "dictionaryPriority": 0,
             "hasReading": false,
             "frequency": 3
           },
           {
             "index": 1,
-            "expressionIndex": 0,
+            "headwordIndex": 0,
             "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "expression": "打ち込む",
-            "reading": "ぶちこむ",
+            "dictionaryIndex": 0,
+            "dictionaryPriority": 0,
             "hasReading": true,
             "frequency": 9
           }
-        ],
-        "pitches": [
-          {
-            "index": 0,
-            "expressionIndex": 0,
-            "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "expression": "打ち込む",
-            "reading": "ぶちこむ",
-            "pitches": [
-              {
-                "position": 0,
-                "tags": []
-              },
-              {
-                "position": 3,
-                "tags": []
-              }
-            ]
-          }
-        ],
-        "sourceTermExactMatchCount": 1
+        ]
       },
       {
         "type": "term",
         "id": 3,
-        "source": "打ち",
-        "rawSource": "(打)(ち)",
-        "sourceTerm": "打つ",
-        "reasons": [
-          "masu stem"
-        ],
-        "score": 10,
         "isPrimary": true,
         "sequence": 3,
-        "dictionary": "Test Dictionary 2",
-        "dictionaryOrder": {
-          "index": 0,
-          "priority": 0
-        },
-        "dictionaryNames": [
-          "Test Dictionary 2"
+        "inflections": [
+          "masu stem"
         ],
-        "expression": "打つ",
-        "reading": "うつ",
-        "expressions": [
+        "score": 10,
+        "dictionaryIndex": 0,
+        "dictionaryPriority": 0,
+        "sourceTermExactMatchCount": 1,
+        "maxDeinflectedTextLength": 2,
+        "headwords": [
           {
-            "sourceTerm": "打つ",
-            "expression": "打つ",
+            "index": 0,
+            "term": "打つ",
             "reading": "うつ",
-            "termTags": [
+            "sources": [
+              {
+                "originalText": "(打)(ち)",
+                "transformedText": "打ち",
+                "deinflectedText": "打つ",
+                "isPrimary": true
+              }
+            ],
+            "tags": [
               {
                 "name": "tag3",
                 "category": "category3",
-                "notes": "tag3 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag3 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag4",
                 "category": "category4",
-                "notes": "tag4 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag4 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag5",
                 "category": "category5",
-                "notes": "tag5 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag5 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               }
+            ]
+          }
+        ],
+        "definitions": [
+          {
+            "index": 0,
+            "headwordIndices": [
+              0
             ],
-            "frequencies": [
+            "dictionary": "Test Dictionary 2",
+            "tags": [
               {
-                "index": 0,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打つ",
-                "reading": "うつ",
-                "hasReading": false,
-                "frequency": 2
+                "name": "tag1",
+                "category": "category1",
+                "order": 0,
+                "score": 0,
+                "content": [
+                  "tag1 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
+                "redundant": false
               },
               {
-                "index": 1,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打つ",
-                "reading": "うつ",
-                "hasReading": true,
-                "frequency": 6
+                "name": "tag2",
+                "category": "category2",
+                "order": 0,
+                "score": 0,
+                "content": [
+                  "tag2 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
+                "redundant": false
               }
             ],
-            "pitches": []
-          }
-        ],
-        "glossary": [
-          "definition5",
-          "definition6"
-        ],
-        "definitionTags": [
-          {
-            "name": "tag1",
-            "category": "category1",
-            "notes": "tag1 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag2",
-            "category": "category2",
-            "notes": "tag2 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          }
-        ],
-        "termTags": [
-          {
-            "name": "tag3",
-            "category": "category3",
-            "notes": "tag3 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag4",
-            "category": "category4",
-            "notes": "tag4 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag5",
-            "category": "category5",
-            "notes": "tag5 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
+            "entries": [
+              "definition5",
+              "definition6"
+            ]
           }
         ],
+        "pronunciations": [],
         "frequencies": [
           {
             "index": 0,
-            "expressionIndex": 0,
+            "headwordIndex": 0,
             "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "expression": "打つ",
-            "reading": "うつ",
+            "dictionaryIndex": 0,
+            "dictionaryPriority": 0,
             "hasReading": false,
             "frequency": 2
           },
           {
             "index": 1,
-            "expressionIndex": 0,
+            "headwordIndex": 0,
             "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "expression": "打つ",
-            "reading": "うつ",
+            "dictionaryIndex": 0,
+            "dictionaryPriority": 0,
             "hasReading": true,
             "frequency": 6
           }
-        ],
-        "pitches": [],
-        "sourceTermExactMatchCount": 1
+        ]
       },
       {
         "type": "term",
         "id": 5,
-        "source": "打ち",
-        "rawSource": "(打)(ち)",
-        "sourceTerm": "打つ",
-        "reasons": [
-          "masu stem"
-        ],
-        "score": 10,
         "isPrimary": true,
         "sequence": 3,
-        "dictionary": "Test Dictionary 2",
-        "dictionaryOrder": {
-          "index": 0,
-          "priority": 0
-        },
-        "dictionaryNames": [
-          "Test Dictionary 2"
+        "inflections": [
+          "masu stem"
         ],
-        "expression": "打つ",
-        "reading": "ぶつ",
-        "expressions": [
+        "score": 10,
+        "dictionaryIndex": 0,
+        "dictionaryPriority": 0,
+        "sourceTermExactMatchCount": 1,
+        "maxDeinflectedTextLength": 2,
+        "headwords": [
           {
-            "sourceTerm": "打つ",
-            "expression": "打つ",
+            "index": 0,
+            "term": "打つ",
             "reading": "ぶつ",
-            "termTags": [
+            "sources": [
+              {
+                "originalText": "(打)(ち)",
+                "transformedText": "打ち",
+                "deinflectedText": "打つ",
+                "isPrimary": true
+              }
+            ],
+            "tags": [
               {
                 "name": "tag3",
                 "category": "category3",
-                "notes": "tag3 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag3 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag4",
                 "category": "category4",
-                "notes": "tag4 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag4 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag5",
                 "category": "category5",
-                "notes": "tag5 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag5 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               }
+            ]
+          }
+        ],
+        "definitions": [
+          {
+            "index": 0,
+            "headwordIndices": [
+              0
             ],
-            "frequencies": [
+            "dictionary": "Test Dictionary 2",
+            "tags": [
               {
-                "index": 0,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打つ",
-                "reading": "ぶつ",
-                "hasReading": false,
-                "frequency": 2
+                "name": "tag1",
+                "category": "category1",
+                "order": 0,
+                "score": 0,
+                "content": [
+                  "tag1 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
+                "redundant": false
               },
               {
-                "index": 1,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打つ",
-                "reading": "ぶつ",
-                "hasReading": true,
-                "frequency": 7
+                "name": "tag2",
+                "category": "category2",
+                "order": 0,
+                "score": 0,
+                "content": [
+                  "tag2 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
+                "redundant": false
               }
             ],
-            "pitches": []
-          }
-        ],
-        "glossary": [
-          "definition9",
-          "definition10"
-        ],
-        "definitionTags": [
-          {
-            "name": "tag1",
-            "category": "category1",
-            "notes": "tag1 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag2",
-            "category": "category2",
-            "notes": "tag2 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          }
-        ],
-        "termTags": [
-          {
-            "name": "tag3",
-            "category": "category3",
-            "notes": "tag3 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag4",
-            "category": "category4",
-            "notes": "tag4 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag5",
-            "category": "category5",
-            "notes": "tag5 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
+            "entries": [
+              "definition9",
+              "definition10"
+            ]
           }
         ],
+        "pronunciations": [],
         "frequencies": [
           {
             "index": 0,
-            "expressionIndex": 0,
+            "headwordIndex": 0,
             "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "expression": "打つ",
-            "reading": "ぶつ",
+            "dictionaryIndex": 0,
+            "dictionaryPriority": 0,
             "hasReading": false,
             "frequency": 2
           },
           {
             "index": 1,
-            "expressionIndex": 0,
+            "headwordIndex": 0,
             "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "expression": "打つ",
-            "reading": "ぶつ",
+            "dictionaryIndex": 0,
+            "dictionaryPriority": 0,
             "hasReading": true,
             "frequency": 7
           }
-        ],
-        "pitches": [],
-        "sourceTermExactMatchCount": 1
+        ]
       },
       {
         "type": "term",
         "id": 4,
-        "source": "打ち",
-        "rawSource": "(打)(ち)",
-        "sourceTerm": "打つ",
-        "reasons": [
-          "masu stem"
-        ],
-        "score": 1,
         "isPrimary": true,
         "sequence": 3,
-        "dictionary": "Test Dictionary 2",
-        "dictionaryOrder": {
-          "index": 0,
-          "priority": 0
-        },
-        "dictionaryNames": [
-          "Test Dictionary 2"
+        "inflections": [
+          "masu stem"
         ],
-        "expression": "打つ",
-        "reading": "うつ",
-        "expressions": [
+        "score": 1,
+        "dictionaryIndex": 0,
+        "dictionaryPriority": 0,
+        "sourceTermExactMatchCount": 1,
+        "maxDeinflectedTextLength": 2,
+        "headwords": [
           {
-            "sourceTerm": "打つ",
-            "expression": "打つ",
+            "index": 0,
+            "term": "打つ",
             "reading": "うつ",
-            "termTags": [
+            "sources": [
+              {
+                "originalText": "(打)(ち)",
+                "transformedText": "打ち",
+                "deinflectedText": "打つ",
+                "isPrimary": true
+              }
+            ],
+            "tags": [
               {
                 "name": "tag3",
                 "category": "category3",
-                "notes": "tag3 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag3 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag4",
                 "category": "category4",
-                "notes": "tag4 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag4 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag5",
                 "category": "category5",
-                "notes": "tag5 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag5 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               }
+            ]
+          }
+        ],
+        "definitions": [
+          {
+            "index": 0,
+            "headwordIndices": [
+              0
             ],
-            "frequencies": [
+            "dictionary": "Test Dictionary 2",
+            "tags": [
               {
-                "index": 0,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打つ",
-                "reading": "うつ",
-                "hasReading": false,
-                "frequency": 2
+                "name": "tag1",
+                "category": "category1",
+                "order": 0,
+                "score": 0,
+                "content": [
+                  "tag1 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
+                "redundant": false
               },
               {
-                "index": 1,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打つ",
-                "reading": "うつ",
-                "hasReading": true,
-                "frequency": 6
+                "name": "tag2",
+                "category": "category2",
+                "order": 0,
+                "score": 0,
+                "content": [
+                  "tag2 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
+                "redundant": false
               }
             ],
-            "pitches": []
-          }
-        ],
-        "glossary": [
-          "definition7",
-          "definition8"
-        ],
-        "definitionTags": [
-          {
-            "name": "tag1",
-            "category": "category1",
-            "notes": "tag1 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag2",
-            "category": "category2",
-            "notes": "tag2 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          }
-        ],
-        "termTags": [
-          {
-            "name": "tag3",
-            "category": "category3",
-            "notes": "tag3 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag4",
-            "category": "category4",
-            "notes": "tag4 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag5",
-            "category": "category5",
-            "notes": "tag5 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
+            "entries": [
+              "definition7",
+              "definition8"
+            ]
           }
         ],
+        "pronunciations": [],
         "frequencies": [
           {
             "index": 0,
-            "expressionIndex": 0,
+            "headwordIndex": 0,
             "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "expression": "打つ",
-            "reading": "うつ",
+            "dictionaryIndex": 0,
+            "dictionaryPriority": 0,
             "hasReading": false,
             "frequency": 2
           },
           {
             "index": 1,
-            "expressionIndex": 0,
+            "headwordIndex": 0,
             "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "expression": "打つ",
-            "reading": "うつ",
+            "dictionaryIndex": 0,
+            "dictionaryPriority": 0,
             "hasReading": true,
             "frequency": 6
           }
-        ],
-        "pitches": [],
-        "sourceTermExactMatchCount": 1
+        ]
       },
       {
         "type": "term",
         "id": 6,
-        "source": "打ち",
-        "rawSource": "(打)(ち)",
-        "sourceTerm": "打つ",
-        "reasons": [
-          "masu stem"
-        ],
-        "score": 1,
         "isPrimary": true,
         "sequence": 3,
-        "dictionary": "Test Dictionary 2",
-        "dictionaryOrder": {
-          "index": 0,
-          "priority": 0
-        },
-        "dictionaryNames": [
-          "Test Dictionary 2"
+        "inflections": [
+          "masu stem"
         ],
-        "expression": "打つ",
-        "reading": "ぶつ",
-        "expressions": [
+        "score": 1,
+        "dictionaryIndex": 0,
+        "dictionaryPriority": 0,
+        "sourceTermExactMatchCount": 1,
+        "maxDeinflectedTextLength": 2,
+        "headwords": [
           {
-            "sourceTerm": "打つ",
-            "expression": "打つ",
+            "index": 0,
+            "term": "打つ",
             "reading": "ぶつ",
-            "termTags": [
+            "sources": [
+              {
+                "originalText": "(打)(ち)",
+                "transformedText": "打ち",
+                "deinflectedText": "打つ",
+                "isPrimary": true
+              }
+            ],
+            "tags": [
               {
                 "name": "tag3",
                 "category": "category3",
-                "notes": "tag3 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag3 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag4",
                 "category": "category4",
-                "notes": "tag4 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag4 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag5",
                 "category": "category5",
-                "notes": "tag5 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag5 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               }
+            ]
+          }
+        ],
+        "definitions": [
+          {
+            "index": 0,
+            "headwordIndices": [
+              0
             ],
-            "frequencies": [
+            "dictionary": "Test Dictionary 2",
+            "tags": [
               {
-                "index": 0,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打つ",
-                "reading": "ぶつ",
-                "hasReading": false,
-                "frequency": 2
+                "name": "tag1",
+                "category": "category1",
+                "order": 0,
+                "score": 0,
+                "content": [
+                  "tag1 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
+                "redundant": false
               },
               {
-                "index": 1,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打つ",
-                "reading": "ぶつ",
-                "hasReading": true,
-                "frequency": 7
+                "name": "tag2",
+                "category": "category2",
+                "order": 0,
+                "score": 0,
+                "content": [
+                  "tag2 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
+                "redundant": false
               }
             ],
-            "pitches": []
-          }
-        ],
-        "glossary": [
-          "definition11",
-          "definition12"
-        ],
-        "definitionTags": [
-          {
-            "name": "tag1",
-            "category": "category1",
-            "notes": "tag1 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag2",
-            "category": "category2",
-            "notes": "tag2 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          }
-        ],
-        "termTags": [
-          {
-            "name": "tag3",
-            "category": "category3",
-            "notes": "tag3 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag4",
-            "category": "category4",
-            "notes": "tag4 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag5",
-            "category": "category5",
-            "notes": "tag5 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
+            "entries": [
+              "definition11",
+              "definition12"
+            ]
           }
         ],
+        "pronunciations": [],
         "frequencies": [
           {
             "index": 0,
-            "expressionIndex": 0,
+            "headwordIndex": 0,
             "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "expression": "打つ",
-            "reading": "ぶつ",
+            "dictionaryIndex": 0,
+            "dictionaryPriority": 0,
             "hasReading": false,
             "frequency": 2
           },
           {
             "index": 1,
-            "expressionIndex": 0,
+            "headwordIndex": 0,
             "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "expression": "打つ",
-            "reading": "ぶつ",
+            "dictionaryIndex": 0,
+            "dictionaryPriority": 0,
             "hasReading": true,
             "frequency": 7
           }
-        ],
-        "pitches": [],
-        "sourceTermExactMatchCount": 1
+        ]
       },
       {
         "type": "term",
         "id": 1,
-        "source": "打",
-        "rawSource": "(打)",
-        "sourceTerm": "打",
-        "reasons": [],
-        "score": 1,
         "isPrimary": true,
         "sequence": 1,
-        "dictionary": "Test Dictionary 2",
-        "dictionaryOrder": {
-          "index": 0,
-          "priority": 0
-        },
-        "dictionaryNames": [
-          "Test Dictionary 2"
-        ],
-        "expression": "打",
-        "reading": "だ",
-        "expressions": [
+        "inflections": [],
+        "score": 1,
+        "dictionaryIndex": 0,
+        "dictionaryPriority": 0,
+        "sourceTermExactMatchCount": 1,
+        "maxDeinflectedTextLength": 1,
+        "headwords": [
           {
-            "sourceTerm": "打",
-            "expression": "打",
+            "index": 0,
+            "term": "打",
             "reading": "だ",
-            "termTags": [
+            "sources": [
+              {
+                "originalText": "(打)",
+                "transformedText": "打",
+                "deinflectedText": "打",
+                "isPrimary": true
+              }
+            ],
+            "tags": [
               {
                 "name": "tag3",
                 "category": "category3",
-                "notes": "tag3 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag3 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag4",
                 "category": "category4",
-                "notes": "tag4 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag4 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag5",
                 "category": "category5",
-                "notes": "tag5 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag5 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               }
+            ]
+          }
+        ],
+        "definitions": [
+          {
+            "index": 0,
+            "headwordIndices": [
+              0
             ],
-            "frequencies": [
+            "dictionary": "Test Dictionary 2",
+            "tags": [
               {
-                "index": 0,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打",
-                "reading": "だ",
-                "hasReading": false,
-                "frequency": 1
+                "name": "tag1",
+                "category": "category1",
+                "order": 0,
+                "score": 0,
+                "content": [
+                  "tag1 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
+                "redundant": false
               },
               {
-                "index": 1,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打",
-                "reading": "だ",
-                "hasReading": true,
-                "frequency": 4
+                "name": "tag2",
+                "category": "category2",
+                "order": 0,
+                "score": 0,
+                "content": [
+                  "tag2 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
+                "redundant": false
               }
             ],
-            "pitches": []
-          }
-        ],
-        "glossary": [
-          "definition1",
-          "definition2"
-        ],
-        "definitionTags": [
-          {
-            "name": "tag1",
-            "category": "category1",
-            "notes": "tag1 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag2",
-            "category": "category2",
-            "notes": "tag2 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          }
-        ],
-        "termTags": [
-          {
-            "name": "tag3",
-            "category": "category3",
-            "notes": "tag3 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag4",
-            "category": "category4",
-            "notes": "tag4 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag5",
-            "category": "category5",
-            "notes": "tag5 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
+            "entries": [
+              "definition1",
+              "definition2"
+            ]
           }
         ],
+        "pronunciations": [],
         "frequencies": [
           {
             "index": 0,
-            "expressionIndex": 0,
+            "headwordIndex": 0,
             "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "expression": "打",
-            "reading": "だ",
+            "dictionaryIndex": 0,
+            "dictionaryPriority": 0,
             "hasReading": false,
             "frequency": 1
           },
           {
             "index": 1,
-            "expressionIndex": 0,
+            "headwordIndex": 0,
             "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "expression": "打",
-            "reading": "だ",
+            "dictionaryIndex": 0,
+            "dictionaryPriority": 0,
             "hasReading": true,
             "frequency": 4
           }
-        ],
-        "pitches": [],
-        "sourceTermExactMatchCount": 1
+        ]
       },
       {
         "type": "term",
         "id": 2,
-        "source": "打",
-        "rawSource": "(打)",
-        "sourceTerm": "打",
-        "reasons": [],
-        "score": 1,
         "isPrimary": true,
         "sequence": 2,
-        "dictionary": "Test Dictionary 2",
-        "dictionaryOrder": {
-          "index": 0,
-          "priority": 0
-        },
-        "dictionaryNames": [
-          "Test Dictionary 2"
-        ],
-        "expression": "打",
-        "reading": "ダース",
-        "expressions": [
+        "inflections": [],
+        "score": 1,
+        "dictionaryIndex": 0,
+        "dictionaryPriority": 0,
+        "sourceTermExactMatchCount": 1,
+        "maxDeinflectedTextLength": 1,
+        "headwords": [
           {
-            "sourceTerm": "打",
-            "expression": "打",
+            "index": 0,
+            "term": "打",
             "reading": "ダース",
-            "termTags": [
+            "sources": [
+              {
+                "originalText": "(打)",
+                "transformedText": "打",
+                "deinflectedText": "打",
+                "isPrimary": true
+              }
+            ],
+            "tags": [
               {
                 "name": "tag3",
                 "category": "category3",
-                "notes": "tag3 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag3 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag4",
                 "category": "category4",
-                "notes": "tag4 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag4 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag5",
                 "category": "category5",
-                "notes": "tag5 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag5 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               }
+            ]
+          }
+        ],
+        "definitions": [
+          {
+            "index": 0,
+            "headwordIndices": [
+              0
             ],
-            "frequencies": [
+            "dictionary": "Test Dictionary 2",
+            "tags": [
               {
-                "index": 0,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打",
-                "reading": "ダース",
-                "hasReading": false,
-                "frequency": 1
+                "name": "tag1",
+                "category": "category1",
+                "order": 0,
+                "score": 0,
+                "content": [
+                  "tag1 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
+                "redundant": false
               },
               {
-                "index": 1,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打",
-                "reading": "ダース",
-                "hasReading": true,
-                "frequency": 5
+                "name": "tag2",
+                "category": "category2",
+                "order": 0,
+                "score": 0,
+                "content": [
+                  "tag2 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
+                "redundant": false
               }
             ],
-            "pitches": []
-          }
-        ],
-        "glossary": [
-          "definition3",
-          "definition4"
-        ],
-        "definitionTags": [
-          {
-            "name": "tag1",
-            "category": "category1",
-            "notes": "tag1 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag2",
-            "category": "category2",
-            "notes": "tag2 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          }
-        ],
-        "termTags": [
-          {
-            "name": "tag3",
-            "category": "category3",
-            "notes": "tag3 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag4",
-            "category": "category4",
-            "notes": "tag4 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
-          },
-          {
-            "name": "tag5",
-            "category": "category5",
-            "notes": "tag5 notes",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
+            "entries": [
+              "definition3",
+              "definition4"
+            ]
           }
         ],
+        "pronunciations": [],
         "frequencies": [
           {
             "index": 0,
-            "expressionIndex": 0,
+            "headwordIndex": 0,
             "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "expression": "打",
-            "reading": "ダース",
+            "dictionaryIndex": 0,
+            "dictionaryPriority": 0,
             "hasReading": false,
             "frequency": 1
           },
           {
             "index": 1,
-            "expressionIndex": 0,
+            "headwordIndex": 0,
             "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "expression": "打",
-            "reading": "ダース",
+            "dictionaryIndex": 0,
+            "dictionaryPriority": 0,
             "hasReading": true,
             "frequency": 5
           }
-        ],
-        "pitches": [],
-        "sourceTermExactMatchCount": 1
+        ]
       }
     ]
   },
   {
     "name": "Test non-empty replacement",
-    "length": 4,
-    "definitions": [
+    "originalTextLength": 4,
+    "dictionaryEntries": [
       {
         "type": "term",
         "id": 12,
-        "source": "よみ",
-        "rawSource": "test",
-        "sourceTerm": "よむ",
-        "reasons": [
-          "masu stem"
-        ],
-        "score": 100,
         "isPrimary": true,
         "sequence": 6,
-        "dictionary": "Test Dictionary 2",
-        "dictionaryOrder": {
-          "index": 0,
-          "priority": 0
-        },
-        "dictionaryNames": [
-          "Test Dictionary 2"
+        "inflections": [
+          "masu stem"
         ],
-        "expression": "読む",
-        "reading": "よむ",
-        "expressions": [
+        "score": 100,
+        "dictionaryIndex": 0,
+        "dictionaryPriority": 0,
+        "sourceTermExactMatchCount": 0,
+        "maxDeinflectedTextLength": 2,
+        "headwords": [
           {
-            "sourceTerm": "よむ",
-            "expression": "読む",
+            "index": 0,
+            "term": "読む",
             "reading": "よむ",
-            "termTags": [
+            "sources": [
+              {
+                "originalText": "test",
+                "transformedText": "よみ",
+                "deinflectedText": "よむ",
+                "isPrimary": true
+              }
+            ],
+            "tags": [
               {
                 "name": "vt",
                 "category": "partOfSpeech",
-                "notes": "transitive verb",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "transitive verb"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               }
-            ],
-            "frequencies": [],
-            "pitches": []
-          }
-        ],
-        "glossary": [
-          "to read"
-        ],
-        "definitionTags": [
-          {
-            "name": "popular",
-            "category": "popular",
-            "notes": "popular term",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
+            ]
           }
         ],
-        "termTags": [
+        "definitions": [
           {
-            "name": "vt",
-            "category": "partOfSpeech",
-            "notes": "transitive verb",
-            "order": 0,
-            "score": 0,
+            "index": 0,
+            "headwordIndices": [
+              0
+            ],
             "dictionary": "Test Dictionary 2",
-            "redundant": false
+            "tags": [
+              {
+                "name": "popular",
+                "category": "popular",
+                "order": 0,
+                "score": 0,
+                "content": [
+                  "popular term"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
+                "redundant": false
+              }
+            ],
+            "entries": [
+              "to read"
+            ]
           }
         ],
-        "frequencies": [],
-        "pitches": [],
-        "sourceTermExactMatchCount": 0
+        "pronunciations": [],
+        "frequencies": []
       }
     ]
   },
   {
     "name": "Test non-empty replacement at end",
-    "length": 5,
-    "definitions": [
+    "originalTextLength": 5,
+    "dictionaryEntries": [
       {
         "type": "term",
         "id": 13,
-        "source": "つよみ",
-        "rawSource": "つtest",
-        "sourceTerm": "つよみ",
-        "reasons": [],
-        "score": 90,
         "isPrimary": true,
         "sequence": 7,
-        "dictionary": "Test Dictionary 2",
-        "dictionaryOrder": {
-          "index": 0,
-          "priority": 0
-        },
-        "dictionaryNames": [
-          "Test Dictionary 2"
-        ],
-        "expression": "強み",
-        "reading": "つよみ",
-        "expressions": [
+        "inflections": [],
+        "score": 90,
+        "dictionaryIndex": 0,
+        "dictionaryPriority": 0,
+        "sourceTermExactMatchCount": 0,
+        "maxDeinflectedTextLength": 3,
+        "headwords": [
           {
-            "sourceTerm": "つよみ",
-            "expression": "強み",
+            "index": 0,
+            "term": "強み",
             "reading": "つよみ",
-            "termTags": [],
-            "frequencies": [],
-            "pitches": []
+            "sources": [
+              {
+                "originalText": "つtest",
+                "transformedText": "つよみ",
+                "deinflectedText": "つよみ",
+                "isPrimary": true
+              }
+            ],
+            "tags": []
           }
         ],
-        "glossary": [
-          "strong point"
-        ],
-        "definitionTags": [
+        "definitions": [
           {
-            "name": "popular",
-            "category": "popular",
-            "notes": "popular term",
-            "order": 0,
-            "score": 0,
+            "index": 0,
+            "headwordIndices": [
+              0
+            ],
             "dictionary": "Test Dictionary 2",
-            "redundant": false
+            "tags": [
+              {
+                "name": "popular",
+                "category": "popular",
+                "order": 0,
+                "score": 0,
+                "content": [
+                  "popular term"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
+                "redundant": false
+              }
+            ],
+            "entries": [
+              "strong point"
+            ]
           }
         ],
-        "termTags": [],
-        "frequencies": [],
-        "pitches": [],
-        "sourceTermExactMatchCount": 0
+        "pronunciations": [],
+        "frequencies": []
       }
     ]
   },
   {
     "name": "Test non-empty replacement at start",
-    "length": 7,
-    "definitions": [
+    "originalTextLength": 7,
+    "dictionaryEntries": [
       {
         "type": "term",
         "id": 12,
-        "source": "よみました",
-        "rawSource": "testました",
-        "sourceTerm": "よむ",
-        "reasons": [
-          "polite past"
-        ],
-        "score": 100,
         "isPrimary": true,
         "sequence": 6,
-        "dictionary": "Test Dictionary 2",
-        "dictionaryOrder": {
-          "index": 0,
-          "priority": 0
-        },
-        "dictionaryNames": [
-          "Test Dictionary 2"
+        "inflections": [
+          "polite past"
         ],
-        "expression": "読む",
-        "reading": "よむ",
-        "expressions": [
+        "score": 100,
+        "dictionaryIndex": 0,
+        "dictionaryPriority": 0,
+        "sourceTermExactMatchCount": 0,
+        "maxDeinflectedTextLength": 2,
+        "headwords": [
           {
-            "sourceTerm": "よむ",
-            "expression": "読む",
+            "index": 0,
+            "term": "読む",
             "reading": "よむ",
-            "termTags": [
+            "sources": [
+              {
+                "originalText": "testました",
+                "transformedText": "よみました",
+                "deinflectedText": "よむ",
+                "isPrimary": true
+              }
+            ],
+            "tags": [
               {
                 "name": "vt",
                 "category": "partOfSpeech",
-                "notes": "transitive verb",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "transitive verb"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               }
-            ],
-            "frequencies": [],
-            "pitches": []
-          }
-        ],
-        "glossary": [
-          "to read"
-        ],
-        "definitionTags": [
-          {
-            "name": "popular",
-            "category": "popular",
-            "notes": "popular term",
-            "order": 0,
-            "score": 0,
-            "dictionary": "Test Dictionary 2",
-            "redundant": false
+            ]
           }
         ],
-        "termTags": [
+        "definitions": [
           {
-            "name": "vt",
-            "category": "partOfSpeech",
-            "notes": "transitive verb",
-            "order": 0,
-            "score": 0,
+            "index": 0,
+            "headwordIndices": [
+              0
+            ],
             "dictionary": "Test Dictionary 2",
-            "redundant": false
+            "tags": [
+              {
+                "name": "popular",
+                "category": "popular",
+                "order": 0,
+                "score": 0,
+                "content": [
+                  "popular term"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
+                "redundant": false
+              }
+            ],
+            "entries": [
+              "to read"
+            ]
           }
         ],
-        "frequencies": [],
-        "pitches": [],
-        "sourceTermExactMatchCount": 0
+        "pronunciations": [],
+        "frequencies": []
       }
     ]
   },
   {
     "name": "Search merged mode with non-primary definitions",
-    "length": 4,
-    "definitions": [
+    "originalTextLength": 4,
+    "dictionaryEntries": [
       {
-        "type": "termMerged",
-        "source": "うちこむ",
-        "rawSource": "うちこむ",
-        "reasons": [],
+        "type": "term",
+        "id": -1,
+        "isPrimary": true,
+        "sequence": -1,
+        "inflections": [],
         "score": 10,
-        "dictionary": "Test Dictionary 2",
-        "dictionaryOrder": {
-          "index": 0,
-          "priority": 0
-        },
-        "dictionaryNames": [
-          "Test Dictionary 2"
-        ],
-        "expression": [
-          "打ち込む"
-        ],
-        "reading": [
-          "うちこむ",
-          "ぶちこむ"
-        ],
-        "expressions": [
+        "dictionaryIndex": 0,
+        "dictionaryPriority": 0,
+        "sourceTermExactMatchCount": 0,
+        "maxDeinflectedTextLength": 4,
+        "headwords": [
           {
-            "sourceTerm": "うちこむ",
-            "expression": "打ち込む",
+            "index": 0,
+            "term": "打ち込む",
             "reading": "うちこむ",
-            "termTags": [
+            "sources": [
+              {
+                "originalText": "うちこむ",
+                "transformedText": "うちこむ",
+                "deinflectedText": "うちこむ",
+                "isPrimary": true
+              }
+            ],
+            "tags": [
               {
                 "name": "tag3",
                 "category": "category3",
-                "notes": "tag3 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag3 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag4",
                 "category": "category4",
-                "notes": "tag4 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag4 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag5",
                 "category": "category5",
-                "notes": "tag5 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag5 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag6",
                 "category": "default",
-                "notes": "",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag7",
                 "category": "default",
-                "notes": "",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               }
-            ],
-            "frequencies": [
-              {
-                "index": 0,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打ち込む",
-                "reading": "うちこむ",
-                "hasReading": false,
-                "frequency": 3
-              },
-              {
-                "index": 1,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打ち込む",
-                "reading": "うちこむ",
-                "hasReading": true,
-                "frequency": 8
-              }
-            ],
-            "pitches": [
-              {
-                "index": 0,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打ち込む",
-                "reading": "うちこむ",
-                "pitches": [
-                  {
-                    "position": 0,
-                    "tags": []
-                  },
-                  {
-                    "position": 3,
-                    "tags": []
-                  }
-                ]
-              }
             ]
           },
           {
-            "sourceTerm": "うちこむ",
-            "expression": "打ち込む",
+            "index": 1,
+            "term": "打ち込む",
             "reading": "ぶちこむ",
-            "termTags": [
+            "sources": [
+              {
+                "originalText": "打ち込む",
+                "transformedText": "打ち込む",
+                "deinflectedText": "打ち込む",
+                "isPrimary": false
+              }
+            ],
+            "tags": [
               {
                 "name": "tag3",
                 "category": "category3",
-                "notes": "tag3 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag3 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag4",
                 "category": "category4",
-                "notes": "tag4 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag4 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag5",
                 "category": "category5",
-                "notes": "tag5 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag5 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               }
-            ],
-            "frequencies": [
-              {
-                "index": 0,
-                "expressionIndex": 1,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打ち込む",
-                "reading": "ぶちこむ",
-                "hasReading": false,
-                "frequency": 3
-              },
-              {
-                "index": 1,
-                "expressionIndex": 1,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打ち込む",
-                "reading": "ぶちこむ",
-                "hasReading": true,
-                "frequency": 9
-              }
-            ],
-            "pitches": [
-              {
-                "index": 0,
-                "expressionIndex": 1,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打ち込む",
-                "reading": "ぶちこむ",
-                "pitches": [
-                  {
-                    "position": 0,
-                    "tags": []
-                  },
-                  {
-                    "position": 3,
-                    "tags": []
-                  }
-                ]
-              }
             ]
           }
         ],
         "definitions": [
           {
-            "type": "termMergedByGlossary",
-            "source": "うちこむ",
-            "rawSource": "うちこむ",
-            "reasons": [],
-            "score": 10,
-            "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "dictionaryNames": [
-              "Test Dictionary 2"
-            ],
-            "expression": [
-              "打ち込む"
-            ],
-            "reading": [
-              "うちこむ"
-            ],
-            "expressions": [
-              {
-                "sourceTerm": "うちこむ",
-                "expression": "打ち込む",
-                "reading": "うちこむ",
-                "termTags": [
-                  {
-                    "name": "tag3",
-                    "category": "category3",
-                    "notes": "tag3 notes",
-                    "order": 0,
-                    "score": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "redundant": false
-                  },
-                  {
-                    "name": "tag4",
-                    "category": "category4",
-                    "notes": "tag4 notes",
-                    "order": 0,
-                    "score": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "redundant": false
-                  },
-                  {
-                    "name": "tag5",
-                    "category": "category5",
-                    "notes": "tag5 notes",
-                    "order": 0,
-                    "score": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "redundant": false
-                  }
-                ],
-                "frequencies": [
-                  {
-                    "index": 0,
-                    "expressionIndex": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "dictionaryOrder": {
-                      "index": 0,
-                      "priority": 0
-                    },
-                    "expression": "打ち込む",
-                    "reading": "うちこむ",
-                    "hasReading": false,
-                    "frequency": 3
-                  },
-                  {
-                    "index": 1,
-                    "expressionIndex": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "dictionaryOrder": {
-                      "index": 0,
-                      "priority": 0
-                    },
-                    "expression": "打ち込む",
-                    "reading": "うちこむ",
-                    "hasReading": true,
-                    "frequency": 8
-                  }
-                ],
-                "pitches": [
-                  {
-                    "index": 0,
-                    "expressionIndex": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "dictionaryOrder": {
-                      "index": 0,
-                      "priority": 0
-                    },
-                    "expression": "打ち込む",
-                    "reading": "うちこむ",
-                    "pitches": [
-                      {
-                        "position": 0,
-                        "tags": []
-                      },
-                      {
-                        "position": 3,
-                        "tags": []
-                      }
-                    ]
-                  }
-                ]
-              }
-            ],
-            "glossary": [
-              "definition13",
-              "definition14"
+            "index": 0,
+            "headwordIndices": [
+              0
             ],
-            "definitionTags": [
+            "dictionary": "Test Dictionary 2",
+            "tags": [
               {
                 "name": "tag1",
                 "category": "category1",
-                "notes": "tag1 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag1 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag2",
                 "category": "category2",
-                "notes": "tag2 notes",
-                "order": 0,
-                "score": 0,
-                "dictionary": "Test Dictionary 2",
-                "redundant": false
-              }
-            ],
-            "definitions": [
-              {
-                "type": "term",
-                "id": 7,
-                "source": "うちこむ",
-                "rawSource": "うちこむ",
-                "sourceTerm": "うちこむ",
-                "reasons": [],
-                "score": 10,
-                "isPrimary": true,
-                "sequence": 4,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "dictionaryNames": [
-                  "Test Dictionary 2"
-                ],
-                "expression": "打ち込む",
-                "reading": "うちこむ",
-                "expressions": [
-                  {
-                    "sourceTerm": "うちこむ",
-                    "expression": "打ち込む",
-                    "reading": "うちこむ",
-                    "termTags": [
-                      {
-                        "name": "tag3",
-                        "category": "category3",
-                        "notes": "tag3 notes",
-                        "order": 0,
-                        "score": 0,
-                        "dictionary": "Test Dictionary 2",
-                        "redundant": false
-                      },
-                      {
-                        "name": "tag4",
-                        "category": "category4",
-                        "notes": "tag4 notes",
-                        "order": 0,
-                        "score": 0,
-                        "dictionary": "Test Dictionary 2",
-                        "redundant": false
-                      },
-                      {
-                        "name": "tag5",
-                        "category": "category5",
-                        "notes": "tag5 notes",
-                        "order": 0,
-                        "score": 0,
-                        "dictionary": "Test Dictionary 2",
-                        "redundant": false
-                      }
-                    ],
-                    "frequencies": [
-                      {
-                        "index": 0,
-                        "expressionIndex": 0,
-                        "dictionary": "Test Dictionary 2",
-                        "dictionaryOrder": {
-                          "index": 0,
-                          "priority": 0
-                        },
-                        "expression": "打ち込む",
-                        "reading": "うちこむ",
-                        "hasReading": false,
-                        "frequency": 3
-                      },
-                      {
-                        "index": 1,
-                        "expressionIndex": 0,
-                        "dictionary": "Test Dictionary 2",
-                        "dictionaryOrder": {
-                          "index": 0,
-                          "priority": 0
-                        },
-                        "expression": "打ち込む",
-                        "reading": "うちこむ",
-                        "hasReading": true,
-                        "frequency": 8
-                      }
-                    ],
-                    "pitches": [
-                      {
-                        "index": 0,
-                        "expressionIndex": 0,
-                        "dictionary": "Test Dictionary 2",
-                        "dictionaryOrder": {
-                          "index": 0,
-                          "priority": 0
-                        },
-                        "expression": "打ち込む",
-                        "reading": "うちこむ",
-                        "pitches": [
-                          {
-                            "position": 0,
-                            "tags": []
-                          },
-                          {
-                            "position": 3,
-                            "tags": []
-                          }
-                        ]
-                      }
-                    ]
-                  }
-                ],
-                "glossary": [
-                  "definition13",
-                  "definition14"
-                ],
-                "definitionTags": [
-                  {
-                    "name": "tag1",
-                    "category": "category1",
-                    "notes": "tag1 notes",
-                    "order": 0,
-                    "score": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "redundant": false
-                  },
-                  {
-                    "name": "tag2",
-                    "category": "category2",
-                    "notes": "tag2 notes",
-                    "order": 0,
-                    "score": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "redundant": false
-                  }
-                ],
-                "termTags": [
-                  {
-                    "name": "tag3",
-                    "category": "category3",
-                    "notes": "tag3 notes",
-                    "order": 0,
-                    "score": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "redundant": false
-                  },
-                  {
-                    "name": "tag4",
-                    "category": "category4",
-                    "notes": "tag4 notes",
-                    "order": 0,
-                    "score": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "redundant": false
-                  },
-                  {
-                    "name": "tag5",
-                    "category": "category5",
-                    "notes": "tag5 notes",
-                    "order": 0,
-                    "score": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "redundant": false
-                  }
-                ],
-                "frequencies": [
-                  {
-                    "index": 0,
-                    "expressionIndex": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "dictionaryOrder": {
-                      "index": 0,
-                      "priority": 0
-                    },
-                    "expression": "打ち込む",
-                    "reading": "うちこむ",
-                    "hasReading": false,
-                    "frequency": 3
-                  },
-                  {
-                    "index": 1,
-                    "expressionIndex": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "dictionaryOrder": {
-                      "index": 0,
-                      "priority": 0
-                    },
-                    "expression": "打ち込む",
-                    "reading": "うちこむ",
-                    "hasReading": true,
-                    "frequency": 8
-                  }
-                ],
-                "pitches": [
-                  {
-                    "index": 0,
-                    "expressionIndex": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "dictionaryOrder": {
-                      "index": 0,
-                      "priority": 0
-                    },
-                    "expression": "打ち込む",
-                    "reading": "うちこむ",
-                    "pitches": [
-                      {
-                        "position": 0,
-                        "tags": []
-                      },
-                      {
-                        "position": 3,
-                        "tags": []
-                      }
-                    ]
-                  }
-                ],
-                "sourceTermExactMatchCount": 0
-              }
-            ],
-            "frequencies": [
-              {
-                "index": 0,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打ち込む",
-                "reading": "うちこむ",
-                "hasReading": false,
-                "frequency": 3
-              },
-              {
-                "index": 1,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打ち込む",
-                "reading": "うちこむ",
-                "hasReading": true,
-                "frequency": 8
+                "order": 0,
+                "score": 0,
+                "content": [
+                  "tag2 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
+                "redundant": false
               }
             ],
-            "pitches": [
-              {
-                "index": 0,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打ち込む",
-                "reading": "うちこむ",
-                "pitches": [
-                  {
-                    "position": 0,
-                    "tags": []
-                  },
-                  {
-                    "position": 3,
-                    "tags": []
-                  }
-                ]
-              }
-            ],
-            "only": [
-              "うちこむ"
-            ],
-            "sourceTermExactMatchCount": 0
+            "entries": [
+              "definition13",
+              "definition14"
+            ]
           },
           {
-            "type": "termMergedByGlossary",
-            "source": "うちこむ",
-            "rawSource": "うちこむ",
-            "reasons": [],
-            "score": 10,
-            "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "dictionaryNames": [
-              "Test Dictionary 2"
-            ],
-            "expression": [
-              "打ち込む"
-            ],
-            "reading": [
-              "ぶちこむ"
-            ],
-            "expressions": [
-              {
-                "sourceTerm": "うちこむ",
-                "expression": "打ち込む",
-                "reading": "ぶちこむ",
-                "termTags": [
-                  {
-                    "name": "tag3",
-                    "category": "category3",
-                    "notes": "tag3 notes",
-                    "order": 0,
-                    "score": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "redundant": false
-                  },
-                  {
-                    "name": "tag4",
-                    "category": "category4",
-                    "notes": "tag4 notes",
-                    "order": 0,
-                    "score": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "redundant": false
-                  },
-                  {
-                    "name": "tag5",
-                    "category": "category5",
-                    "notes": "tag5 notes",
-                    "order": 0,
-                    "score": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "redundant": false
-                  }
-                ],
-                "frequencies": [
-                  {
-                    "index": 0,
-                    "expressionIndex": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "dictionaryOrder": {
-                      "index": 0,
-                      "priority": 0
-                    },
-                    "expression": "打ち込む",
-                    "reading": "ぶちこむ",
-                    "hasReading": false,
-                    "frequency": 3
-                  },
-                  {
-                    "index": 1,
-                    "expressionIndex": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "dictionaryOrder": {
-                      "index": 0,
-                      "priority": 0
-                    },
-                    "expression": "打ち込む",
-                    "reading": "ぶちこむ",
-                    "hasReading": true,
-                    "frequency": 9
-                  }
-                ],
-                "pitches": [
-                  {
-                    "index": 0,
-                    "expressionIndex": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "dictionaryOrder": {
-                      "index": 0,
-                      "priority": 0
-                    },
-                    "expression": "打ち込む",
-                    "reading": "ぶちこむ",
-                    "pitches": [
-                      {
-                        "position": 0,
-                        "tags": []
-                      },
-                      {
-                        "position": 3,
-                        "tags": []
-                      }
-                    ]
-                  }
-                ]
-              }
-            ],
-            "glossary": [
-              "definition17",
-              "definition18"
+            "index": 1,
+            "headwordIndices": [
+              1
             ],
-            "definitionTags": [
+            "dictionary": "Test Dictionary 2",
+            "tags": [
               {
                 "name": "tag1",
                 "category": "category1",
-                "notes": "tag1 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag1 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag2",
                 "category": "category2",
-                "notes": "tag2 notes",
-                "order": 0,
-                "score": 0,
-                "dictionary": "Test Dictionary 2",
-                "redundant": false
-              }
-            ],
-            "definitions": [
-              {
-                "type": "term",
-                "id": 9,
-                "source": "うちこむ",
-                "rawSource": "うちこむ",
-                "sourceTerm": "うちこむ",
-                "reasons": [],
-                "score": 10,
-                "isPrimary": false,
-                "sequence": 4,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "dictionaryNames": [
-                  "Test Dictionary 2"
-                ],
-                "expression": "打ち込む",
-                "reading": "ぶちこむ",
-                "expressions": [
-                  {
-                    "sourceTerm": "うちこむ",
-                    "expression": "打ち込む",
-                    "reading": "ぶちこむ",
-                    "termTags": [
-                      {
-                        "name": "tag3",
-                        "category": "category3",
-                        "notes": "tag3 notes",
-                        "order": 0,
-                        "score": 0,
-                        "dictionary": "Test Dictionary 2",
-                        "redundant": false
-                      },
-                      {
-                        "name": "tag4",
-                        "category": "category4",
-                        "notes": "tag4 notes",
-                        "order": 0,
-                        "score": 0,
-                        "dictionary": "Test Dictionary 2",
-                        "redundant": false
-                      },
-                      {
-                        "name": "tag5",
-                        "category": "category5",
-                        "notes": "tag5 notes",
-                        "order": 0,
-                        "score": 0,
-                        "dictionary": "Test Dictionary 2",
-                        "redundant": false
-                      }
-                    ],
-                    "frequencies": [
-                      {
-                        "index": 0,
-                        "expressionIndex": 0,
-                        "dictionary": "Test Dictionary 2",
-                        "dictionaryOrder": {
-                          "index": 0,
-                          "priority": 0
-                        },
-                        "expression": "打ち込む",
-                        "reading": "ぶちこむ",
-                        "hasReading": false,
-                        "frequency": 3
-                      },
-                      {
-                        "index": 1,
-                        "expressionIndex": 0,
-                        "dictionary": "Test Dictionary 2",
-                        "dictionaryOrder": {
-                          "index": 0,
-                          "priority": 0
-                        },
-                        "expression": "打ち込む",
-                        "reading": "ぶちこむ",
-                        "hasReading": true,
-                        "frequency": 9
-                      }
-                    ],
-                    "pitches": [
-                      {
-                        "index": 0,
-                        "expressionIndex": 0,
-                        "dictionary": "Test Dictionary 2",
-                        "dictionaryOrder": {
-                          "index": 0,
-                          "priority": 0
-                        },
-                        "expression": "打ち込む",
-                        "reading": "ぶちこむ",
-                        "pitches": [
-                          {
-                            "position": 0,
-                            "tags": []
-                          },
-                          {
-                            "position": 3,
-                            "tags": []
-                          }
-                        ]
-                      }
-                    ]
-                  }
-                ],
-                "glossary": [
-                  "definition17",
-                  "definition18"
-                ],
-                "definitionTags": [
-                  {
-                    "name": "tag1",
-                    "category": "category1",
-                    "notes": "tag1 notes",
-                    "order": 0,
-                    "score": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "redundant": false
-                  },
-                  {
-                    "name": "tag2",
-                    "category": "category2",
-                    "notes": "tag2 notes",
-                    "order": 0,
-                    "score": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "redundant": false
-                  }
-                ],
-                "termTags": [
-                  {
-                    "name": "tag3",
-                    "category": "category3",
-                    "notes": "tag3 notes",
-                    "order": 0,
-                    "score": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "redundant": false
-                  },
-                  {
-                    "name": "tag4",
-                    "category": "category4",
-                    "notes": "tag4 notes",
-                    "order": 0,
-                    "score": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "redundant": false
-                  },
-                  {
-                    "name": "tag5",
-                    "category": "category5",
-                    "notes": "tag5 notes",
-                    "order": 0,
-                    "score": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "redundant": false
-                  }
-                ],
-                "frequencies": [
-                  {
-                    "index": 0,
-                    "expressionIndex": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "dictionaryOrder": {
-                      "index": 0,
-                      "priority": 0
-                    },
-                    "expression": "打ち込む",
-                    "reading": "ぶちこむ",
-                    "hasReading": false,
-                    "frequency": 3
-                  },
-                  {
-                    "index": 1,
-                    "expressionIndex": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "dictionaryOrder": {
-                      "index": 0,
-                      "priority": 0
-                    },
-                    "expression": "打ち込む",
-                    "reading": "ぶちこむ",
-                    "hasReading": true,
-                    "frequency": 9
-                  }
-                ],
-                "pitches": [
-                  {
-                    "index": 0,
-                    "expressionIndex": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "dictionaryOrder": {
-                      "index": 0,
-                      "priority": 0
-                    },
-                    "expression": "打ち込む",
-                    "reading": "ぶちこむ",
-                    "pitches": [
-                      {
-                        "position": 0,
-                        "tags": []
-                      },
-                      {
-                        "position": 3,
-                        "tags": []
-                      }
-                    ]
-                  }
-                ],
-                "sourceTermExactMatchCount": 0
-              }
-            ],
-            "frequencies": [
-              {
-                "index": 0,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打ち込む",
-                "reading": "ぶちこむ",
-                "hasReading": false,
-                "frequency": 3
-              },
-              {
-                "index": 1,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打ち込む",
-                "reading": "ぶちこむ",
-                "hasReading": true,
-                "frequency": 9
+                "order": 0,
+                "score": 0,
+                "content": [
+                  "tag2 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
+                "redundant": false
               }
             ],
-            "pitches": [
-              {
-                "index": 0,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打ち込む",
-                "reading": "ぶちこむ",
-                "pitches": [
-                  {
-                    "position": 0,
-                    "tags": []
-                  },
-                  {
-                    "position": 3,
-                    "tags": []
-                  }
-                ]
-              }
-            ],
-            "only": [
-              "ぶちこむ"
-            ],
-            "sourceTermExactMatchCount": 0
+            "entries": [
+              "definition17",
+              "definition18"
+            ]
           },
           {
-            "type": "termMergedByGlossary",
-            "source": "うちこむ",
-            "rawSource": "うちこむ",
-            "reasons": [],
-            "score": 1,
-            "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "dictionaryNames": [
-              "Test Dictionary 2"
-            ],
-            "expression": [
-              "打ち込む"
-            ],
-            "reading": [
-              "うちこむ"
-            ],
-            "expressions": [
-              {
-                "sourceTerm": "うちこむ",
-                "expression": "打ち込む",
-                "reading": "うちこむ",
-                "termTags": [
-                  {
-                    "name": "tag5",
-                    "category": "category5",
-                    "notes": "tag5 notes",
-                    "order": 0,
-                    "score": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "redundant": false
-                  },
-                  {
-                    "name": "tag6",
-                    "category": "default",
-                    "notes": "",
-                    "order": 0,
-                    "score": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "redundant": false
-                  },
-                  {
-                    "name": "tag7",
-                    "category": "default",
-                    "notes": "",
-                    "order": 0,
-                    "score": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "redundant": false
-                  }
-                ],
-                "frequencies": [
-                  {
-                    "index": 0,
-                    "expressionIndex": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "dictionaryOrder": {
-                      "index": 0,
-                      "priority": 0
-                    },
-                    "expression": "打ち込む",
-                    "reading": "うちこむ",
-                    "hasReading": false,
-                    "frequency": 3
-                  },
-                  {
-                    "index": 1,
-                    "expressionIndex": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "dictionaryOrder": {
-                      "index": 0,
-                      "priority": 0
-                    },
-                    "expression": "打ち込む",
-                    "reading": "うちこむ",
-                    "hasReading": true,
-                    "frequency": 8
-                  }
-                ],
-                "pitches": [
-                  {
-                    "index": 0,
-                    "expressionIndex": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "dictionaryOrder": {
-                      "index": 0,
-                      "priority": 0
-                    },
-                    "expression": "打ち込む",
-                    "reading": "うちこむ",
-                    "pitches": [
-                      {
-                        "position": 0,
-                        "tags": []
-                      },
-                      {
-                        "position": 3,
-                        "tags": []
-                      }
-                    ]
-                  }
-                ]
-              }
-            ],
-            "glossary": [
-              "definition15",
-              "definition16"
+            "index": 2,
+            "headwordIndices": [
+              0
             ],
-            "definitionTags": [
+            "dictionary": "Test Dictionary 2",
+            "tags": [
               {
                 "name": "tag1",
                 "category": "category1",
-                "notes": "tag1 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag1 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag2",
                 "category": "category2",
-                "notes": "tag2 notes",
-                "order": 0,
-                "score": 0,
-                "dictionary": "Test Dictionary 2",
-                "redundant": false
-              }
-            ],
-            "definitions": [
-              {
-                "type": "term",
-                "id": 8,
-                "source": "うちこむ",
-                "rawSource": "うちこむ",
-                "sourceTerm": "うちこむ",
-                "reasons": [],
-                "score": 1,
-                "isPrimary": true,
-                "sequence": 4,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "dictionaryNames": [
-                  "Test Dictionary 2"
-                ],
-                "expression": "打ち込む",
-                "reading": "うちこむ",
-                "expressions": [
-                  {
-                    "sourceTerm": "うちこむ",
-                    "expression": "打ち込む",
-                    "reading": "うちこむ",
-                    "termTags": [
-                      {
-                        "name": "tag5",
-                        "category": "category5",
-                        "notes": "tag5 notes",
-                        "order": 0,
-                        "score": 0,
-                        "dictionary": "Test Dictionary 2",
-                        "redundant": false
-                      },
-                      {
-                        "name": "tag6",
-                        "category": "default",
-                        "notes": "",
-                        "order": 0,
-                        "score": 0,
-                        "dictionary": "Test Dictionary 2",
-                        "redundant": false
-                      },
-                      {
-                        "name": "tag7",
-                        "category": "default",
-                        "notes": "",
-                        "order": 0,
-                        "score": 0,
-                        "dictionary": "Test Dictionary 2",
-                        "redundant": false
-                      }
-                    ],
-                    "frequencies": [
-                      {
-                        "index": 0,
-                        "expressionIndex": 0,
-                        "dictionary": "Test Dictionary 2",
-                        "dictionaryOrder": {
-                          "index": 0,
-                          "priority": 0
-                        },
-                        "expression": "打ち込む",
-                        "reading": "うちこむ",
-                        "hasReading": false,
-                        "frequency": 3
-                      },
-                      {
-                        "index": 1,
-                        "expressionIndex": 0,
-                        "dictionary": "Test Dictionary 2",
-                        "dictionaryOrder": {
-                          "index": 0,
-                          "priority": 0
-                        },
-                        "expression": "打ち込む",
-                        "reading": "うちこむ",
-                        "hasReading": true,
-                        "frequency": 8
-                      }
-                    ],
-                    "pitches": [
-                      {
-                        "index": 0,
-                        "expressionIndex": 0,
-                        "dictionary": "Test Dictionary 2",
-                        "dictionaryOrder": {
-                          "index": 0,
-                          "priority": 0
-                        },
-                        "expression": "打ち込む",
-                        "reading": "うちこむ",
-                        "pitches": [
-                          {
-                            "position": 0,
-                            "tags": []
-                          },
-                          {
-                            "position": 3,
-                            "tags": []
-                          }
-                        ]
-                      }
-                    ]
-                  }
-                ],
-                "glossary": [
-                  "definition15",
-                  "definition16"
-                ],
-                "definitionTags": [
-                  {
-                    "name": "tag1",
-                    "category": "category1",
-                    "notes": "tag1 notes",
-                    "order": 0,
-                    "score": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "redundant": false
-                  },
-                  {
-                    "name": "tag2",
-                    "category": "category2",
-                    "notes": "tag2 notes",
-                    "order": 0,
-                    "score": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "redundant": false
-                  }
-                ],
-                "termTags": [
-                  {
-                    "name": "tag5",
-                    "category": "category5",
-                    "notes": "tag5 notes",
-                    "order": 0,
-                    "score": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "redundant": false
-                  },
-                  {
-                    "name": "tag6",
-                    "category": "default",
-                    "notes": "",
-                    "order": 0,
-                    "score": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "redundant": false
-                  },
-                  {
-                    "name": "tag7",
-                    "category": "default",
-                    "notes": "",
-                    "order": 0,
-                    "score": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "redundant": false
-                  }
-                ],
-                "frequencies": [
-                  {
-                    "index": 0,
-                    "expressionIndex": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "dictionaryOrder": {
-                      "index": 0,
-                      "priority": 0
-                    },
-                    "expression": "打ち込む",
-                    "reading": "うちこむ",
-                    "hasReading": false,
-                    "frequency": 3
-                  },
-                  {
-                    "index": 1,
-                    "expressionIndex": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "dictionaryOrder": {
-                      "index": 0,
-                      "priority": 0
-                    },
-                    "expression": "打ち込む",
-                    "reading": "うちこむ",
-                    "hasReading": true,
-                    "frequency": 8
-                  }
-                ],
-                "pitches": [
-                  {
-                    "index": 0,
-                    "expressionIndex": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "dictionaryOrder": {
-                      "index": 0,
-                      "priority": 0
-                    },
-                    "expression": "打ち込む",
-                    "reading": "うちこむ",
-                    "pitches": [
-                      {
-                        "position": 0,
-                        "tags": []
-                      },
-                      {
-                        "position": 3,
-                        "tags": []
-                      }
-                    ]
-                  }
-                ],
-                "sourceTermExactMatchCount": 0
-              }
-            ],
-            "frequencies": [
-              {
-                "index": 0,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打ち込む",
-                "reading": "うちこむ",
-                "hasReading": false,
-                "frequency": 3
-              },
-              {
-                "index": 1,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打ち込む",
-                "reading": "うちこむ",
-                "hasReading": true,
-                "frequency": 8
+                "order": 0,
+                "score": 0,
+                "content": [
+                  "tag2 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
+                "redundant": false
               }
             ],
-            "pitches": [
-              {
-                "index": 0,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打ち込む",
-                "reading": "うちこむ",
-                "pitches": [
-                  {
-                    "position": 0,
-                    "tags": []
-                  },
-                  {
-                    "position": 3,
-                    "tags": []
-                  }
-                ]
-              }
-            ],
-            "only": [
-              "うちこむ"
-            ],
-            "sourceTermExactMatchCount": 0
+            "entries": [
+              "definition15",
+              "definition16"
+            ]
           },
           {
-            "type": "termMergedByGlossary",
-            "source": "うちこむ",
-            "rawSource": "うちこむ",
-            "reasons": [],
-            "score": 1,
-            "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "dictionaryNames": [
-              "Test Dictionary 2"
-            ],
-            "expression": [
-              "打ち込む"
-            ],
-            "reading": [
-              "ぶちこむ"
-            ],
-            "expressions": [
-              {
-                "sourceTerm": "うちこむ",
-                "expression": "打ち込む",
-                "reading": "ぶちこむ",
-                "termTags": [
-                  {
-                    "name": "tag3",
-                    "category": "category3",
-                    "notes": "tag3 notes",
-                    "order": 0,
-                    "score": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "redundant": false
-                  },
-                  {
-                    "name": "tag4",
-                    "category": "category4",
-                    "notes": "tag4 notes",
-                    "order": 0,
-                    "score": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "redundant": false
-                  },
-                  {
-                    "name": "tag5",
-                    "category": "category5",
-                    "notes": "tag5 notes",
-                    "order": 0,
-                    "score": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "redundant": false
-                  }
-                ],
-                "frequencies": [
-                  {
-                    "index": 0,
-                    "expressionIndex": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "dictionaryOrder": {
-                      "index": 0,
-                      "priority": 0
-                    },
-                    "expression": "打ち込む",
-                    "reading": "ぶちこむ",
-                    "hasReading": false,
-                    "frequency": 3
-                  },
-                  {
-                    "index": 1,
-                    "expressionIndex": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "dictionaryOrder": {
-                      "index": 0,
-                      "priority": 0
-                    },
-                    "expression": "打ち込む",
-                    "reading": "ぶちこむ",
-                    "hasReading": true,
-                    "frequency": 9
-                  }
-                ],
-                "pitches": [
-                  {
-                    "index": 0,
-                    "expressionIndex": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "dictionaryOrder": {
-                      "index": 0,
-                      "priority": 0
-                    },
-                    "expression": "打ち込む",
-                    "reading": "ぶちこむ",
-                    "pitches": [
-                      {
-                        "position": 0,
-                        "tags": []
-                      },
-                      {
-                        "position": 3,
-                        "tags": []
-                      }
-                    ]
-                  }
-                ]
-              }
-            ],
-            "glossary": [
-              "definition19",
-              "definition20"
+            "index": 3,
+            "headwordIndices": [
+              1
             ],
-            "definitionTags": [
+            "dictionary": "Test Dictionary 2",
+            "tags": [
               {
                 "name": "tag1",
                 "category": "category1",
-                "notes": "tag1 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag1 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag2",
                 "category": "category2",
-                "notes": "tag2 notes",
-                "order": 0,
-                "score": 0,
-                "dictionary": "Test Dictionary 2",
-                "redundant": false
-              }
-            ],
-            "definitions": [
-              {
-                "type": "term",
-                "id": 10,
-                "source": "うちこむ",
-                "rawSource": "うちこむ",
-                "sourceTerm": "うちこむ",
-                "reasons": [],
-                "score": 1,
-                "isPrimary": false,
-                "sequence": 4,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "dictionaryNames": [
-                  "Test Dictionary 2"
-                ],
-                "expression": "打ち込む",
-                "reading": "ぶちこむ",
-                "expressions": [
-                  {
-                    "sourceTerm": "うちこむ",
-                    "expression": "打ち込む",
-                    "reading": "ぶちこむ",
-                    "termTags": [
-                      {
-                        "name": "tag3",
-                        "category": "category3",
-                        "notes": "tag3 notes",
-                        "order": 0,
-                        "score": 0,
-                        "dictionary": "Test Dictionary 2",
-                        "redundant": false
-                      },
-                      {
-                        "name": "tag4",
-                        "category": "category4",
-                        "notes": "tag4 notes",
-                        "order": 0,
-                        "score": 0,
-                        "dictionary": "Test Dictionary 2",
-                        "redundant": false
-                      },
-                      {
-                        "name": "tag5",
-                        "category": "category5",
-                        "notes": "tag5 notes",
-                        "order": 0,
-                        "score": 0,
-                        "dictionary": "Test Dictionary 2",
-                        "redundant": false
-                      }
-                    ],
-                    "frequencies": [
-                      {
-                        "index": 0,
-                        "expressionIndex": 0,
-                        "dictionary": "Test Dictionary 2",
-                        "dictionaryOrder": {
-                          "index": 0,
-                          "priority": 0
-                        },
-                        "expression": "打ち込む",
-                        "reading": "ぶちこむ",
-                        "hasReading": false,
-                        "frequency": 3
-                      },
-                      {
-                        "index": 1,
-                        "expressionIndex": 0,
-                        "dictionary": "Test Dictionary 2",
-                        "dictionaryOrder": {
-                          "index": 0,
-                          "priority": 0
-                        },
-                        "expression": "打ち込む",
-                        "reading": "ぶちこむ",
-                        "hasReading": true,
-                        "frequency": 9
-                      }
-                    ],
-                    "pitches": [
-                      {
-                        "index": 0,
-                        "expressionIndex": 0,
-                        "dictionary": "Test Dictionary 2",
-                        "dictionaryOrder": {
-                          "index": 0,
-                          "priority": 0
-                        },
-                        "expression": "打ち込む",
-                        "reading": "ぶちこむ",
-                        "pitches": [
-                          {
-                            "position": 0,
-                            "tags": []
-                          },
-                          {
-                            "position": 3,
-                            "tags": []
-                          }
-                        ]
-                      }
-                    ]
-                  }
-                ],
-                "glossary": [
-                  "definition19",
-                  "definition20"
-                ],
-                "definitionTags": [
-                  {
-                    "name": "tag1",
-                    "category": "category1",
-                    "notes": "tag1 notes",
-                    "order": 0,
-                    "score": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "redundant": false
-                  },
-                  {
-                    "name": "tag2",
-                    "category": "category2",
-                    "notes": "tag2 notes",
-                    "order": 0,
-                    "score": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "redundant": false
-                  }
-                ],
-                "termTags": [
-                  {
-                    "name": "tag3",
-                    "category": "category3",
-                    "notes": "tag3 notes",
-                    "order": 0,
-                    "score": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "redundant": false
-                  },
-                  {
-                    "name": "tag4",
-                    "category": "category4",
-                    "notes": "tag4 notes",
-                    "order": 0,
-                    "score": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "redundant": false
-                  },
-                  {
-                    "name": "tag5",
-                    "category": "category5",
-                    "notes": "tag5 notes",
-                    "order": 0,
-                    "score": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "redundant": false
-                  }
-                ],
-                "frequencies": [
-                  {
-                    "index": 0,
-                    "expressionIndex": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "dictionaryOrder": {
-                      "index": 0,
-                      "priority": 0
-                    },
-                    "expression": "打ち込む",
-                    "reading": "ぶちこむ",
-                    "hasReading": false,
-                    "frequency": 3
-                  },
-                  {
-                    "index": 1,
-                    "expressionIndex": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "dictionaryOrder": {
-                      "index": 0,
-                      "priority": 0
-                    },
-                    "expression": "打ち込む",
-                    "reading": "ぶちこむ",
-                    "hasReading": true,
-                    "frequency": 9
-                  }
-                ],
-                "pitches": [
-                  {
-                    "index": 0,
-                    "expressionIndex": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "dictionaryOrder": {
-                      "index": 0,
-                      "priority": 0
-                    },
-                    "expression": "打ち込む",
-                    "reading": "ぶちこむ",
-                    "pitches": [
-                      {
-                        "position": 0,
-                        "tags": []
-                      },
-                      {
-                        "position": 3,
-                        "tags": []
-                      }
-                    ]
-                  }
-                ],
-                "sourceTermExactMatchCount": 0
-              }
-            ],
-            "frequencies": [
-              {
-                "index": 0,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打ち込む",
-                "reading": "ぶちこむ",
-                "hasReading": false,
-                "frequency": 3
-              },
-              {
-                "index": 1,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打ち込む",
-                "reading": "ぶちこむ",
-                "hasReading": true,
-                "frequency": 9
+                "order": 0,
+                "score": 0,
+                "content": [
+                  "tag2 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
+                "redundant": false
               }
             ],
-            "pitches": [
-              {
-                "index": 0,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打ち込む",
-                "reading": "ぶちこむ",
-                "pitches": [
-                  {
-                    "position": 0,
-                    "tags": []
-                  },
-                  {
-                    "position": 3,
-                    "tags": []
-                  }
-                ]
-              }
-            ],
-            "only": [
-              "ぶちこむ"
-            ],
-            "sourceTermExactMatchCount": 0
-          }
-        ],
-        "frequencies": [
-          {
-            "index": 0,
-            "expressionIndex": 0,
-            "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "expression": "打ち込む",
-            "reading": "うちこむ",
-            "hasReading": false,
-            "frequency": 3
-          },
-          {
-            "index": 2,
-            "expressionIndex": 0,
-            "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "expression": "打ち込む",
-            "reading": "うちこむ",
-            "hasReading": true,
-            "frequency": 8
-          },
-          {
-            "index": 1,
-            "expressionIndex": 1,
-            "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "expression": "打ち込む",
-            "reading": "ぶちこむ",
-            "hasReading": false,
-            "frequency": 3
-          },
-          {
-            "index": 3,
-            "expressionIndex": 1,
-            "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "expression": "打ち込む",
-            "reading": "ぶちこむ",
-            "hasReading": true,
-            "frequency": 9
+            "entries": [
+              "definition19",
+              "definition20"
+            ]
           }
         ],
-        "pitches": [
+        "pronunciations": [
           {
             "index": 0,
-            "expressionIndex": 0,
+            "headwordIndex": 0,
             "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "expression": "打ち込む",
-            "reading": "うちこむ",
+            "dictionaryIndex": 0,
+            "dictionaryPriority": 0,
             "pitches": [
               {
                 "position": 0,
@@ -22397,14 +12001,10 @@
           },
           {
             "index": 1,
-            "expressionIndex": 1,
+            "headwordIndex": 1,
             "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "expression": "打ち込む",
-            "reading": "ぶちこむ",
+            "dictionaryIndex": 0,
+            "dictionaryPriority": 0,
             "pitches": [
               {
                 "position": 0,
@@ -22417,1477 +12017,365 @@
             ]
           }
         ],
-        "sourceTermExactMatchCount": 0
+        "frequencies": [
+          {
+            "index": 0,
+            "headwordIndex": 0,
+            "dictionary": "Test Dictionary 2",
+            "dictionaryIndex": 0,
+            "dictionaryPriority": 0,
+            "hasReading": false,
+            "frequency": 3
+          },
+          {
+            "index": 2,
+            "headwordIndex": 0,
+            "dictionary": "Test Dictionary 2",
+            "dictionaryIndex": 0,
+            "dictionaryPriority": 0,
+            "hasReading": true,
+            "frequency": 8
+          },
+          {
+            "index": 1,
+            "headwordIndex": 1,
+            "dictionary": "Test Dictionary 2",
+            "dictionaryIndex": 0,
+            "dictionaryPriority": 0,
+            "hasReading": false,
+            "frequency": 3
+          },
+          {
+            "index": 3,
+            "headwordIndex": 1,
+            "dictionary": "Test Dictionary 2",
+            "dictionaryIndex": 0,
+            "dictionaryPriority": 0,
+            "hasReading": true,
+            "frequency": 9
+          }
+        ]
       },
       {
-        "type": "termMerged",
-        "source": "うち",
-        "rawSource": "うち",
-        "reasons": [
+        "type": "term",
+        "id": -1,
+        "isPrimary": true,
+        "sequence": -1,
+        "inflections": [
           "masu stem"
         ],
         "score": 10,
-        "dictionary": "Test Dictionary 2",
-        "dictionaryOrder": {
-          "index": 0,
-          "priority": 0
-        },
-        "dictionaryNames": [
-          "Test Dictionary 2"
-        ],
-        "expression": [
-          "打つ"
-        ],
-        "reading": [
-          "うつ",
-          "ぶつ"
-        ],
-        "expressions": [
+        "dictionaryIndex": 0,
+        "dictionaryPriority": 0,
+        "sourceTermExactMatchCount": 0,
+        "maxDeinflectedTextLength": 2,
+        "headwords": [
           {
-            "sourceTerm": "うつ",
-            "expression": "打つ",
+            "index": 0,
+            "term": "打つ",
             "reading": "うつ",
-            "termTags": [
+            "sources": [
+              {
+                "originalText": "うち",
+                "transformedText": "うち",
+                "deinflectedText": "うつ",
+                "isPrimary": true
+              }
+            ],
+            "tags": [
               {
                 "name": "tag3",
                 "category": "category3",
-                "notes": "tag3 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag3 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag4",
                 "category": "category4",
-                "notes": "tag4 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag4 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag5",
                 "category": "category5",
-                "notes": "tag5 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag5 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               }
-            ],
-            "frequencies": [
-              {
-                "index": 0,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打つ",
-                "reading": "うつ",
-                "hasReading": false,
-                "frequency": 2
-              },
-              {
-                "index": 1,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打つ",
-                "reading": "うつ",
-                "hasReading": true,
-                "frequency": 6
-              }
-            ],
-            "pitches": []
+            ]
           },
           {
-            "sourceTerm": "うつ",
-            "expression": "打つ",
+            "index": 1,
+            "term": "打つ",
             "reading": "ぶつ",
-            "termTags": [
+            "sources": [
+              {
+                "originalText": "打つ",
+                "transformedText": "打つ",
+                "deinflectedText": "打つ",
+                "isPrimary": false
+              }
+            ],
+            "tags": [
               {
                 "name": "tag3",
                 "category": "category3",
-                "notes": "tag3 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag3 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag4",
                 "category": "category4",
-                "notes": "tag4 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag4 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag5",
                 "category": "category5",
-                "notes": "tag5 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag5 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               }
-            ],
-            "frequencies": [
-              {
-                "index": 0,
-                "expressionIndex": 1,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打つ",
-                "reading": "ぶつ",
-                "hasReading": false,
-                "frequency": 2
-              },
-              {
-                "index": 1,
-                "expressionIndex": 1,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打つ",
-                "reading": "ぶつ",
-                "hasReading": true,
-                "frequency": 7
-              }
-            ],
-            "pitches": []
+            ]
           }
         ],
         "definitions": [
           {
-            "type": "termMergedByGlossary",
-            "source": "うち",
-            "rawSource": "うち",
-            "reasons": [],
-            "score": 10,
-            "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "dictionaryNames": [
-              "Test Dictionary 2"
-            ],
-            "expression": [
-              "打つ"
-            ],
-            "reading": [
-              "うつ"
-            ],
-            "expressions": [
-              {
-                "sourceTerm": "うつ",
-                "expression": "打つ",
-                "reading": "うつ",
-                "termTags": [
-                  {
-                    "name": "tag3",
-                    "category": "category3",
-                    "notes": "tag3 notes",
-                    "order": 0,
-                    "score": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "redundant": false
-                  },
-                  {
-                    "name": "tag4",
-                    "category": "category4",
-                    "notes": "tag4 notes",
-                    "order": 0,
-                    "score": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "redundant": false
-                  },
-                  {
-                    "name": "tag5",
-                    "category": "category5",
-                    "notes": "tag5 notes",
-                    "order": 0,
-                    "score": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "redundant": false
-                  }
-                ],
-                "frequencies": [
-                  {
-                    "index": 0,
-                    "expressionIndex": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "dictionaryOrder": {
-                      "index": 0,
-                      "priority": 0
-                    },
-                    "expression": "打つ",
-                    "reading": "うつ",
-                    "hasReading": false,
-                    "frequency": 2
-                  },
-                  {
-                    "index": 1,
-                    "expressionIndex": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "dictionaryOrder": {
-                      "index": 0,
-                      "priority": 0
-                    },
-                    "expression": "打つ",
-                    "reading": "うつ",
-                    "hasReading": true,
-                    "frequency": 6
-                  }
-                ],
-                "pitches": []
-              }
-            ],
-            "glossary": [
-              "definition5",
-              "definition6"
+            "index": 0,
+            "headwordIndices": [
+              0
             ],
-            "definitionTags": [
+            "dictionary": "Test Dictionary 2",
+            "tags": [
               {
                 "name": "tag1",
                 "category": "category1",
-                "notes": "tag1 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag1 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag2",
                 "category": "category2",
-                "notes": "tag2 notes",
-                "order": 0,
-                "score": 0,
-                "dictionary": "Test Dictionary 2",
-                "redundant": false
-              }
-            ],
-            "definitions": [
-              {
-                "type": "term",
-                "id": 3,
-                "source": "うち",
-                "rawSource": "うち",
-                "sourceTerm": "うつ",
-                "reasons": [
-                  "masu stem"
-                ],
-                "score": 10,
-                "isPrimary": true,
-                "sequence": 3,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "dictionaryNames": [
-                  "Test Dictionary 2"
-                ],
-                "expression": "打つ",
-                "reading": "うつ",
-                "expressions": [
-                  {
-                    "sourceTerm": "うつ",
-                    "expression": "打つ",
-                    "reading": "うつ",
-                    "termTags": [
-                      {
-                        "name": "tag3",
-                        "category": "category3",
-                        "notes": "tag3 notes",
-                        "order": 0,
-                        "score": 0,
-                        "dictionary": "Test Dictionary 2",
-                        "redundant": false
-                      },
-                      {
-                        "name": "tag4",
-                        "category": "category4",
-                        "notes": "tag4 notes",
-                        "order": 0,
-                        "score": 0,
-                        "dictionary": "Test Dictionary 2",
-                        "redundant": false
-                      },
-                      {
-                        "name": "tag5",
-                        "category": "category5",
-                        "notes": "tag5 notes",
-                        "order": 0,
-                        "score": 0,
-                        "dictionary": "Test Dictionary 2",
-                        "redundant": false
-                      }
-                    ],
-                    "frequencies": [
-                      {
-                        "index": 0,
-                        "expressionIndex": 0,
-                        "dictionary": "Test Dictionary 2",
-                        "dictionaryOrder": {
-                          "index": 0,
-                          "priority": 0
-                        },
-                        "expression": "打つ",
-                        "reading": "うつ",
-                        "hasReading": false,
-                        "frequency": 2
-                      },
-                      {
-                        "index": 1,
-                        "expressionIndex": 0,
-                        "dictionary": "Test Dictionary 2",
-                        "dictionaryOrder": {
-                          "index": 0,
-                          "priority": 0
-                        },
-                        "expression": "打つ",
-                        "reading": "うつ",
-                        "hasReading": true,
-                        "frequency": 6
-                      }
-                    ],
-                    "pitches": []
-                  }
-                ],
-                "glossary": [
-                  "definition5",
-                  "definition6"
-                ],
-                "definitionTags": [
-                  {
-                    "name": "tag1",
-                    "category": "category1",
-                    "notes": "tag1 notes",
-                    "order": 0,
-                    "score": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "redundant": false
-                  },
-                  {
-                    "name": "tag2",
-                    "category": "category2",
-                    "notes": "tag2 notes",
-                    "order": 0,
-                    "score": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "redundant": false
-                  }
-                ],
-                "termTags": [
-                  {
-                    "name": "tag3",
-                    "category": "category3",
-                    "notes": "tag3 notes",
-                    "order": 0,
-                    "score": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "redundant": false
-                  },
-                  {
-                    "name": "tag4",
-                    "category": "category4",
-                    "notes": "tag4 notes",
-                    "order": 0,
-                    "score": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "redundant": false
-                  },
-                  {
-                    "name": "tag5",
-                    "category": "category5",
-                    "notes": "tag5 notes",
-                    "order": 0,
-                    "score": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "redundant": false
-                  }
-                ],
-                "frequencies": [
-                  {
-                    "index": 0,
-                    "expressionIndex": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "dictionaryOrder": {
-                      "index": 0,
-                      "priority": 0
-                    },
-                    "expression": "打つ",
-                    "reading": "うつ",
-                    "hasReading": false,
-                    "frequency": 2
-                  },
-                  {
-                    "index": 1,
-                    "expressionIndex": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "dictionaryOrder": {
-                      "index": 0,
-                      "priority": 0
-                    },
-                    "expression": "打つ",
-                    "reading": "うつ",
-                    "hasReading": true,
-                    "frequency": 6
-                  }
-                ],
-                "pitches": [],
-                "sourceTermExactMatchCount": 0
-              }
-            ],
-            "frequencies": [
-              {
-                "index": 0,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打つ",
-                "reading": "うつ",
-                "hasReading": false,
-                "frequency": 2
-              },
-              {
-                "index": 1,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打つ",
-                "reading": "うつ",
-                "hasReading": true,
-                "frequency": 6
-              }
-            ],
-            "pitches": [],
-            "only": [
-              "うつ"
-            ],
-            "sourceTermExactMatchCount": 0
+                "order": 0,
+                "score": 0,
+                "content": [
+                  "tag2 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
+                "redundant": false
+              }
+            ],
+            "entries": [
+              "definition5",
+              "definition6"
+            ]
           },
           {
-            "type": "termMergedByGlossary",
-            "source": "うち",
-            "rawSource": "うち",
-            "reasons": [],
-            "score": 10,
-            "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "dictionaryNames": [
-              "Test Dictionary 2"
-            ],
-            "expression": [
-              "打つ"
-            ],
-            "reading": [
-              "ぶつ"
-            ],
-            "expressions": [
-              {
-                "sourceTerm": "うつ",
-                "expression": "打つ",
-                "reading": "ぶつ",
-                "termTags": [
-                  {
-                    "name": "tag3",
-                    "category": "category3",
-                    "notes": "tag3 notes",
-                    "order": 0,
-                    "score": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "redundant": false
-                  },
-                  {
-                    "name": "tag4",
-                    "category": "category4",
-                    "notes": "tag4 notes",
-                    "order": 0,
-                    "score": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "redundant": false
-                  },
-                  {
-                    "name": "tag5",
-                    "category": "category5",
-                    "notes": "tag5 notes",
-                    "order": 0,
-                    "score": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "redundant": false
-                  }
-                ],
-                "frequencies": [
-                  {
-                    "index": 0,
-                    "expressionIndex": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "dictionaryOrder": {
-                      "index": 0,
-                      "priority": 0
-                    },
-                    "expression": "打つ",
-                    "reading": "ぶつ",
-                    "hasReading": false,
-                    "frequency": 2
-                  },
-                  {
-                    "index": 1,
-                    "expressionIndex": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "dictionaryOrder": {
-                      "index": 0,
-                      "priority": 0
-                    },
-                    "expression": "打つ",
-                    "reading": "ぶつ",
-                    "hasReading": true,
-                    "frequency": 7
-                  }
-                ],
-                "pitches": []
-              }
-            ],
-            "glossary": [
-              "definition9",
-              "definition10"
+            "index": 1,
+            "headwordIndices": [
+              1
             ],
-            "definitionTags": [
+            "dictionary": "Test Dictionary 2",
+            "tags": [
               {
                 "name": "tag1",
                 "category": "category1",
-                "notes": "tag1 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag1 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag2",
                 "category": "category2",
-                "notes": "tag2 notes",
-                "order": 0,
-                "score": 0,
-                "dictionary": "Test Dictionary 2",
-                "redundant": false
-              }
-            ],
-            "definitions": [
-              {
-                "type": "term",
-                "id": 5,
-                "source": "うち",
-                "rawSource": "うち",
-                "sourceTerm": "うつ",
-                "reasons": [],
-                "score": 10,
-                "isPrimary": false,
-                "sequence": 3,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "dictionaryNames": [
-                  "Test Dictionary 2"
-                ],
-                "expression": "打つ",
-                "reading": "ぶつ",
-                "expressions": [
-                  {
-                    "sourceTerm": "うつ",
-                    "expression": "打つ",
-                    "reading": "ぶつ",
-                    "termTags": [
-                      {
-                        "name": "tag3",
-                        "category": "category3",
-                        "notes": "tag3 notes",
-                        "order": 0,
-                        "score": 0,
-                        "dictionary": "Test Dictionary 2",
-                        "redundant": false
-                      },
-                      {
-                        "name": "tag4",
-                        "category": "category4",
-                        "notes": "tag4 notes",
-                        "order": 0,
-                        "score": 0,
-                        "dictionary": "Test Dictionary 2",
-                        "redundant": false
-                      },
-                      {
-                        "name": "tag5",
-                        "category": "category5",
-                        "notes": "tag5 notes",
-                        "order": 0,
-                        "score": 0,
-                        "dictionary": "Test Dictionary 2",
-                        "redundant": false
-                      }
-                    ],
-                    "frequencies": [
-                      {
-                        "index": 0,
-                        "expressionIndex": 0,
-                        "dictionary": "Test Dictionary 2",
-                        "dictionaryOrder": {
-                          "index": 0,
-                          "priority": 0
-                        },
-                        "expression": "打つ",
-                        "reading": "ぶつ",
-                        "hasReading": false,
-                        "frequency": 2
-                      },
-                      {
-                        "index": 1,
-                        "expressionIndex": 0,
-                        "dictionary": "Test Dictionary 2",
-                        "dictionaryOrder": {
-                          "index": 0,
-                          "priority": 0
-                        },
-                        "expression": "打つ",
-                        "reading": "ぶつ",
-                        "hasReading": true,
-                        "frequency": 7
-                      }
-                    ],
-                    "pitches": []
-                  }
-                ],
-                "glossary": [
-                  "definition9",
-                  "definition10"
-                ],
-                "definitionTags": [
-                  {
-                    "name": "tag1",
-                    "category": "category1",
-                    "notes": "tag1 notes",
-                    "order": 0,
-                    "score": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "redundant": false
-                  },
-                  {
-                    "name": "tag2",
-                    "category": "category2",
-                    "notes": "tag2 notes",
-                    "order": 0,
-                    "score": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "redundant": false
-                  }
-                ],
-                "termTags": [
-                  {
-                    "name": "tag3",
-                    "category": "category3",
-                    "notes": "tag3 notes",
-                    "order": 0,
-                    "score": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "redundant": false
-                  },
-                  {
-                    "name": "tag4",
-                    "category": "category4",
-                    "notes": "tag4 notes",
-                    "order": 0,
-                    "score": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "redundant": false
-                  },
-                  {
-                    "name": "tag5",
-                    "category": "category5",
-                    "notes": "tag5 notes",
-                    "order": 0,
-                    "score": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "redundant": false
-                  }
-                ],
-                "frequencies": [
-                  {
-                    "index": 0,
-                    "expressionIndex": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "dictionaryOrder": {
-                      "index": 0,
-                      "priority": 0
-                    },
-                    "expression": "打つ",
-                    "reading": "ぶつ",
-                    "hasReading": false,
-                    "frequency": 2
-                  },
-                  {
-                    "index": 1,
-                    "expressionIndex": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "dictionaryOrder": {
-                      "index": 0,
-                      "priority": 0
-                    },
-                    "expression": "打つ",
-                    "reading": "ぶつ",
-                    "hasReading": true,
-                    "frequency": 7
-                  }
-                ],
-                "pitches": [],
-                "sourceTermExactMatchCount": 0
-              }
-            ],
-            "frequencies": [
-              {
-                "index": 0,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打つ",
-                "reading": "ぶつ",
-                "hasReading": false,
-                "frequency": 2
-              },
-              {
-                "index": 1,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打つ",
-                "reading": "ぶつ",
-                "hasReading": true,
-                "frequency": 7
-              }
-            ],
-            "pitches": [],
-            "only": [
-              "ぶつ"
-            ],
-            "sourceTermExactMatchCount": 0
+                "order": 0,
+                "score": 0,
+                "content": [
+                  "tag2 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
+                "redundant": false
+              }
+            ],
+            "entries": [
+              "definition9",
+              "definition10"
+            ]
           },
           {
-            "type": "termMergedByGlossary",
-            "source": "うち",
-            "rawSource": "うち",
-            "reasons": [],
-            "score": 1,
-            "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "dictionaryNames": [
-              "Test Dictionary 2"
-            ],
-            "expression": [
-              "打つ"
-            ],
-            "reading": [
-              "うつ"
-            ],
-            "expressions": [
-              {
-                "sourceTerm": "うつ",
-                "expression": "打つ",
-                "reading": "うつ",
-                "termTags": [
-                  {
-                    "name": "tag3",
-                    "category": "category3",
-                    "notes": "tag3 notes",
-                    "order": 0,
-                    "score": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "redundant": false
-                  },
-                  {
-                    "name": "tag4",
-                    "category": "category4",
-                    "notes": "tag4 notes",
-                    "order": 0,
-                    "score": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "redundant": false
-                  },
-                  {
-                    "name": "tag5",
-                    "category": "category5",
-                    "notes": "tag5 notes",
-                    "order": 0,
-                    "score": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "redundant": false
-                  }
-                ],
-                "frequencies": [
-                  {
-                    "index": 0,
-                    "expressionIndex": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "dictionaryOrder": {
-                      "index": 0,
-                      "priority": 0
-                    },
-                    "expression": "打つ",
-                    "reading": "うつ",
-                    "hasReading": false,
-                    "frequency": 2
-                  },
-                  {
-                    "index": 1,
-                    "expressionIndex": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "dictionaryOrder": {
-                      "index": 0,
-                      "priority": 0
-                    },
-                    "expression": "打つ",
-                    "reading": "うつ",
-                    "hasReading": true,
-                    "frequency": 6
-                  }
-                ],
-                "pitches": []
-              }
-            ],
-            "glossary": [
-              "definition7",
-              "definition8"
+            "index": 2,
+            "headwordIndices": [
+              0
             ],
-            "definitionTags": [
+            "dictionary": "Test Dictionary 2",
+            "tags": [
               {
                 "name": "tag1",
                 "category": "category1",
-                "notes": "tag1 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag1 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag2",
                 "category": "category2",
-                "notes": "tag2 notes",
-                "order": 0,
-                "score": 0,
-                "dictionary": "Test Dictionary 2",
-                "redundant": false
-              }
-            ],
-            "definitions": [
-              {
-                "type": "term",
-                "id": 4,
-                "source": "うち",
-                "rawSource": "うち",
-                "sourceTerm": "うつ",
-                "reasons": [
-                  "masu stem"
-                ],
-                "score": 1,
-                "isPrimary": true,
-                "sequence": 3,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "dictionaryNames": [
-                  "Test Dictionary 2"
-                ],
-                "expression": "打つ",
-                "reading": "うつ",
-                "expressions": [
-                  {
-                    "sourceTerm": "うつ",
-                    "expression": "打つ",
-                    "reading": "うつ",
-                    "termTags": [
-                      {
-                        "name": "tag3",
-                        "category": "category3",
-                        "notes": "tag3 notes",
-                        "order": 0,
-                        "score": 0,
-                        "dictionary": "Test Dictionary 2",
-                        "redundant": false
-                      },
-                      {
-                        "name": "tag4",
-                        "category": "category4",
-                        "notes": "tag4 notes",
-                        "order": 0,
-                        "score": 0,
-                        "dictionary": "Test Dictionary 2",
-                        "redundant": false
-                      },
-                      {
-                        "name": "tag5",
-                        "category": "category5",
-                        "notes": "tag5 notes",
-                        "order": 0,
-                        "score": 0,
-                        "dictionary": "Test Dictionary 2",
-                        "redundant": false
-                      }
-                    ],
-                    "frequencies": [
-                      {
-                        "index": 0,
-                        "expressionIndex": 0,
-                        "dictionary": "Test Dictionary 2",
-                        "dictionaryOrder": {
-                          "index": 0,
-                          "priority": 0
-                        },
-                        "expression": "打つ",
-                        "reading": "うつ",
-                        "hasReading": false,
-                        "frequency": 2
-                      },
-                      {
-                        "index": 1,
-                        "expressionIndex": 0,
-                        "dictionary": "Test Dictionary 2",
-                        "dictionaryOrder": {
-                          "index": 0,
-                          "priority": 0
-                        },
-                        "expression": "打つ",
-                        "reading": "うつ",
-                        "hasReading": true,
-                        "frequency": 6
-                      }
-                    ],
-                    "pitches": []
-                  }
-                ],
-                "glossary": [
-                  "definition7",
-                  "definition8"
-                ],
-                "definitionTags": [
-                  {
-                    "name": "tag1",
-                    "category": "category1",
-                    "notes": "tag1 notes",
-                    "order": 0,
-                    "score": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "redundant": false
-                  },
-                  {
-                    "name": "tag2",
-                    "category": "category2",
-                    "notes": "tag2 notes",
-                    "order": 0,
-                    "score": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "redundant": false
-                  }
-                ],
-                "termTags": [
-                  {
-                    "name": "tag3",
-                    "category": "category3",
-                    "notes": "tag3 notes",
-                    "order": 0,
-                    "score": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "redundant": false
-                  },
-                  {
-                    "name": "tag4",
-                    "category": "category4",
-                    "notes": "tag4 notes",
-                    "order": 0,
-                    "score": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "redundant": false
-                  },
-                  {
-                    "name": "tag5",
-                    "category": "category5",
-                    "notes": "tag5 notes",
-                    "order": 0,
-                    "score": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "redundant": false
-                  }
-                ],
-                "frequencies": [
-                  {
-                    "index": 0,
-                    "expressionIndex": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "dictionaryOrder": {
-                      "index": 0,
-                      "priority": 0
-                    },
-                    "expression": "打つ",
-                    "reading": "うつ",
-                    "hasReading": false,
-                    "frequency": 2
-                  },
-                  {
-                    "index": 1,
-                    "expressionIndex": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "dictionaryOrder": {
-                      "index": 0,
-                      "priority": 0
-                    },
-                    "expression": "打つ",
-                    "reading": "うつ",
-                    "hasReading": true,
-                    "frequency": 6
-                  }
-                ],
-                "pitches": [],
-                "sourceTermExactMatchCount": 0
-              }
-            ],
-            "frequencies": [
-              {
-                "index": 0,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打つ",
-                "reading": "うつ",
-                "hasReading": false,
-                "frequency": 2
-              },
-              {
-                "index": 1,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打つ",
-                "reading": "うつ",
-                "hasReading": true,
-                "frequency": 6
-              }
-            ],
-            "pitches": [],
-            "only": [
-              "うつ"
-            ],
-            "sourceTermExactMatchCount": 0
+                "order": 0,
+                "score": 0,
+                "content": [
+                  "tag2 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
+                "redundant": false
+              }
+            ],
+            "entries": [
+              "definition7",
+              "definition8"
+            ]
           },
           {
-            "type": "termMergedByGlossary",
-            "source": "うち",
-            "rawSource": "うち",
-            "reasons": [],
-            "score": 1,
-            "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "dictionaryNames": [
-              "Test Dictionary 2"
-            ],
-            "expression": [
-              "打つ"
-            ],
-            "reading": [
-              "ぶつ"
-            ],
-            "expressions": [
-              {
-                "sourceTerm": "うつ",
-                "expression": "打つ",
-                "reading": "ぶつ",
-                "termTags": [
-                  {
-                    "name": "tag3",
-                    "category": "category3",
-                    "notes": "tag3 notes",
-                    "order": 0,
-                    "score": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "redundant": false
-                  },
-                  {
-                    "name": "tag4",
-                    "category": "category4",
-                    "notes": "tag4 notes",
-                    "order": 0,
-                    "score": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "redundant": false
-                  },
-                  {
-                    "name": "tag5",
-                    "category": "category5",
-                    "notes": "tag5 notes",
-                    "order": 0,
-                    "score": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "redundant": false
-                  }
-                ],
-                "frequencies": [
-                  {
-                    "index": 0,
-                    "expressionIndex": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "dictionaryOrder": {
-                      "index": 0,
-                      "priority": 0
-                    },
-                    "expression": "打つ",
-                    "reading": "ぶつ",
-                    "hasReading": false,
-                    "frequency": 2
-                  },
-                  {
-                    "index": 1,
-                    "expressionIndex": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "dictionaryOrder": {
-                      "index": 0,
-                      "priority": 0
-                    },
-                    "expression": "打つ",
-                    "reading": "ぶつ",
-                    "hasReading": true,
-                    "frequency": 7
-                  }
-                ],
-                "pitches": []
-              }
-            ],
-            "glossary": [
-              "definition11",
-              "definition12"
+            "index": 3,
+            "headwordIndices": [
+              1
             ],
-            "definitionTags": [
+            "dictionary": "Test Dictionary 2",
+            "tags": [
               {
                 "name": "tag1",
                 "category": "category1",
-                "notes": "tag1 notes",
                 "order": 0,
                 "score": 0,
-                "dictionary": "Test Dictionary 2",
+                "content": [
+                  "tag1 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
                 "redundant": false
               },
               {
                 "name": "tag2",
                 "category": "category2",
-                "notes": "tag2 notes",
-                "order": 0,
-                "score": 0,
-                "dictionary": "Test Dictionary 2",
-                "redundant": false
-              }
-            ],
-            "definitions": [
-              {
-                "type": "term",
-                "id": 6,
-                "source": "うち",
-                "rawSource": "うち",
-                "sourceTerm": "うつ",
-                "reasons": [],
-                "score": 1,
-                "isPrimary": false,
-                "sequence": 3,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "dictionaryNames": [
-                  "Test Dictionary 2"
-                ],
-                "expression": "打つ",
-                "reading": "ぶつ",
-                "expressions": [
-                  {
-                    "sourceTerm": "うつ",
-                    "expression": "打つ",
-                    "reading": "ぶつ",
-                    "termTags": [
-                      {
-                        "name": "tag3",
-                        "category": "category3",
-                        "notes": "tag3 notes",
-                        "order": 0,
-                        "score": 0,
-                        "dictionary": "Test Dictionary 2",
-                        "redundant": false
-                      },
-                      {
-                        "name": "tag4",
-                        "category": "category4",
-                        "notes": "tag4 notes",
-                        "order": 0,
-                        "score": 0,
-                        "dictionary": "Test Dictionary 2",
-                        "redundant": false
-                      },
-                      {
-                        "name": "tag5",
-                        "category": "category5",
-                        "notes": "tag5 notes",
-                        "order": 0,
-                        "score": 0,
-                        "dictionary": "Test Dictionary 2",
-                        "redundant": false
-                      }
-                    ],
-                    "frequencies": [
-                      {
-                        "index": 0,
-                        "expressionIndex": 0,
-                        "dictionary": "Test Dictionary 2",
-                        "dictionaryOrder": {
-                          "index": 0,
-                          "priority": 0
-                        },
-                        "expression": "打つ",
-                        "reading": "ぶつ",
-                        "hasReading": false,
-                        "frequency": 2
-                      },
-                      {
-                        "index": 1,
-                        "expressionIndex": 0,
-                        "dictionary": "Test Dictionary 2",
-                        "dictionaryOrder": {
-                          "index": 0,
-                          "priority": 0
-                        },
-                        "expression": "打つ",
-                        "reading": "ぶつ",
-                        "hasReading": true,
-                        "frequency": 7
-                      }
-                    ],
-                    "pitches": []
-                  }
-                ],
-                "glossary": [
-                  "definition11",
-                  "definition12"
-                ],
-                "definitionTags": [
-                  {
-                    "name": "tag1",
-                    "category": "category1",
-                    "notes": "tag1 notes",
-                    "order": 0,
-                    "score": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "redundant": false
-                  },
-                  {
-                    "name": "tag2",
-                    "category": "category2",
-                    "notes": "tag2 notes",
-                    "order": 0,
-                    "score": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "redundant": false
-                  }
-                ],
-                "termTags": [
-                  {
-                    "name": "tag3",
-                    "category": "category3",
-                    "notes": "tag3 notes",
-                    "order": 0,
-                    "score": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "redundant": false
-                  },
-                  {
-                    "name": "tag4",
-                    "category": "category4",
-                    "notes": "tag4 notes",
-                    "order": 0,
-                    "score": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "redundant": false
-                  },
-                  {
-                    "name": "tag5",
-                    "category": "category5",
-                    "notes": "tag5 notes",
-                    "order": 0,
-                    "score": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "redundant": false
-                  }
-                ],
-                "frequencies": [
-                  {
-                    "index": 0,
-                    "expressionIndex": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "dictionaryOrder": {
-                      "index": 0,
-                      "priority": 0
-                    },
-                    "expression": "打つ",
-                    "reading": "ぶつ",
-                    "hasReading": false,
-                    "frequency": 2
-                  },
-                  {
-                    "index": 1,
-                    "expressionIndex": 0,
-                    "dictionary": "Test Dictionary 2",
-                    "dictionaryOrder": {
-                      "index": 0,
-                      "priority": 0
-                    },
-                    "expression": "打つ",
-                    "reading": "ぶつ",
-                    "hasReading": true,
-                    "frequency": 7
-                  }
-                ],
-                "pitches": [],
-                "sourceTermExactMatchCount": 0
-              }
-            ],
-            "frequencies": [
-              {
-                "index": 0,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打つ",
-                "reading": "ぶつ",
-                "hasReading": false,
-                "frequency": 2
-              },
-              {
-                "index": 1,
-                "expressionIndex": 0,
-                "dictionary": "Test Dictionary 2",
-                "dictionaryOrder": {
-                  "index": 0,
-                  "priority": 0
-                },
-                "expression": "打つ",
-                "reading": "ぶつ",
-                "hasReading": true,
-                "frequency": 7
-              }
-            ],
-            "pitches": [],
-            "only": [
-              "ぶつ"
-            ],
-            "sourceTermExactMatchCount": 0
+                "order": 0,
+                "score": 0,
+                "content": [
+                  "tag2 notes"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
+                "redundant": false
+              }
+            ],
+            "entries": [
+              "definition11",
+              "definition12"
+            ]
           }
         ],
+        "pronunciations": [],
         "frequencies": [
           {
             "index": 0,
-            "expressionIndex": 0,
+            "headwordIndex": 0,
             "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "expression": "打つ",
-            "reading": "うつ",
+            "dictionaryIndex": 0,
+            "dictionaryPriority": 0,
             "hasReading": false,
             "frequency": 2
           },
           {
             "index": 2,
-            "expressionIndex": 0,
+            "headwordIndex": 0,
             "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "expression": "打つ",
-            "reading": "うつ",
+            "dictionaryIndex": 0,
+            "dictionaryPriority": 0,
             "hasReading": true,
             "frequency": 6
           },
           {
             "index": 1,
-            "expressionIndex": 1,
+            "headwordIndex": 1,
             "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "expression": "打つ",
-            "reading": "ぶつ",
+            "dictionaryIndex": 0,
+            "dictionaryPriority": 0,
             "hasReading": false,
             "frequency": 2
           },
           {
             "index": 3,
-            "expressionIndex": 1,
+            "headwordIndex": 1,
             "dictionary": "Test Dictionary 2",
-            "dictionaryOrder": {
-              "index": 0,
-              "priority": 0
-            },
-            "expression": "打つ",
-            "reading": "ぶつ",
+            "dictionaryIndex": 0,
+            "dictionaryPriority": 0,
             "hasReading": true,
             "frequency": 7
           }
-        ],
-        "pitches": [],
-        "sourceTermExactMatchCount": 0
+        ]
       }
     ]
   }