diff --git a/src/main.ts b/src/main.ts
index 8b76a8f..a5b44cc 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -79,10 +79,10 @@ function addActorSheetActionButton(
 }
 
 async function generate(actor: Actor & any, docBuilder: AbstractBuilder) {
-  const actorData = actor.data;
+  const actorData = actor;
   // @ts-ignore
-  const actorDetails = actorData.data.details;
-  const actorStatus = actorData.data.status;
+  const actorDetails = actorData.system.details;
+  const actorStatus = actorData.system.status;
   const actorCharacs = actor.characteristics;
   const actorImage = actor.img;
   let actorImageData: string | null = null;
@@ -91,8 +91,8 @@ async function generate(actor: Actor & any, docBuilder: AbstractBuilder) {
     actorImageData = ImageHelper.textureToImage(texture);
   }
   const currentCareer: Item & any = actor.currentCareer;
-  const careerData: ItemData = currentCareer?.data;
-  const careerDetail: any = careerData?.data;
+  const careerData: ItemData & any = currentCareer;
+  const careerDetail: any = careerData?.system;
 
   const skills = new LabelledValues(
     docBuilder.getGenerateType(),
@@ -102,7 +102,7 @@ async function generate(actor: Actor & any, docBuilder: AbstractBuilder) {
       .map((item) => {
         return {
           label: `${item.name} (${i18nLocalize(item.characteristic.abrev)})`,
-          value: item.data.data.total.value,
+          value: item.system.total.value,
         };
       })
       .sort((a, b) => a.label.localeCompare(b.label)),
@@ -116,7 +116,7 @@ async function generate(actor: Actor & any, docBuilder: AbstractBuilder) {
   actor.itemCategories.talent.forEach((item) => {
     const name = item.name;
     if (talentsByName[name] == null) {
-      talentsByName[name] = { count: 1, test: item.data.data.tests.value };
+      talentsByName[name] = { count: 1, test: item.system.tests.value };
     } else {
       talentsByName[name].count++;
     }
@@ -158,7 +158,7 @@ async function generate(actor: Actor & any, docBuilder: AbstractBuilder) {
       .filter((w) => w.isMelee)
       .map((item) => {
         return `${item.name} : ${item.WeaponGroup}, ${item.Reach}, ${
-          item.data.data.damage.meleeValue
+          item.system.damage.meleeValue
         } (${item.mountDamage}), ${item.OriginalQualities.concat(
           item.OriginalFlaws
         ).join(', ')}`;
@@ -176,8 +176,8 @@ async function generate(actor: Actor & any, docBuilder: AbstractBuilder) {
       .filter((w) => w.isRanged)
       .map((item) => {
         return `${item.name} : ${item.WeaponGroup}, ${
-          item.data.data.range.value
-        } (${item.Range}), ${item.data.data.damage.rangedValue} (${
+          item.system.range.value
+        } (${item.Range}), ${item.system.damage.rangedValue} (${
           item.Damage
         }), ${item.OriginalQualities.concat(item.OriginalFlaws).join(', ')}`;
       })
@@ -192,14 +192,12 @@ async function generate(actor: Actor & any, docBuilder: AbstractBuilder) {
     0,
     Util.getActorItems(actor, 'ammunition')
       .map((item) => {
-        return `${item.data.data.quantity.value} ${item.name} : ${
-          item.data.data.range.value.length > 0
-            ? item.data.data.range.value
+        return `${item.system.quantity.value} ${item.name} : ${
+          item.system.range.value.length > 0
+            ? item.system.range.value
             : 'As Weapon'
         }, ${
-          item.data.data.damage.value.length > 0
-            ? item.data.data.damage.value
-            : '+0'
+          item.system.damage.value.length > 0 ? item.system.damage.value : '+0'
         }, ${item.OriginalQualities.concat(item.OriginalFlaws).join(', ')}`;
       })
       .sort((a, b) => a.localeCompare(b)),
@@ -210,7 +208,7 @@ async function generate(actor: Actor & any, docBuilder: AbstractBuilder) {
   const armourLocation: string[] = [];
   const armourLabels: { [key: string]: string[] } = {};
   for (const armour of Util.getActorItems(actor, 'armour')) {
-    const maxAp = armour.data.data.maxAP;
+    const maxAp = armour.system.maxAP;
     for (const key of Object.keys(maxAp)) {
       if (maxAp[key] > 0) {
         if (!armourLocation.includes(key)) {