diff --git a/src/templates/sheets/actor/character-sheet.hbs b/src/templates/sheets/actor/character-sheet.hbs
index b2a2415..b5d23ca 100644
--- a/src/templates/sheets/actor/character-sheet.hbs
+++ b/src/templates/sheets/actor/character-sheet.hbs
@@ -9,12 +9,12 @@ SPDX-License-Identifier: MIT
 <form class="{{cssClass}} flexcol" autocomplete="off">
     {{!-- Sheet Header --}}
     <header class="sheet-header">
-        <img class="profile-img" src="{{actor.img}}" data-edit="img" alt="Actor Icon" title="{{actor.name}}"
+        <img class="profile-img" src="{{data.img}}" data-edit="img" alt="Actor Icon" title="{{data.name}}"
             height="100" width="100" />
         <div class="header-fields flexrow">
             <h1 class="charname">
-                <label for="actor.name" class="hidden">Name</label>
-                <input name="name" type="text" id="actor.name" value="{{actor.name}}" placeholder="Name" />
+                <label for="name" class="hidden">Name</label>
+                <input name="name" type="text" id="name" value="{{data.name}}" placeholder="Name" />
             </h1>
             {{> systems/ds4/templates/sheets/actor/components/character-progression.hbs}}
 
@@ -22,28 +22,28 @@ SPDX-License-Identifier: MIT
                 <div class="basic-property">
                     <label class="basic-property-label"
                         for="data.baseInfo.race">{{config.i18n.characterBaseInfo.race}}</label>
-                    <input type="text" name="data.baseInfo.race" id="data.baseInfo.race" value="{{data.baseInfo.race}}"
-                        data-dtype="String" />
+                    <input type="text" name="data.baseInfo.race" id="data.baseInfo.race"
+                        value="{{data.data.baseInfo.race}}" data-dtype="String" />
                 </div>
                 <div class="basic-property">
                     <label class="basic-property-label"
                         for="data.baseInfo.culture">{{config.i18n.characterBaseInfo.culture}}</label>
                     <input id="data.baseInfo.culture" type="text" name="data.baseInfo.culture"
-                        value="{{data.baseInfo.culture}}" data-dtype="String" />
+                        value="{{data.data.baseInfo.culture}}" data-dtype="String" />
                 </div>
                 <div class="basic-property flex125">
                     <label class="basic-property-label"
                         for="data.progression.progressPoints.used">{{config.i18n.characterProgression.progressPoints}}</label>
                     <div class="flexrow">
                         <input id="data.progression.progressPoints.used" type="number"
-                            name="data.progression.progressPoints.used" value="{{data.progression.progressPoints.used}}"
-                            data-dtype="Number" />
+                            name="data.progression.progressPoints.used"
+                            value="{{data.data.progression.progressPoints.used}}" data-dtype="Number" />
                         <span class="input-divider"> / </span>
                         <label class="hidden" for="data.progression.progressPoints.total">Total
                             Progression Points</label>
                         <input type="number" id="data.progression.progressPoints.total"
                             name="data.progression.progressPoints.total"
-                            value="{{data.progression.progressPoints.total}}" data-dtype="Number" />
+                            value="{{data.data.progression.progressPoints.total}}" data-dtype="Number" />
                     </div>
                 </div>
                 <div class="basic-property flex125">
@@ -51,26 +51,26 @@ SPDX-License-Identifier: MIT
                         for="data.progression.talentPoints.used">{{config.i18n.characterProgression.talentPoints}}</label>
                     <div class="flexrow">
                         <input type="number" name="data.progression.talentPoints.used"
-                            id="data.progression.talentPoints.used" value="{{data.progression.talentPoints.used}}"
+                            id="data.progression.talentPoints.used" value="{{data.data.progression.talentPoints.used}}"
                             data-dtype="Number" />
                         <span class="input-divider"> / </span>
                         <label for="data.progression.talentPoints.total" class="hidden">Total Talent Points</label>
                         <input type="number" name="data.progression.talentPoints.total"
-                            id="data.progression.talentPoints.total" value="{{data.progression.talentPoints.total}}"
-                            data-dtype="Number" />
+                            id="data.progression.talentPoints.total"
+                            value="{{data.data.progression.talentPoints.total}}" data-dtype="Number" />
                     </div>
                 </div>
                 <div class="basic-property">
                     <label class="basic-property-label"
                         for="data.baseInfo.class">{{config.i18n.characterBaseInfo.class}}</label>
                     <input type="text" id="data.baseInfo.class" name="data.baseInfo.class"
-                        value="{{data.baseInfo.class}}" data-dtype="String" />
+                        value="{{data.data.baseInfo.class}}" data-dtype="String" />
                 </div>
                 <div class="basic-property">
                     <label class="basic-property-label"
                         for="data.baseInfo.heroClass">{{config.i18n.characterBaseInfo.heroClass}}</label>
                     <input type="text" id="data.baseInfo.heroClass" name="data.baseInfo.heroClass"
-                        value="{{data.baseInfo.heroClass}}" data-dtype="String" />
+                        value="{{data.data.baseInfo.heroClass}}" data-dtype="String" />
                 </div>
             </div>
         </div>
diff --git a/src/templates/sheets/actor/components/character-progression.hbs b/src/templates/sheets/actor/components/character-progression.hbs
index cb43ed6..9788ea5 100644
--- a/src/templates/sheets/actor/components/character-progression.hbs
+++ b/src/templates/sheets/actor/components/character-progression.hbs
@@ -13,7 +13,8 @@ SPDX-License-Identifier: MIT
                 "DS4.CombatValuesHitPointsCurrentAbbr"}}</label>
         </h2>
         <input class="progression-value" type="number" name="data.combatValues.hitPoints.value"
-            id="data.combatValues.hitPoints.value" value="{{data.combatValues.hitPoints.value}}" data-dtype="Number" />
+            id="data.combatValues.hitPoints.value" value="{{data.data.combatValues.hitPoints.value}}"
+            data-dtype="Number" />
     </div>
     {{#if (eq actor.type "character")}}
     {{#if settings.showSlayerPoints}}
@@ -21,9 +22,9 @@ SPDX-License-Identifier: MIT
         <h2 class="progression-label"><label for="data.slayersPoints.value"
                 title="{{localize 'DS4.CharacterSlayerPoints'}}">{{localize "DS4.CharacterSlayerPointsAbbr"}}</label>
         </h2>
-        <input class="progression-value progression-value--slayer-points" type="number" max="{{data.slayerPoints.max}}"
-            min="0" step="1" name="data.slayerPoints.value" id="data.slayersPoints.value"
-            value="{{data.slayerPoints.value}}" data-dtype="Number" />
+        <input class="progression-value progression-value--slayer-points" type="number"
+            max="{{data.data.slayerPoints.max}}" min="0" step="1" name="data.slayerPoints.value"
+            id="data.slayersPoints.value" value="{{data.data.slayerPoints.value}}" data-dtype="Number" />
     </div>
     {{/if}}
     <div class="progression-entry">
@@ -32,7 +33,7 @@ SPDX-License-Identifier: MIT
                 "DS4.CharacterProgressionLevelAbbr"}}</label>
         </h2>
         <input class="progression-value" type="number" min="0" name="data.progression.level" id="data.progression.level"
-            value="{{data.progression.level}}" data-dtype="Number" />
+            value="{{data.data.progression.level}}" data-dtype="Number" />
     </div>
     <div class="progression-entry">
         <h2 class="progression-label"><label for="data.progression.experiencePoints"
@@ -40,7 +41,8 @@ SPDX-License-Identifier: MIT
                 "DS4.CharacterProgressionExperiencePointsAbbr"}}</label>
         </h2>
         <input class="progression-value" type="number" min="0" name="data.progression.experiencePoints"
-            id="data.progression.experiencePoints" value="{{data.progression.experiencePoints}}" data-dtype="Number" />
+            id="data.progression.experiencePoints" value="{{data.data.progression.experiencePoints}}"
+            data-dtype="Number" />
     </div>
     {{/if}}
 </div>
diff --git a/src/templates/sheets/actor/components/checks.hbs b/src/templates/sheets/actor/components/checks.hbs
index bdffe15..4accdae 100644
--- a/src/templates/sheets/actor/components/checks.hbs
+++ b/src/templates/sheets/actor/components/checks.hbs
@@ -7,6 +7,6 @@ SPDX-License-Identifier: MIT
 <div class="ds4-checks">
     {{#each config.i18n.checks as |check-label check-key|}}
     {{> systems/ds4/templates/sheets/actor/components/check.hbs check-key=check-key check-target-number=(lookup
-    ../data.checks check-key) check-label=check-label}}
+    ../data.data.checks check-key) check-label=check-label}}
     {{/each}}
 </div>
diff --git a/src/templates/sheets/actor/components/combat-values.hbs b/src/templates/sheets/actor/components/combat-values.hbs
index 4c05153..fe0fabc 100644
--- a/src/templates/sheets/actor/components/combat-values.hbs
+++ b/src/templates/sheets/actor/components/combat-values.hbs
@@ -8,6 +8,6 @@ SPDX-License-Identifier: MIT
 <div class="ds4-combat-values">
     {{#each config.i18n.combatValues as |combat-value-label combat-value-key|}}
     {{> systems/ds4/templates/sheets/actor/components/combat-value.hbs combat-value-key=combat-value-key
-    combat-value-data=(lookup ../data.combatValues combat-value-key) combat-value-label=combat-value-label}}
+    combat-value-data=(lookup ../data.data.combatValues combat-value-key) combat-value-label=combat-value-label}}
     {{/each}}
 </div>
diff --git a/src/templates/sheets/actor/components/core-values.hbs b/src/templates/sheets/actor/components/core-values.hbs
index 762624f..e476ce0 100644
--- a/src/templates/sheets/actor/components/core-values.hbs
+++ b/src/templates/sheets/actor/components/core-values.hbs
@@ -8,12 +8,12 @@ SPDX-License-Identifier: MIT
 <div class="ds4-core-values">
     {{#each config.i18n.attributes as |attribute-label attribute-key|}}
     {{> systems/ds4/templates/sheets/actor/components/core-value.hbs core-value-label=attribute-label
-    core-value-key=attribute-key core-value-data=(lookup ../data.attributes
+    core-value-key=attribute-key core-value-data=(lookup ../data.data.attributes
     attribute-key) core-value-variant="attribute"}}
     {{/each}}
     {{#each config.i18n.traits as |trait-label trait-key|}}
     {{> systems/ds4/templates/sheets/actor/components/core-value.hbs core-value-label=trait-label
     core-value-key=trait-key
-    core-value-data=(lookup ../data.traits trait-key) core-value-variant="trait"}}
+    core-value-data=(lookup ../data.data.traits trait-key) core-value-variant="trait"}}
     {{/each}}
 </div>
diff --git a/src/templates/sheets/actor/components/currency.hbs b/src/templates/sheets/actor/components/currency.hbs
index 6cb61f0..99e7019 100644
--- a/src/templates/sheets/actor/components/currency.hbs
+++ b/src/templates/sheets/actor/components/currency.hbs
@@ -8,7 +8,7 @@ SPDX-License-Identifier: MIT
 
 <h4 class="ds4-currency-title">{{localize 'DS4.CharacterCurrency'}}</h4>
 <div class="ds4-currency">
-    {{#each data.currency as |value key|}}
+    {{#each data.data.currency as |value key|}}
     <label for="data.currency.{{key}}" class="flex05">{{lookup ../config.i18n.characterCurrency key}}</label>
     <input class="ds4-currency__value ds4-currency__value--{{key}} item-change" type="number" min="0" step="1"
         name="data.currency.{{key}}" id="data.currency.{{key}}" value="{{value}}" data-dtype="Number" />
diff --git a/src/templates/sheets/actor/creature-sheet.hbs b/src/templates/sheets/actor/creature-sheet.hbs
index fa128d8..1b034bc 100644
--- a/src/templates/sheets/actor/creature-sheet.hbs
+++ b/src/templates/sheets/actor/creature-sheet.hbs
@@ -9,11 +9,11 @@ SPDX-License-Identifier: MIT
 <form class="{{cssClass}} flexcol" autocomplete="off">
     {{!-- Sheet Header --}}
     <header class="sheet-header">
-        <img class="profile-img" src="{{actor.img}}" data-edit="img" title="{{actor.name}}" height="100" width="100" />
+        <img class="profile-img" src="{{data.img}}" data-edit="img" title="{{data.name}}" height="100" width="100" />
         <div class="header-fields flexrow">
             <h1 class="charname">
-                <label for="actor.name" class="hidden">Name</label>
-                <input name="name" type="text" id="actor.name" value="{{actor.name}}" placeholder="Name" />
+                <label for="name" class="hidden">Name</label>
+                <input name="name" type="text" id="name" value="{{data.name}}" placeholder="Name" />
             </h1>
             {{> systems/ds4/templates/sheets/actor/components/character-progression.hbs}}
 
@@ -21,7 +21,7 @@ SPDX-License-Identifier: MIT
                 <div class="basic-property">
                     <label>{{config.i18n.creatureBaseInfo.creatureType}}</label>
                     <select name="data.baseInfo.creatureType" data-type="String">
-                        {{#select data.baseInfo.creatureType}}
+                        {{#select data.data.baseInfo.creatureType}}
                         {{#each config.i18n.creatureTypes as |value key|}}
                         <option value="{{key}}">{{value}}</option>
                         {{/each}}
@@ -31,18 +31,19 @@ SPDX-License-Identifier: MIT
                 <div class="basic-property">
                     <label class="basic-property-label"
                         for="data.baseInfo.loot">{{config.i18n.creatureBaseInfo.loot}}</label>
-                    <input type="text" name="data.baseInfo.loot" value="{{data.baseInfo.loot}}" data-dtype="String" />
+                    <input type="text" name="data.baseInfo.loot" value="{{data.data.baseInfo.loot}}"
+                        data-dtype="String" />
                 </div>
                 <div class="basic-property">
                     <label class="basic-property-label"
                         for="data.baseInfo.foeFactor">{{config.i18n.creatureBaseInfo.foeFactor}}</label>
-                    <input type="text" name="data.baseInfo.foeFactor" value="{{data.baseInfo.foeFactor}}"
+                    <input type="text" name="data.baseInfo.foeFactor" value="{{data.data.baseInfo.foeFactor}}"
                         data-dtype="Number" />
                 </div>
                 <div class="basic-property">
                     <label>{{config.i18n.creatureBaseInfo.sizeCategory}}</label>
                     <select name="data.baseInfo.sizeCategory" data-type="String">
-                        {{#select data.baseInfo.sizeCategory}}
+                        {{#select data.data.baseInfo.sizeCategory}}
                         {{#each config.i18n.creatureSizeCategories as |value key|}}
                         <option value="{{key}}">{{value}}</option>
                         {{/each}}
@@ -52,8 +53,8 @@ SPDX-License-Identifier: MIT
                 <div class="basic-property">
                     <label class="basic-property-label"
                         for="data.baseInfo.experiencePoints">{{config.i18n.creatureBaseInfo.experiencePoints}}</label>
-                    <input type="text" name="data.baseInfo.experiencePoints" value="{{data.baseInfo.experiencePoints}}"
-                        data-dtype="Number" />
+                    <input type="text" name="data.baseInfo.experiencePoints"
+                        value="{{data.data.baseInfo.experiencePoints}}" data-dtype="Number" />
                 </div>
             </div>
         </div>
diff --git a/src/templates/sheets/actor/tabs/biography.hbs b/src/templates/sheets/actor/tabs/biography.hbs
index ee49b3b..42e2612 100644
--- a/src/templates/sheets/actor/tabs/biography.hbs
+++ b/src/templates/sheets/actor/tabs/biography.hbs
@@ -5,6 +5,6 @@ SPDX-License-Identifier: MIT
 --}}
 
 <div class="tab biography" data-group="primary" data-tab="biography">
-    {{editor content=data.profile.biography target="data.profile.biography" button=true owner=owner
+    {{editor content=data.data.profile.biography target="data.profile.biography" button=true owner=owner
     editable=editable}}
 </div>
diff --git a/src/templates/sheets/actor/tabs/profile.hbs b/src/templates/sheets/actor/tabs/profile.hbs
index 5c5db70..4cabb45 100644
--- a/src/templates/sheets/actor/tabs/profile.hbs
+++ b/src/templates/sheets/actor/tabs/profile.hbs
@@ -7,7 +7,7 @@ SPDX-License-Identifier: MIT
 
 <div class="tab profile" data-group="primary" data-tab="profile">
     <div class="grid grid-2col">
-        {{#each data.profile as |profile-data-value profile-data-key|}}
+        {{#each data.data.profile as |profile-data-value profile-data-key|}}
         {{#if (and (ne profile-data-key 'biography') (ne profile-data-key 'specialCharacteristics'))}}
         <div class="profile-entry">
             <label for="data.profile.{{profile-data-key}}">
@@ -23,7 +23,7 @@ SPDX-License-Identifier: MIT
                 {{lookup config.i18n.characterProfile 'specialCharacteristics'}}
             </label>
             <textarea name="data.profile.specialCharacteristics" data-dtype="String"
-                rows="4">{{data.profile.specialCharacteristics}}</textarea>
+                rows="4">{{data.data.profile.specialCharacteristics}}</textarea>
         </div>
     </div>
 </div>
diff --git a/src/templates/sheets/item/components/sheet-header.hbs b/src/templates/sheets/item/components/sheet-header.hbs
index 7d84e2b..50bed6b 100644
--- a/src/templates/sheets/item/components/sheet-header.hbs
+++ b/src/templates/sheets/item/components/sheet-header.hbs
@@ -6,9 +6,9 @@ SPDX-License-Identifier: MIT
 --}}
 
 <header class="sheet-header">
-    <img class="profile-img" src="{{item.img}}" data-edit="img" title="{{item.name}}" />
+    <img class="profile-img" src="{{data.img}}" data-edit="img" title="{{data.name}}" />
     <div class="header-fields flexrow">
-        <h1 class="charname"><input name="name" type="text" value="{{item.name}}" placeholder="Name" /></h1>
+        <h1 class="charname"><input name="name" type="text" value="{{data.name}}" placeholder="Name" /></h1>
         <h2 class="item-type">{{lookup config.i18n.itemTypes item.type}}</h2>
         {{> @partial-block}}
     </div>