diff --git a/images/icons/icon_ability.webp b/images/icons/icon_ability.webp
new file mode 100644
index 0000000..1986d5c
Binary files /dev/null and b/images/icons/icon_ability.webp differ
diff --git a/images/icons/icon_armor.webp b/images/icons/icon_armor.webp
new file mode 100644
index 0000000..f9651dc
Binary files /dev/null and b/images/icons/icon_armor.webp differ
diff --git a/images/icons/icon_weapon.webp b/images/icons/icon_weapon.webp
new file mode 100644
index 0000000..cefdebd
Binary files /dev/null and b/images/icons/icon_weapon.webp differ
diff --git a/modules/pegasus-actor-sheet.js b/modules/pegasus-actor-sheet.js
index a5f2840..aea5c22 100644
--- a/modules/pegasus-actor-sheet.js
+++ b/modules/pegasus-actor-sheet.js
@@ -25,9 +25,8 @@ export class PegasusActorSheet extends ActorSheet {
 
   /* -------------------------------------------- */
   async getData() {
-    const objectData = PegasusUtility.data(this.object);
-    
-    let actorData = duplicate(PegasusUtility.templateData(this.object));
+    const objectData = this.object    
+    let actorData = duplicate(this.object)
 
     let formData = {
       title: this.title,
@@ -37,7 +36,7 @@ export class PegasusActorSheet extends ActorSheet {
       name: objectData.name,
       editable: this.isEditable,
       cssClass: this.isEditable ? "editable" : "locked",
-      data: actorData,
+      data: actorData.system,
       traumaState: this.actor.getTraumaState(),
       effects: this.object.effects.map(e => foundry.utils.deepClone(e.data)),
       limited: this.object.limited,
@@ -87,7 +86,7 @@ export class PegasusActorSheet extends ActorSheet {
 
   /* -------------------------------------------- */
   async rollIDR( itemId, diceValue) { 
-    let item = this.actor.data.items.get( itemId) ?? {name: "Unknown"}
+    let item = this.actor.items.get( itemId) ?? {name: "Unknown"}
     let myRoll = new Roll(diceValue+"x").roll({ async: false })
     await PegasusUtility.showDiceSoNice(myRoll, game.settings.get("core", "rollMode"))
     let chatData = {
@@ -362,10 +361,9 @@ export class PegasusActorSheet extends ActorSheet {
 
   /* -------------------------------------------- */
   async _onDropItem(event, dragData) {
-    console.log(">>>>>> DROPPED!!!!")
-    let item = await PegasusUtility.searchItem( dragData)
+    const item = fromUuidSync(dragData.uuid)
     if (item == undefined) {
-      item = this.actor.items.get( dragData.data._id )
+      item = this.actor.items.get( dragData.uuid )
     }
     let ret = await this.actor.preprocessItem( event, item, true )
     if ( ret ) {
diff --git a/modules/pegasus-actor.js b/modules/pegasus-actor.js
index 524c986..794ebe4 100644
--- a/modules/pegasus-actor.js
+++ b/modules/pegasus-actor.js
@@ -68,7 +68,7 @@ export class PegasusActor extends Actor {
 
     if (this.type == 'character') {
       this.computeNRGHealth();
-      this.data.data.encCapacity = this.getEncumbranceCapacity()
+      this.system.encCapacity = this.getEncumbranceCapacity()
       this.buildContainerTree()
     }
 
@@ -83,80 +83,80 @@ export class PegasusActor extends Actor {
 
   /* -------------------------------------------- */
   getEncumbranceCapacity() {
-    return this.data.data.statistics.str.value * 25
+    return this.system.statistics.str.value * 25
   }
 
   /* -------------------------------------------- */
   getActivePerks() {
-    let perks = this.data.items.filter(item => item.type == 'perk' && item.data.data.active);
+    let perks = this.items.filter(item => item.type == 'perk' && item.system.active);
     return perks;
   }
   /* -------------------------------------------- */
   getAbilities() {
-    let ab = this.data.items.filter(item => item.type == 'ability');
+    let ab = this.items.filter(item => item.type == 'ability');
     return ab;
   }
   /* -------------------------------------------- */
   getPerks() {
-    let comp = this.data.items.filter(item => item.type == 'perk');
+    let comp = this.items.filter(item => item.type == 'perk');
     return comp;
   }
   /* -------------------------------------------- */
   getEffects() {
-    let comp = this.data.items.filter(item => item.type == 'effect');
+    let comp = this.items.filter(item => item.type == 'effect');
     return comp;
   }
   /* -------------------------------------------- */
   getPowers() {
-    let comp = this.data.items.filter(item => item.type == 'power');
+    let comp = this.items.filter(item => item.type == 'power');
     return comp;
   }
   /* -------------------------------------------- */
   getMoneys() {
-    let comp = this.data.items.filter(item => item.type == 'money');
+    let comp = this.items.filter(item => item.type == 'money');
     return comp;
   }
   /* -------------------------------------------- */
   getVirtues() {
-    let comp = this.data.items.filter(item => item.type == 'virtue');
+    let comp = this.items.filter(item => item.type == 'virtue');
     return comp;
   }
   /* -------------------------------------------- */
   getVices() {
-    let comp = this.data.items.filter(item => item.type == 'vice');
+    let comp = this.items.filter(item => item.type == 'vice');
     return comp;
   }
   /* -------------------------------------------- */
   getArmors() {
-    let comp = duplicate(this.data.items.filter(item => item.type == 'armor') || []);
+    let comp = duplicate(this.items.filter(item => item.type == 'armor') || []);
     return comp;
   }
   /* -------------------------------------------- */
   getShields() {
-    let comp = this.data.items.filter(item => item.type == 'shield')
+    let comp = this.items.filter(item => item.type == 'shield')
     return comp;
   }
   getRace() {
-    let race = this.data.items.filter(item => item.type == 'race')
+    let race = this.items.filter(item => item.type == 'race')
     return race[0] ?? [];
   }
   getRole() {
-    let role = this.data.items.filter(item => item.type == 'role')
+    let role = this.items.filter(item => item.type == 'role')
     return role[0] ?? [];
   }
   /* -------------------------------------------- */
   checkAndPrepareEquipment(item) {
-    if (item.data.resistance) {
-      item.data.resistanceDice = PegasusUtility.getDiceFromLevel(item.data.resistance)
+    if (item.system.resistance) {
+      item.system.resistanceDice = PegasusUtility.getDiceFromLevel(item.system.resistance)
     }
-    if (item.data.idr) {
-      item.data.idrDice = PegasusUtility.getDiceFromLevel(item.data.idr)
+    if (item.system.idr) {
+      item.system.idrDice = PegasusUtility.getDiceFromLevel(item.system.idr)
     }
-    if (item.data.damage) {
-      item.data.damageDice = PegasusUtility.getDiceFromLevel(item.data.damage)
+    if (item.system.damage) {
+      item.system.damageDice = PegasusUtility.getDiceFromLevel(item.system.damage)
     }
-    if (item.data.level) {
-      item.data.levelDice = PegasusUtility.getDiceFromLevel(item.data.level)
+    if (item.system.level) {
+      item.system.levelDice = PegasusUtility.getDiceFromLevel(item.system.level)
     }
   }
 
@@ -170,16 +170,16 @@ export class PegasusActor extends Actor {
 
   /* -------------------------------------------- */
   getWeapons() {
-    let comp = duplicate(this.data.items.filter(item => item.type == 'weapon') || []);
+    let comp = duplicate(this.items.filter(item => item.type == 'weapon') || []);
     return comp;
   }
   /* -------------------------------------------- */
   getItemById(id) {
-    let item = this.data.items.find(item => item.id == id);
+    let item = this.items.find(item => item.id == id);
     if (item) {
       item = duplicate(item)
       if (item.type == 'specialisation') {
-        item.data.dice = PegasusUtility.getDiceFromLevel(item.data.level);
+        item.system.dice = PegasusUtility.getDiceFromLevel(item.system.level);
       }
     }
     return item;
@@ -187,9 +187,9 @@ export class PegasusActor extends Actor {
 
   /* -------------------------------------------- */
   getSpecs() {
-    let comp = duplicate(this.data.items.filter(item => item.type == 'specialisation') || []);
+    let comp = duplicate(this.items.filter(item => item.type == 'specialisation') || []);
     for (let c of comp) {
-      c.data.dice = PegasusUtility.getDiceFromLevel(c.data.level);
+      c.system.dice = PegasusUtility.getDiceFromLevel(c.system.level);
     }
     return comp;
   }
@@ -198,10 +198,10 @@ export class PegasusActor extends Actor {
   async manageWorstFear(flag) {
     if (flag) {
       let effect = await PegasusUtility.getEffectFromCompendium("Worst Fear")
-      effect.data.worstfear = true
+      effect.system.worstfear = true
       this.createEmbeddedDocuments('Item', [effect])
     } else {
-      let effect = this.data.items.find(item => item.type == "effect" && item.data.data.worstfear)
+      let effect = this.items.find(item => item.type == "effect" && item.system.worstfear)
       if (effect) {
         this.deleteEmbeddedDocuments('Item', [effect.id])
       }
@@ -211,10 +211,10 @@ export class PegasusActor extends Actor {
   async manageDesires(flag) {
     if (flag) {
       let effect = await PegasusUtility.getEffectFromCompendium("Desires")
-      effect.data.desires = true
+      effect.system.desires = true
       this.createEmbeddedDocuments('Item', [effect])
     } else {
-      let effect = this.data.items.find(item => item.type == "effect" && item.data.data.desires)
+      let effect = this.items.find(item => item.type == "effect" && item.system.desires)
       if (effect) {
         this.deleteEmbeddedDocuments('Item', [effect.id])
       }
@@ -223,32 +223,32 @@ export class PegasusActor extends Actor {
 
   /* -------------------------------------------- */
   getRelevantSpec(statKey) {
-    let comp = duplicate(this.data.items.filter(item => item.type == 'specialisation' && item.data.data.statistic == statKey) || []);
+    let comp = duplicate(this.items.filter(item => item.type == 'specialisation' && item.system.statistic == statKey) || []);
     for (let c of comp) {
-      c.data.dice = PegasusUtility.getDiceFromLevel(c.data.level);
+      c.system.dice = PegasusUtility.getDiceFromLevel(c.system.level);
     }
     return comp;
   }
 
   /* -------------------------------------------- */
   async activatePerk(perkId) {
-    let item = this.data.items.find(item => item.id == perkId);
-    if (item && item.data.data) {
-      let update = { _id: item.id, "data.active": !item.data.data.active };
+    let item = this.items.find(item => item.id == perkId);
+    if (item && item.system) {
+      let update = { _id: item.id, "data.active": !item.system.active };
       await this.updateEmbeddedDocuments('Item', [update]); // Updates one EmbeddedEntity
     }
   }
 
   /* -------------------------------------------- */
   async activateViceOrVirtue(itemId) {
-    let item = this.data.items.find(item => item.id == itemId)
-    if (item && item.data.data) {
-      let nrg = duplicate(this.data.data.nrg)
-      if (!item.data.data.activated) { // Current value
+    let item = this.items.find(item => item.id == itemId)
+    if (item && item.system) {
+      let nrg = duplicate(this.system.nrg)
+      if (!item.system.activated) { // Current value
 
         let effects = []
-        for (let effect of item.data.data.effectsgained) {
-          effect.data.powerId = itemId // Link to the perk, in order to dynamically remove them
+        for (let effect of item.system.effectsgained) {
+          effect.system.powerId = itemId // Link to the perk, in order to dynamically remove them
           effects.push(effect)
         }
         if (effects.length) {
@@ -256,8 +256,8 @@ export class PegasusActor extends Actor {
         }
       } else {
         let toRem = []
-        for (let item of this.data.items) {
-          if (item.type == 'effect' && item.data.data.powerId == itemId) {
+        for (let item of this.items) {
+          if (item.type == 'effect' && item.system.powerId == itemId) {
             toRem.push(item.id)
           }
         }
@@ -265,67 +265,67 @@ export class PegasusActor extends Actor {
           await this.deleteEmbeddedDocuments('Item', toRem)
         }
       }
-      let update = { _id: item.id, "data.activated": !item.data.data.activated }
+      let update = { _id: item.id, "data.activated": !item.system.activated }
       await this.updateEmbeddedDocuments('Item', [update]) // Updates one EmbeddedEntity
     }
   }
 
   /* -------------------------------------------- */
   async activatePower(itemId) {
-    let item = this.data.items.find(item => item.id == itemId)
-    if (item && item.data.data) {
+    let item = this.items.find(item => item.id == itemId)
+    if (item && item.system) {
 
-      let nrg = duplicate(this.data.data.nrg)
-      if (!item.data.data.activated) { // Current value
+      let nrg = duplicate(this.system.nrg)
+      if (!item.system.activated) { // Current value
 
-        if (item.data.data.costspent > nrg.value || item.data.data.costspent > nrg.max) {
+        if (item.system.costspent > nrg.value || item.system.costspent > nrg.max) {
           return ui.notifications.warn("Not enough NRG to activate the Power " + item.name)
         }
 
-        nrg.activated += item.data.data.costspent
-        nrg.value -= item.data.data.costspent
-        nrg.max -= item.data.data.costspent
+        nrg.activated += item.system.costspent
+        nrg.value -= item.system.costspent
+        nrg.max -= item.system.costspent
         await this.update({ 'data.nrg': nrg })
 
         let effects = []
-        for (let effect of item.data.data.effectsgained) {
-          effect.data.powerId = itemId // Link to the perk, in order to dynamically remove them
+        for (let effect of item.system.effectsgained) {
+          effect.system.powerId = itemId // Link to the perk, in order to dynamically remove them
           effects.push(effect)
         }
         if (effects.length) {
           await this.createEmbeddedDocuments('Item', effects)
         }
-        if (item.data.data.activatedtext.length > 0) {
-          ChatMessage.create({ content: `Power ${item.name} activated : ${item.data.data.activatedtext}` })
+        if (item.system.activatedtext.length > 0) {
+          ChatMessage.create({ content: `Power ${item.name} activated : ${item.system.activatedtext}` })
         }
       } else {
-        nrg.activated -= item.data.data.costspent
-        nrg.max += item.data.data.costspent
+        nrg.activated -= item.system.costspent
+        nrg.max += item.system.costspent
         await this.update({ 'data.nrg': nrg })
 
         let toRem = []
-        for (let item of this.data.items) {
-          if (item.type == 'effect' && item.data.data.powerId == itemId) {
+        for (let item of this.items) {
+          if (item.type == 'effect' && item.system.powerId == itemId) {
             toRem.push(item.id)
           }
         }
         if (toRem.length) {
           await this.deleteEmbeddedDocuments('Item', toRem)
         }
-        if (item.data.data.deactivatedtext.length > 0) {
-          ChatMessage.create({ content: `Power ${item.name} deactivated : ${item.data.data.deactivatedtext}` })
+        if (item.system.deactivatedtext.length > 0) {
+          ChatMessage.create({ content: `Power ${item.name} deactivated : ${item.system.deactivatedtext}` })
         }
       }
-      let update = { _id: item.id, "data.activated": !item.data.data.activated }
+      let update = { _id: item.id, "data.activated": !item.system.activated }
       await this.updateEmbeddedDocuments('Item', [update]) // Updates one EmbeddedEntity
     }
   }
 
   /* -------------------------------------------- */
   async equipItem(itemId) {
-    let item = this.data.items.find(item => item.id == itemId);
-    if (item && item.data.data) {
-      let update = { _id: item.id, "data.equipped": !item.data.data.equipped };
+    let item = this.items.find(item => item.id == itemId);
+    if (item && item.system) {
+      let update = { _id: item.id, "data.equipped": !item.system.equipped };
       await this.updateEmbeddedDocuments('Item', [update]); // Updates one EmbeddedEntity
     }
   }
@@ -343,69 +343,69 @@ export class PegasusActor extends Actor {
 
   /* ------------------------------------------- */
   getEquipments() {
-    return this.data.items.filter(item => item.type == 'shield' || item.type == 'armor' || item.type == "weapon" || item.type == "equipment");
+    return this.items.filter(item => item.type == 'shield' || item.type == 'armor' || item.type == "weapon" || item.type == "equipment");
   }
   /* ------------------------------------------- */
   getEquipmentsOnly() {
-    return duplicate(this.data.items.filter(item => item.type == "equipment") || [])
+    return duplicate(this.items.filter(item => item.type == "equipment") || [])
   }
 
   /* ------------------------------------------- */
   computeThreatLevel() {
     let tl = 0
     for (let key of statThreatLevel) { // Init with concerned stats
-      tl += PegasusUtility.getDiceValue(this.data.data.statistics[key].value)
+      tl += PegasusUtility.getDiceValue(this.system.statistics[key].value)
     }
     let powers = duplicate(this.getPowers() || [])
     if (powers.length > 0) { // Then add some mental ones of powers
-      tl += PegasusUtility.getDiceValue(this.data.data.statistics.foc.value)
-      tl += PegasusUtility.getDiceValue(this.data.data.statistics.mnd.value)
+      tl += PegasusUtility.getDiceValue(this.system.statistics.foc.value)
+      tl += PegasusUtility.getDiceValue(this.system.statistics.mnd.value)
     }
-    tl += PegasusUtility.getDiceValue(this.data.data.mr.value)
-    let specThreat = this.data.items.filter(it => it.type == "specialisation" && it.data.data.isthreatlevel) || []
+    tl += PegasusUtility.getDiceValue(this.system.mr.value)
+    let specThreat = this.items.filter(it => it.type == "specialisation" && it.system.isthreatlevel) || []
     for (let spec of specThreat) {
-      tl += PegasusUtility.getDiceValue(spec.data.data.level)
+      tl += PegasusUtility.getDiceValue(spec.system.level)
     }
-    tl += this.data.data.nrg.absolutemax + this.data.data.secondary.health.max + this.data.data.secondary.delirium.max
+    tl += this.system.nrg.absolutemax + this.system.secondary.health.max + this.system.secondary.delirium.max
     tl += this.getPerks().length * 5
 
     let weapons = this.getWeapons()
     for (let weapon of weapons) {
-      tl += PegasusUtility.getDiceValue(weapon.data.damage)
+      tl += PegasusUtility.getDiceValue(weapon.system.damage)
     }
     let armors = this.getArmors()
     for (let armor of armors) {
-      tl += PegasusUtility.getDiceValue(armor.data.resistance)
+      tl += PegasusUtility.getDiceValue(armor.system.resistance)
     }
     let shields = duplicate(this.getShields())
     for (let shield of shields) {
-      tl += PegasusUtility.getDiceValue(shield.data.level)
+      tl += PegasusUtility.getDiceValue(shield.system.level)
     }
     let abilities = duplicate(this.getAbilities())
     for (let ability of abilities) {
-      tl += ability.data.threatlevel
+      tl += ability.system.threatlevel
     }
     let equipments = this.getEquipmentsOnly()
     for (let equip of equipments) {
-      tl += equip.data.threatlevel
+      tl += equip.system.threatlevel
     }
-    if (tl != this.data.data.biodata.threatlevel) {
+    if (tl != this.system.biodata.threatlevel) {
       this.update({ 'data.biodata.threatlevel': tl })
     }
   }
 
   /* ------------------------------------------- */
   async buildContainerTree() {
-    let equipments = duplicate(this.data.items.filter(item => item.type == "equipment") || [])
+    let equipments = duplicate(this.items.filter(item => item.type == "equipment") || [])
     for (let equip1 of equipments) {
-      if (equip1.data.iscontainer) {
-        equip1.data.contents = []
-        equip1.data.contentsEnc = 0
+      if (equip1.system.iscontainer) {
+        equip1.system.contents = []
+        equip1.system.contentsEnc = 0
         for (let equip2 of equipments) {
-          if (equip1._id != equip2._id && equip2.data.containerid == equip1._id) {
-            equip1.data.contents.push(equip2)
-            let q = equip2.data.quantity ?? 1
-            equip1.data.contentsEnc += q * equip2.data.weight
+          if (equip1._id != equip2._id && equip2.system.containerid == equip1._id) {
+            equip1.system.contents.push(equip2)
+            let q = equip2.system.quantity ?? 1
+            equip1.system.contentsEnc += q * equip2.system.weight
           }
         }
       }
@@ -414,37 +414,37 @@ export class PegasusActor extends Actor {
     // Compute whole enc
     let enc = 0
     for (let item of equipments) {
-      item.data.idrDice = PegasusUtility.getDiceFromLevel(Number(item.data.idr))
-      if (item.data.equipped) {
-        if (item.data.iscontainer) {
-          enc += item.data.contentsEnc
-        } else if (item.data.containerid == "") {
-          let q = item.data.quantity ?? 1
-          enc += q * item.data.weight
+      item.system.idrDice = PegasusUtility.getDiceFromLevel(Number(item.system.idr))
+      if (item.system.equipped) {
+        if (item.system.iscontainer) {
+          enc += item.system.contentsEnc
+        } else if (item.system.containerid == "") {
+          let q = item.system.quantity ?? 1
+          enc += q * item.system.weight
         }
       }
     }
-    for (let item of this.data.items) { // Process items/shields/armors
-      if ((item.type == "weapon" || item.type == "shield" || item.type == "armor") && item.data.data.equipped) {
-        let q = item.data.data.quantity ?? 1
-        enc += q * item.data.data.weight
+    for (let item of this.items) { // Process items/shields/armors
+      if ((item.type == "weapon" || item.type == "shield" || item.type == "armor") && item.system.equipped) {
+        let q = item.system.quantity ?? 1
+        enc += q * item.system.weight
       }
     }
 
     // Store local values
     this.encCurrent = enc
-    this.containersTree = equipments.filter(item => item.data.containerid == "") // Returns the root of equipements without container
+    this.containersTree = equipments.filter(item => item.system.containerid == "") // Returns the root of equipements without container
 
     // Manages slow effect
     let overCapacity = Math.floor(this.encCurrent / this.getEncumbranceCapacity())
     this.encHindrance = Math.floor(this.encCurrent / this.getEncumbranceCapacity())
 
     //console.log("Capacity", overCapacity, this.encCurrent / this.getEncumbranceCapacity() )
-    let effect = this.data.items.find(item => item.type == "effect" && item.data.data.slow)
+    let effect = this.items.find(item => item.type == "effect" && item.system.slow)
     if (overCapacity >= 4) {
       if (!effect) {
         effect = await PegasusUtility.getEffectFromCompendium("Slowed")
-        effect.data.slow = true
+        effect.system.slow = true
         this.createEmbeddedDocuments('Item', [effect])
       }
     } else {
@@ -456,7 +456,7 @@ export class PegasusActor extends Actor {
 
   /* -------------------------------------------- */
   modifyStun(incDec) {
-    let combat = duplicate(this.data.data.combat)
+    let combat = duplicate(this.system.combat)
     combat.stunlevel += incDec
     if (combat.stunlevel >= 0) {
       this.update({ 'data.combat': combat })
@@ -479,7 +479,7 @@ export class PegasusActor extends Actor {
       ChatMessage.create({ content: `${this.name} Stun threshold has been exceeded.` })
     }
     if (incDec > 0 && stunAbove > 0) {
-      let delirium = duplicate(this.data.data.secondary.delirium)
+      let delirium = duplicate(this.system.secondary.delirium)
       delirium.value -= incDec
       this.update({ 'data.secondary.delirium': delirium })
     }
@@ -487,7 +487,7 @@ export class PegasusActor extends Actor {
 
   /* -------------------------------------------- */
   modifyMomentum(incDec) {
-    let momentum = duplicate(this.data.data.momentum)
+    let momentum = duplicate(this.system.momentum)
     momentum.value += incDec
     this.update({ 'data.momentum': momentum })
     let chatData = {
@@ -513,7 +513,7 @@ export class PegasusActor extends Actor {
   }
   /* -------------------------------------------- */
   getEffectByLabel(label) {
-    return this.getActiveEffects().find(it => it.data.label == label);
+    return this.getActiveEffects().find(it => it.system.label == label);
   }
   /* -------------------------------------------- */
   getEffectById(id) {
@@ -522,26 +522,26 @@ export class PegasusActor extends Actor {
 
   /* -------------------------------------------- */
   getAttribute(attrKey) {
-    return this.data.data.attributes[attrKey];
+    return this.system.attributes[attrKey];
   }
 
   /* -------------------------------------------- */
   async addObjectToContainer(itemId, containerId) {
-    let container = this.data.items.find(item => item.id == containerId && item.data.data.iscontainer)
-    let object = this.data.items.find(item => item.id == itemId)
+    let container = this.items.find(item => item.id == containerId && item.system.iscontainer)
+    let object = this.items.find(item => item.id == itemId)
     if (container) {
-      if (object.data.data.iscontainer) {
+      if (object.system.iscontainer) {
         ui.notifications.warn("Only 1 level of container allowed")
         return
       }
-      let alreadyInside = this.data.items.filter(item => item.data.data.containerid && item.data.data.containerid == containerId);
-      if (alreadyInside.length >= container.data.data.containercapacity) {
+      let alreadyInside = this.items.filter(item => item.system.containerid && item.system.containerid == containerId);
+      if (alreadyInside.length >= container.system.containercapacity) {
         ui.notifications.warn("Container is already full !")
         return
       } else {
         await this.updateEmbeddedDocuments("Item", [{ _id: object.id, 'data.containerid': containerId }])
       }
-    } else if (object && object.data.data.containerid) { // remove from container
+    } else if (object && object.system.containerid) { // remove from container
       console.log("Removeing: ", object)
       await this.updateEmbeddedDocuments("Item", [{ _id: object.id, 'data.containerid': "" }]);
     }
@@ -550,7 +550,7 @@ export class PegasusActor extends Actor {
   checkVirtue(virtue) {
     let vices = this.getVices()
     for (let vice of vices) {
-      let nonVirtues = vice.data.data.unavailablevirtue
+      let nonVirtues = vice.system.unavailablevirtue
       for (let blockedVirtue of nonVirtues) {
         if (blockedVirtue.name.toLowerCase() == virtue.name.toLowerCase()) {
           return false
@@ -563,7 +563,7 @@ export class PegasusActor extends Actor {
   checkVice(vice) {
     let virtues = this.getVirtues()
     for (let virtue of virtues) {
-      let nonVices = virtue.data.data.unavailablevice
+      let nonVices = virtue.system.unavailablevice
       for (let blockedVice of nonVices) {
         if (blockedVice.name.toLowerCase() == vice.name.toLowerCase()) {
           return false
@@ -577,54 +577,54 @@ export class PegasusActor extends Actor {
   async preprocessItem(event, item, onDrop = false) {
 
     // Pre-filter effects
-    if (item.data.type == 'effect') {
-      if (this.checkMentalDisruption() && item.data.data.type == "mental" && item.data.data.genre == "positive") {
+    if (item.type == 'effect') {
+      if (this.checkMentalDisruption() && item.system.type == "mental" && item.system.genre == "positive") {
         ChatMessage.create({ content: "Effects of this type cannot be applied while Disruption is applied, Use a Soft Action to remove Disruption" })
         return
       }
-      if (this.checkPhysicalDisruption() && item.data.data.type == "physical" && item.data.data.genre == "positive") {
+      if (this.checkPhysicalDisruption() && item.system.type == "physical" && item.system.genre == "positive") {
         ChatMessage.create({ content: "Effects of this type cannot be applied while Disruption is applied, Use a Soft Action to remove Disruption" })
         return
       }
-      if (this.checkMentalImmunity() && item.data.data.type == "mental" && item.data.data.genre == "negative") {
+      if (this.checkMentalImmunity() && item.system.type == "mental" && item.system.genre == "negative") {
         ChatMessage.create({ content: "Effects of this type cannot be applied while Immunity is applied" })
         return
       }
-      if (this.checkPhysicalImmunity() && item.data.data.type == "physical" && item.data.data.genre == "negative") {
+      if (this.checkPhysicalImmunity() && item.system.type == "physical" && item.system.genre == "negative") {
         ChatMessage.create({ content: "Effects of this type cannot be applied while Immunity is applied" })
         return
       }
     }
 
-    if (item.data.type == 'race') {
-      this.applyRace(item.data)
-    } else if (item.data.type == 'role') {
-      this.applyRole(item.data)
-    } else if (item.data.type == 'ability') {
-      this.applyAbility(item.data, [], true)
+    if (item.type == 'race') {
+      this.applyRace(item.system)
+    } else if (item.type == 'role') {
+      this.applyRole(item.system)
+    } else if (item.type == 'ability') {
+      this.applyAbility(item.system, [], true)
       if (!onDrop) {
-        await this.createEmbeddedDocuments('Item', [item.data])
+        await this.createEmbeddedDocuments('Item', [item])
       }
     } else {
       if (!onDrop) {
-        await this.createEmbeddedDocuments('Item', [item.data])
+        await this.createEmbeddedDocuments('Item', [item])
       }
     }
     // Check virtue/vice validity
-    if (item.data.type == "virtue") {
+    if (item.type == "virtue") {
       if (!this.checkVirtue(item)) {
         ui.notifications.info("Virtue is not allowed due to Vice.")
         return false
       }
     }
-    if (item.data.type == "vice") {
+    if (item.type == "vice") {
       if (!this.checkVice(item)) {
         ui.notifications.info("Vice is not allowed due to Virtue.")
         return false
       }
     }
-    if (item.data.type == "power" && item.data.data.purchasedtext.length > 0 ) {
-      ChatMessage.create({ content: `Power ${item.name} puchased : ${item.data.data.purchasedtext}` })
+    if (item.type == "power" && item.system.purchasedtext.length > 0 ) {
+      ChatMessage.create({ content: `Power ${item.name} puchased : ${item.system.purchasedtext}` })
     }
     let dropID = $(event.target).parents(".item").attr("data-item-id") // Only relevant if container drop
     let objectID = item.id || item._id
@@ -634,9 +634,9 @@ export class PegasusActor extends Actor {
 
   /* -------------------------------------------- */
   async equipGear(equipmentId) {
-    let item = this.data.items.find(item => item.id == equipmentId);
-    if (item && item.data.data) {
-      let update = { _id: item.id, "data.equipped": !item.data.data.equipped };
+    let item = this.items.find(item => item.id == equipmentId);
+    if (item && item.system) {
+      let update = { _id: item.id, "data.equipped": !item.system.equipped };
       await this.updateEmbeddedDocuments('Item', [update]); // Updates one EmbeddedEntity
     }
   }
@@ -652,21 +652,21 @@ export class PegasusActor extends Actor {
   /* -------------------------------------------- */
   getSubActors() {
     let subActors = [];
-    for (let id of this.data.data.subactors) {
+    for (let id of this.system.subactors) {
       subActors.push(duplicate(game.actors.get(id)))
     }
     return subActors;
   }
   /* -------------------------------------------- */
   async addSubActor(subActorId) {
-    let subActors = duplicate(this.data.data.subactors);
+    let subActors = duplicate(this.system.subactors);
     subActors.push(subActorId);
     await this.update({ 'data.subactors': subActors });
   }
   /* -------------------------------------------- */
   async delSubActor(subActorId) {
     let newArray = [];
-    for (let id of this.data.data.subactors) {
+    for (let id of this.system.subactors) {
       if (id != subActorId) {
         newArray.push(id);
       }
@@ -688,9 +688,9 @@ export class PegasusActor extends Actor {
   getStat(statKey) {
     let stat
     if (statKey == 'mr') {
-      stat = duplicate(this.data.data.mr);
+      stat = duplicate(this.system.mr);
     } else {
-      stat = duplicate(this.data.data.statistics[statKey]);
+      stat = duplicate(this.system.statistics[statKey]);
     }
     stat.dice = PegasusUtility.getDiceFromLevel(stat.value);
     return stat;
@@ -698,10 +698,10 @@ export class PegasusActor extends Actor {
 
   /* -------------------------------------------- */
   getOneSpec(specId) {
-    let spec = this.data.items.find(item => item.type == 'specialisation' && item.id == specId)
+    let spec = this.items.find(item => item.type == 'specialisation' && item.id == specId)
     if (spec) {
       spec = duplicate(spec);
-      spec.data.dice = PegasusUtility.getDiceFromLevel(spec.data.level);
+      spec.system.dice = PegasusUtility.getDiceFromLevel(spec.system.level);
     }
     return spec;
   }
@@ -711,8 +711,11 @@ export class PegasusActor extends Actor {
     let spec = this.getOneSpec(specId)
     if (spec) {
       let powers = []
-      for (let power of spec.data.powers) {
-        power.data.specId = specId
+      for (let power of spec.system.powers) {
+        if ( power.data ) {
+          power.system = power.data  
+        }
+        power.system.specId = specId
         powers.push(power)
       }
       if (powers.length > 0) {
@@ -725,8 +728,8 @@ export class PegasusActor extends Actor {
   /* -------------------------------------------- */
   specPowerDeactivate(specId) {
     let toRem = []
-    for (let power of this.data.items) {
-      if (power.type == "power" && power.data.data.specId && power.data.data.specId == specId) {
+    for (let power of this.items) {
+      if (power.type == "power" && power.system.specId && power.system.specId == specId) {
         toRem.push(power.id)
       }
     }
@@ -741,8 +744,8 @@ export class PegasusActor extends Actor {
     let item = this.items.get(itemId)
     if (item) {
       let effects = []
-      for (let effect of item.data.data.effects) {
-        effect.data.itemId = itemId // Keep link
+      for (let effect of item.system.effects) {
+        effect.system.itemId = itemId // Keep link
         effects.push(effect)
       }
       if (effects.length > 0) {
@@ -755,8 +758,8 @@ export class PegasusActor extends Actor {
   /* -------------------------------------------- */
   equipDeactivate(itemId) {
     let toRem = []
-    for (let item of this.data.items) {
-      if (item.data.data.itemId && item.data.data.itemId == itemId) {
+    for (let item of this.items) {
+      if (item.system.itemId && item.system.itemId == itemId) {
         toRem.push(item.id)
       }
     }
@@ -780,9 +783,9 @@ export class PegasusActor extends Actor {
 
   /* -------------------------------------------- */
   disableWeaverPerk(perk) {
-    if (perk.data.data.isweaver) {
-      for (let spec of this.data.items) {
-        if (spec.type == 'specialisation' && spec.data.data.ispowergroup) {
+    if (perk.system.isweaver) {
+      for (let spec of this.items) {
+        if (spec.type == 'specialisation' && spec.system.ispowergroup) {
           this.specPowerDeactivate(spec.id)
         }
       }
@@ -791,9 +794,9 @@ export class PegasusActor extends Actor {
 
   /* -------------------------------------------- */
   enableWeaverPerk(perk) {
-    if (perk.data.data.isweaver) {
-      for (let spec of this.data.items) {
-        if (spec.type == 'specialisation' && spec.data.data.ispowergroup) {
+    if (perk.system.isweaver) {
+      for (let spec of this.items) {
+        if (spec.type == 'specialisation' && spec.system.ispowergroup) {
           this.specPowerActivate(spec.id)
         }
       }
@@ -803,8 +806,8 @@ export class PegasusActor extends Actor {
   /* -------------------------------------------- */
   async cleanPerkEffects(itemId) {
     let effects = []
-    for (let item of this.data.items) {
-      if (item.type == "effect" && item.data.data.perkId == itemId) {
+    for (let item of this.items) {
+      if (item.type == "effect" && item.system.perkId == itemId) {
         effects.push(item.id)
       }
     }
@@ -821,13 +824,13 @@ export class PegasusActor extends Actor {
       let key = "data.used" + index
       await this.updateEmbeddedDocuments('Item', [{ _id: itemId, [`${key}`]: checked }])
       item = this.items.get(itemId) // Refresh
-      if (item.data.data.nbuse == "next1action" && item.data.data.used1) {
+      if (item.system.nbuse == "next1action" && item.system.used1) {
         this.cleanPerkEffects(itemId)
       }
-      if (item.data.data.nbuse == "next2action" && item.data.data.used1 && item.data.data.used2) {
+      if (item.system.nbuse == "next2action" && item.system.used1 && item.system.used2) {
         this.cleanPerkEffects(itemId)
       }
-      if (item.data.data.nbuse == "next3action" && item.data.data.used1 && item.data.data.used2 && item.data.data.used3) {
+      if (item.system.nbuse == "next3action" && item.system.used1 && item.system.used2 && item.system.used3) {
         this.cleanPerkEffects(itemId)
       }
     }
@@ -845,7 +848,7 @@ export class PegasusActor extends Actor {
   /* -------------------------------------------- */
   async cleanupPerksIfTrauma() {
     if (this.getTraumaState() == "severetrauma") {
-      for (let perk of this.data.items) {
+      for (let perk of this.items) {
         if (perk.type == "perk") {
           this.cleanPerkEffects(perk.id)
           this.updateEmbeddedDocuments('Item', [{ _id: perk.id, 'data.status': "ready", 'data.used1': false, 'data.used2': false, 'data.used3': false }])
@@ -857,7 +860,7 @@ export class PegasusActor extends Actor {
 
   /* -------------------------------------------- */
   incDecNRG(value) {
-    let nrg = duplicate(this.data.data.nrg)
+    let nrg = duplicate(this.system.nrg)
     nrg.value += value
     if (nrg.value >= 0 && nrg.value <= nrg.max) {
       this.update({ 'data.nrg': nrg })
@@ -869,9 +872,9 @@ export class PegasusActor extends Actor {
     let item = this.items.get(itemId)
     if (item) {
 
-      if (item.data.data.status == status) return;// Ensure we are really changing the status
+      if (item.system.status == status) return;// Ensure we are really changing the status
       if (this.checkNoPerksAllowed()) {
-        await this.updateEmbeddedDocuments('Item', [{ _id: item.id, 'data.status': "ready" }])
+        await this.updateEmbeddedDocuments('Item', [{ _id: item.id, 'system.status': "ready" }])
         ChatMessage.create({ content: "No perks activation allowed due to effect !" })
         return
       }
@@ -888,37 +891,37 @@ export class PegasusActor extends Actor {
           ChatMessage.create(chatData)
           this.severeTraumaMessage = true
         }
-        this.updateEmbeddedDocuments('Item', [{ _id: itemId, 'data.status': "ready", 'data.used1': false, 'data.used2': false, 'data.used3': false }])
+        this.updateEmbeddedDocuments('Item', [{ _id: itemId, 'system.status': "ready", 'system.used1': false, 'system.used2': false, 'system.used3': false }])
         return
       }
 
       let updateOK = true
       if (status == "ready") {
         await this.cleanPerkEffects(itemId)
-        await this.updateEmbeddedDocuments('Item', [{ _id: itemId, 'data.used1': false, 'data.used2': false, 'data.used3': false }])
-        if (item.data.data.features.nrgcost.flag) {
-          let nrg = duplicate(this.data.data.nrg)
-          nrg.activated -= item.data.data.features.nrgcost.value
-          nrg.max += item.data.data.features.nrgcost.value
-          await this.update({ 'data.nrg': nrg })
+        await this.updateEmbeddedDocuments('Item', [{ _id: itemId, 'system.used1': false, 'system.used2': false, 'system.used3': false }])
+        if (item.system.features.nrgcost.flag) {
+          let nrg = duplicate(this.system.nrg)
+          nrg.activated -= item.system.features.nrgcost.value
+          nrg.max += item.system.features.nrgcost.value
+          await this.update({ 'system.nrg': nrg })
         }
-        if (item.data.data.features.bonushealth.flag) {
-          let health = duplicate(this.data.data.secondary.health)
-          health.value -= Number(item.data.data.features.bonushealth.value) || 0
-          health.max -= Number(item.data.data.features.bonushealth.value) || 0
-          await this.update({ 'data.secondary.health': health })
+        if (item.system.features.bonushealth.flag) {
+          let health = duplicate(this.system.secondary.health)
+          health.value -= Number(item.system.features.bonushealth.value) || 0
+          health.max -= Number(item.system.features.bonushealth.value) || 0
+          await this.update({ 'system.secondary.health': health })
         }
-        if (item.data.data.features.bonusdelirium.flag) {
-          let delirium = duplicate(this.data.data.secondary.delirium)
-          delirium.value -= Number(item.data.data.features.bonusdelirium.value) || 0
-          delirium.max -= Number(item.data.data.features.bonusdelirium.value) || 0
-          await this.update({ 'data.secondary.delirium': delirium })
+        if (item.system.features.bonusdelirium.flag) {
+          let delirium = duplicate(this.system.secondary.delirium)
+          delirium.value -= Number(item.system.features.bonusdelirium.value) || 0
+          delirium.max -= Number(item.system.features.bonusdelirium.value) || 0
+          await this.update({ 'system.secondary.delirium': delirium })
         }
-        if (item.data.data.features.bonusnrg.flag) {
-          let nrg = duplicate(this.data.data.nrg)
-          nrg.value -= Number(item.data.data.features.bonusnrg.value) || 0
-          nrg.max -= Number(item.data.data.features.bonusnrg.value) || 0
-          await this.update({ 'data.nrg': nrg })
+        if (item.system.features.bonusnrg.flag) {
+          let nrg = duplicate(this.system.nrg)
+          nrg.value -= Number(item.system.features.bonusnrg.value) || 0
+          nrg.max -= Number(item.system.features.bonusnrg.value) || 0
+          await this.update({ 'system.nrg': nrg })
         }
         this.disableWeaverPerk(item)
         PegasusUtility.createChatWithRollMode(item.name, {
@@ -928,44 +931,47 @@ export class PegasusActor extends Actor {
       if (status == "activated") {
         // Add effects linked to the perk
         let effects = []
-        for (let effect of item.data.data.effectsgained) {
-          effect.data.perkId = itemId // Link to the perk, in order to dynamically remove them
-          effect.data.isUsed = false // Flag to indicate removal when used in a roll window
+        for (let effect of item.system.effectsgained) {          
+          if (effect.data) {
+            effect.system = effect.data
+          }
+          effect.system.perkId = itemId // Link to the perk, in order to dynamically remove them
+          effect.system.isUsed = false // Flag to indicate removal when used in a roll window
           effects.push(effect)
         }
         if (effects.length) {
           await this.createEmbeddedDocuments('Item', effects)
         }
         // Manage additional flags
-        if (item.data.data.features.nrgcost.flag) {
-          if ((this.data.data.nrg.value >= item.data.data.features.nrgcost.value) && (this.data.data.nrg.max >= item.data.data.features.nrgcost.value)) {
-            let nrg = duplicate(this.data.data.nrg)
-            nrg.activated += item.data.data.features.nrgcost.value
-            nrg.value -= item.data.data.features.nrgcost.value
-            nrg.max -= item.data.data.features.nrgcost.value
-            await this.update({ 'data.nrg': nrg })
+        if (item.system.features.nrgcost.flag) {
+          if ((this.system.nrg.value >= item.system.features.nrgcost.value) && (this.system.nrg.max >= item.system.features.nrgcost.value)) {
+            let nrg = duplicate(this.system.nrg)
+            nrg.activated += item.system.features.nrgcost.value
+            nrg.value -= item.system.features.nrgcost.value
+            nrg.max -= item.system.features.nrgcost.value
+            await this.update({ 'system.nrg': nrg })
           } else {
             updateOK = false
             ui.notifications.warn("Not enough NRG to activate the Perk " + item.name)
           }
         }
-        if (item.data.data.features.bonushealth.flag) {
-          let health = duplicate(this.data.data.secondary.health)
-          health.value += Number(item.data.data.features.bonushealth.value) || 0
-          health.max += Number(item.data.data.features.bonushealth.value) || 0
-          await this.update({ 'data.secondary.health': health })
+        if (item.system.features.bonushealth.flag) {
+          let health = duplicate(this.system.secondary.health)
+          health.value += Number(item.system.features.bonushealth.value) || 0
+          health.max += Number(item.system.features.bonushealth.value) || 0
+          await this.update({ 'system.secondary.health': health })
         }
-        if (item.data.data.features.bonusdelirium.flag) {
-          let delirium = duplicate(this.data.data.secondary.delirium)
-          delirium.value += Number(item.data.data.features.bonusdelirium.value) || 0
-          delirium.max += Number(item.data.data.features.bonusdelirium.value) || 0
-          await this.update({ 'data.secondary.delirium': delirium })
+        if (item.system.features.bonusdelirium.flag) {
+          let delirium = duplicate(this.system.secondary.delirium)
+          delirium.value += Number(item.system.features.bonusdelirium.value) || 0
+          delirium.max += Number(item.system.features.bonusdelirium.value) || 0
+          await this.update({ 'system.secondary.delirium': delirium })
         }
-        if (item.data.data.features.bonusnrg.flag) {
-          let nrg = duplicate(this.data.data.nrg)
-          nrg.value += Number(item.data.data.features.bonusnrg.value) || 0
-          nrg.max += Number(item.data.data.features.bonusnrg.value) || 0
-          await this.update({ 'data.nrg': nrg })
+        if (item.system.features.bonusnrg.flag) {
+          let nrg = duplicate(this.system.nrg)
+          nrg.value += Number(item.system.features.bonusnrg.value) || 0
+          nrg.max += Number(item.system.features.bonusnrg.value) || 0
+          await this.update({ 'system.nrg': nrg })
         }
         PegasusUtility.createChatWithRollMode(item.name, {
           content: await renderTemplate(`systems/fvtt-pegasus-rpg/templates/chat-perk-activated.html`, { name: this.name, perk: duplicate(item) })
@@ -973,20 +979,20 @@ export class PegasusActor extends Actor {
         this.enableWeaverPerk(item)
       }
       if (updateOK) {
-        await this.updateEmbeddedDocuments('Item', [{ _id: item.id, 'data.status': status }])
+        await this.updateEmbeddedDocuments('Item', [{ _id: item.id, 'system.status': status }])
       }
     }
   }
 
   /* -------------------------------------------- */
   async deleteAllItemsByType(itemType) {
-    let items = this.data.items.filter(item => item.type == itemType);
+    let items = this.items.filter(item => item.type == itemType);
     await this.deleteEmbeddedDocuments('Item', items);
   }
 
   /* -------------------------------------------- */
   async addItemWithoutDuplicate(newItem) {
-    let item = this.data.items.find(item => item.type == newItem.type && item.name.toLowerCase() == newItem.name.toLowerCase())
+    let item = this.items.find(item => item.type == newItem.type && item.name.toLowerCase() == newItem.name.toLowerCase())
     if (!item) {
       await this.createEmbeddedDocuments('Item', [newItem]);
     }
@@ -995,12 +1001,12 @@ export class PegasusActor extends Actor {
   /* -------------------------------------------- */
   getTraumaState() {
     this.traumaState = "none"
-    let negDelirium = -Math.floor((this.data.data.secondary.delirium.max + 1) / 2)
+    let negDelirium = -Math.floor((this.system.secondary.delirium.max + 1) / 2)
     if (this.type == "character") {
-      if (this.data.data.secondary.delirium.value <= 0 && this.data.data.secondary.delirium.value >= negDelirium) {
+      if (this.system.secondary.delirium.value <= 0 && this.system.secondary.delirium.value >= negDelirium) {
         this.traumaState = "trauma"
       }
-      if (this.data.data.secondary.delirium.value < negDelirium) {
+      if (this.system.secondary.delirium.value < negDelirium) {
         this.traumaState = "severetrauma"
       }
     }
@@ -1009,11 +1015,11 @@ export class PegasusActor extends Actor {
 
   /* -------------------------------------------- */
   getLevelRemaining() {
-    return this.data.data.biodata.currentlevelremaining
+    return this.system.biodata.currentlevelremaining
   }
   /* -------------------------------------------- */
   modifyHeroLevelRemaining(incDec) {
-    let biodata = duplicate(this.data.data.biodata)
+    let biodata = duplicate(this.system.biodata)
     biodata.currentlevelremaining = Math.max(biodata.currentlevelremaining + incDec, 0)
     this.update({ "data.biodata": biodata })
     ChatMessage.create({ content: `${this.name} has used a Hero Level to reroll !` })
@@ -1022,8 +1028,8 @@ export class PegasusActor extends Actor {
 
   /* -------------------------------------------- */
   checkIgnoreHealth() {
-    for (let effect of this.data.items) {
-      if (effect.type == "effect" && effect.data.data.ignorehealthpenalty) {
+    for (let effect of this.items) {
+      if (effect.type == "effect" && effect.system.ignorehealthpenalty) {
         return true
       }
     }
@@ -1031,8 +1037,8 @@ export class PegasusActor extends Actor {
   }
   /* -------------------------------------------- */
   checkMentalDisruption() {
-    for (let effect of this.data.items) {
-      if (effect.type == "effect" && effect.data.data.mentaldisruption) {
+    for (let effect of this.items) {
+      if (effect.type == "effect" && effect.system.mentaldisruption) {
         return true
       }
     }
@@ -1040,8 +1046,8 @@ export class PegasusActor extends Actor {
   }
   /* -------------------------------------------- */
   checkPhysicalDisruption() {
-    for (let effect of this.data.items) {
-      if (effect.type == "effect" && effect.data.data.physicaldisruption) {
+    for (let effect of this.items) {
+      if (effect.type == "effect" && effect.system.physicaldisruption) {
         return true
       }
     }
@@ -1049,8 +1055,8 @@ export class PegasusActor extends Actor {
   }
   /* -------------------------------------------- */
   checkMentalImmunity() {
-    for (let effect of this.data.items) {
-      if (effect.type == "effect" && effect.data.data.mentalimmunity) {
+    for (let effect of this.items) {
+      if (effect.type == "effect" && effect.system.mentalimmunity) {
         return true
       }
     }
@@ -1058,8 +1064,8 @@ export class PegasusActor extends Actor {
   }
   /* -------------------------------------------- */
   checkPhysicalImmunity() {
-    for (let effect of this.data.items) {
-      if (effect.type == "effect" && effect.data.data.physicalimmunity) {
+    for (let effect of this.items) {
+      if (effect.type == "effect" && effect.system.physicalimmunity) {
         return true
       }
     }
@@ -1067,8 +1073,8 @@ export class PegasusActor extends Actor {
   }
   /* -------------------------------------------- */
   checkNoBonusDice() {
-    for (let effect of this.data.items) {
-      if (effect.type == "effect" && effect.data.data.nobonusdice) {
+    for (let effect of this.items) {
+      if (effect.type == "effect" && effect.system.nobonusdice) {
         return true
       }
     }
@@ -1076,8 +1082,8 @@ export class PegasusActor extends Actor {
   }
   /* -------------------------------------------- */
   checkNoPerksAllowed() {
-    for (let effect of this.data.items) {
-      if (effect.type == "effect" && effect.data.data.noperksallowed) {
+    for (let effect of this.items) {
+      if (effect.type == "effect" && effect.system.noperksallowed) {
         return true
       }
     }
@@ -1085,9 +1091,9 @@ export class PegasusActor extends Actor {
   }
   /* -------------------------------------------- */
   checkIfPossible() {
-    for (let effect of this.data.items) {
-      if (effect.type == "effect" && effect.data.data.isthispossible.length > 0) {
-        ChatMessage.create({ content: effect.data.data.isthispossible })
+    for (let effect of this.items) {
+      if (effect.type == "effect" && effect.system.isthispossible.length > 0) {
+        ChatMessage.create({ content: effect.system.isthispossible })
       }
     }
   }
@@ -1096,38 +1102,38 @@ export class PegasusActor extends Actor {
   async computeNRGHealth() {
     if (this.isOwner || game.user.isGM) {
       let updates = {}
-      let phyDiceValue = PegasusUtility.getDiceValue(this.data.data.statistics.phy.value) + this.data.data.secondary.health.bonus + this.data.data.statistics.phy.mod;
-      if (phyDiceValue != this.data.data.secondary.health.max) {
+      let phyDiceValue = PegasusUtility.getDiceValue(this.system.statistics.phy.value) + this.system.secondary.health.bonus + this.system.statistics.phy.mod;
+      if (phyDiceValue != this.system.secondary.health.max) {
         updates['data.secondary.health.max'] = phyDiceValue
       }
       if (this.computeValue) {
         updates['data.secondary.health.value'] = phyDiceValue
       }
-      let mndDiceValue = PegasusUtility.getDiceValue(this.data.data.statistics.mnd.value) + this.data.data.secondary.delirium.bonus + this.data.data.statistics.mnd.mod;
-      if (mndDiceValue != this.data.data.secondary.delirium.max) {
+      let mndDiceValue = PegasusUtility.getDiceValue(this.system.statistics.mnd.value) + this.system.secondary.delirium.bonus + this.system.statistics.mnd.mod;
+      if (mndDiceValue != this.system.secondary.delirium.max) {
         updates['data.secondary.delirium.max'] = mndDiceValue
       }
       if (this.computeValue) {
         updates['data.secondary.delirium.value'] = mndDiceValue
       }
-      let stlDiceValue = PegasusUtility.getDiceValue(this.data.data.statistics.stl.value) + this.data.data.secondary.stealthhealth.bonus + this.data.data.statistics.stl.mod;
-      if (stlDiceValue != this.data.data.secondary.stealthhealth.max) {
+      let stlDiceValue = PegasusUtility.getDiceValue(this.system.statistics.stl.value) + this.system.secondary.stealthhealth.bonus + this.system.statistics.stl.mod;
+      if (stlDiceValue != this.system.secondary.stealthhealth.max) {
         updates['data.secondary.stealthhealth.max'] = stlDiceValue
       }
       if (this.computeValue) {
         updates['data.secondary.stealthhealth.value'] = stlDiceValue
       }
 
-      let socDiceValue = PegasusUtility.getDiceValue(this.data.data.statistics.soc.value) + this.data.data.secondary.socialhealth.bonus + this.data.data.statistics.soc.mod;
-      if (socDiceValue != this.data.data.secondary.socialhealth.max) {
+      let socDiceValue = PegasusUtility.getDiceValue(this.system.statistics.soc.value) + this.system.secondary.socialhealth.bonus + this.system.statistics.soc.mod;
+      if (socDiceValue != this.system.secondary.socialhealth.max) {
         updates['data.secondary.socialhealth.max'] = socDiceValue
       }
       if (this.computeValue) {
         updates['data.secondary.socialhealth.value'] = socDiceValue
       }
 
-      let nrgValue = PegasusUtility.getDiceValue(this.data.data.statistics.foc.value) + this.data.data.nrg.mod + this.data.data.statistics.foc.mod
-      if (nrgValue != this.data.data.nrg.absolutemax) {
+      let nrgValue = PegasusUtility.getDiceValue(this.system.statistics.foc.value) + this.system.nrg.mod + this.system.statistics.foc.mod
+      if (nrgValue != this.system.nrg.absolutemax) {
         updates['data.nrg.absolutemax'] = nrgValue
       }
       if (this.computeValue) {
@@ -1135,44 +1141,44 @@ export class PegasusActor extends Actor {
         updates['data.nrg.value'] = nrgValue
       }
 
-      let stunth = PegasusUtility.getDiceValue(this.data.data.statistics.phy.value) + PegasusUtility.getDiceValue(this.data.data.statistics.mnd.value) + PegasusUtility.getDiceValue(this.data.data.statistics.foc.value)
-        + this.data.data.statistics.mnd.mod + this.data.data.statistics.phy.mod + this.data.data.statistics.foc.mod
-      if (stunth != this.data.data.combat.stunthreshold) {
+      let stunth = PegasusUtility.getDiceValue(this.system.statistics.phy.value) + PegasusUtility.getDiceValue(this.system.statistics.mnd.value) + PegasusUtility.getDiceValue(this.system.statistics.foc.value)
+        + this.system.statistics.mnd.mod + this.system.statistics.phy.mod + this.system.statistics.foc.mod
+      if (stunth != this.system.combat.stunthreshold) {
         updates['data.combat.stunthreshold'] = stunth
       }
 
-      let momentum = this.data.data.statistics.foc.value + this.data.data.statistics.foc.mod
-      if (momentum != this.data.data.momentum.max) {
+      let momentum = this.system.statistics.foc.value + this.system.statistics.foc.mod
+      if (momentum != this.system.momentum.max) {
         updates['data.momentum.value'] = 0
         updates['data.momentum.max'] = momentum
       }
 
-      let mrLevel = (this.data.data.statistics.agi.value + this.data.data.statistics.str.value) - this.data.data.statistics.phy.value
+      let mrLevel = (this.system.statistics.agi.value + this.system.statistics.str.value) - this.system.statistics.phy.value
       mrLevel = (mrLevel < 1) ? 1 : mrLevel;
-      if (mrLevel != this.data.data.mr.value) {
+      if (mrLevel != this.system.mr.value) {
         updates['data.mr.value'] = mrLevel
       }
 
-      let moralitythreshold = - (Number(PegasusUtility.getDiceValue(this.data.data.statistics.foc.value)) + Number(this.data.data.statistics.foc.mod))
-      if (moralitythreshold != this.data.data.biodata.moralitythreshold) {
+      let moralitythreshold = - (Number(PegasusUtility.getDiceValue(this.system.statistics.foc.value)) + Number(this.system.statistics.foc.mod))
+      if (moralitythreshold != this.system.biodata.moralitythreshold) {
         updates['data.biodata.moralitythreshold'] = moralitythreshold
       }
       if (!this.isToken) {
-        if (this.warnMorality != this.data.data.biodata.morality && this.data.data.biodata.morality < 0) {
+        if (this.warnMorality != this.system.biodata.morality && this.system.biodata.morality < 0) {
           console.log("CHAR", this)
           ChatMessage.create({ content: "WARNING: Your character is dangerously close to becoming corrupted and defeated. Start on a path of redemption!" })
         }
-        if (this.warnMorality != this.data.data.biodata.morality) {
-          this.warnMorality = this.data.data.biodata.morality
+        if (this.warnMorality != this.system.biodata.morality) {
+          this.warnMorality = this.system.biodata.morality
         }
       }
 
       let race = this.getRace()
-      if (race && race.name && (race.name != this.data.data.biodata.racename)) {
+      if (race && race.name && (race.name != this.system.biodata.racename)) {
         updates['data.biodata.racename'] = race.name
       }
       let role = this.getRole()
-      if (role && role.name && (role.name != this.data.data.biodata.rolename)) {
+      if (role && role.name && (role.name != this.system.biodata.rolename)) {
         updates['data.biodata.rolename'] = role.name
       }
       if (Object.entries(updates).length > 0) {
@@ -1183,17 +1189,17 @@ export class PegasusActor extends Actor {
 
     if (this.isOwner || game.user.isGM) {
       // Update current hindrance level
-      let hindrance = this.data.data.combat.hindrancedice
+      let hindrance = this.system.combat.hindrancedice
       if (!this.checkIgnoreHealth()) {
-        if (this.data.data.secondary.health.value < 0) {
-          if (this.data.data.secondary.health.value < -Math.floor((this.data.data.secondary.health.max + 1) / 2)) { // Severe wounded
+        if (this.system.secondary.health.value < 0) {
+          if (this.system.secondary.health.value < -Math.floor((this.system.secondary.health.max + 1) / 2)) { // Severe wounded
             hindrance += 3
           } else {
             hindrance += 1
           }
         }
       }
-      this.data.data.combat.hindrancedice = hindrance
+      this.system.combat.hindrancedice = hindrance
       this.getTraumaState()
       this.cleanupPerksIfTrauma()
     }
@@ -1201,7 +1207,7 @@ export class PegasusActor extends Actor {
 
   /* -------------------------------------------- */
   async modStat(key, inc = 1) {
-    let stat = duplicate(this.data.data.statistics[key])
+    let stat = duplicate(this.system.statistics[key])
     stat.mod += parseInt(inc)
     await this.update({ [`data.statistics.${key}`]: stat })
   }
@@ -1209,7 +1215,7 @@ export class PegasusActor extends Actor {
   /* -------------------------------------------- */
   async valueStat(key, inc = 1) {
     key = key.toLowerCase()
-    let stat = duplicate(this.data.data.statistics[key])
+    let stat = duplicate(this.system.statistics[key])
     stat.value += parseInt(inc)
     await this.update({ [`data.statistics.${key}`]: stat })
   }
@@ -1217,23 +1223,23 @@ export class PegasusActor extends Actor {
   /* -------------------------------------------- */
   async addIncSpec(spec, inc = 1) {
     console.log("Using spec : ", spec, inc)
-    let specExist = this.data.items.find(item => item.type == 'specialisation' && item.name.toLowerCase() == spec.name.toLowerCase())
+    let specExist = this.items.find(item => item.type == 'specialisation' && item.name.toLowerCase() == spec.name.toLowerCase())
     if (specExist) {
       specExist = duplicate(specExist)
-      specExist.data.level += inc;
-      let update = { _id: specExist._id, "data.level": specExist.data.level };
+      specExist.system.level += inc;
+      let update = { _id: specExist._id, "data.level": specExist.system.level };
       await this.updateEmbeddedDocuments('Item', [update]);
     } else {
-      spec.data.level += inc;
+      spec.system.level += inc;
       await this.createEmbeddedDocuments('Item', [spec]);
     }
   }
 
   /* -------------------------------------------- */
   async incDecQuantity(objetId, incDec = 0) {
-    let objetQ = this.data.items.get(objetId)
+    let objetQ = this.items.get(objetId)
     if (objetQ) {
-      let newQ = objetQ.data.data.quantity + incDec
+      let newQ = objetQ.system.quantity + incDec
       if (newQ >= 0) {
         const updated = await this.updateEmbeddedDocuments('Item', [{ _id: objetQ.id, 'data.quantity': newQ }]) // pdates one EmbeddedEntity
       }
@@ -1241,10 +1247,10 @@ export class PegasusActor extends Actor {
   }
   /* -------------------------------------------- */
   async incDecAmmo(objetId, incDec = 0) {
-    let objetQ = this.data.items.get(objetId)
+    let objetQ = this.items.get(objetId)
     if (objetQ) {
-      let newQ = objetQ.data.data.ammocurrent + incDec;
-      if (newQ >= 0 && newQ <= objetQ.data.data.ammomax) {
+      let newQ = objetQ.system.ammocurrent + incDec;
+      if (newQ >= 0 && newQ <= objetQ.system.ammomax) {
         const updated = await this.updateEmbeddedDocuments('Item', [{ _id: objetQ.id, 'data.ammocurrent': newQ }]); // pdates one EmbeddedEntity
       }
     }
@@ -1253,26 +1259,26 @@ export class PegasusActor extends Actor {
   /* -------------------------------------------- */
   async applyAbility(ability, updates = [], directUpdate = false) {
     // manage stat bonus
-    if (ability.data.affectedstat != "notapplicable") {
-      let stat = duplicate(this.data.data.statistics[ability.data.affectedstat])
-      stat.mod += Number(ability.data.statmodifier)
-      updates[`data.statistics.${ability.data.affectedstat}`] = stat
+    if (ability.system.affectedstat != "notapplicable") {
+      let stat = duplicate(this.system.statistics[ability.system.affectedstat])
+      stat.mod += Number(ability.system.statmodifier)
+      updates[`data.statistics.${ability.system.affectedstat}`] = stat
     }
     // manage status bonus
-    if (ability.data.statusaffected != "notapplicable") {
-      if (ability.data.statusaffected == 'nrg') {
-        let nrg = duplicate(this.data.data.nrg)
-        nrg.mod += Number(ability.data.statusmodifier)
+    if (ability.system.statusaffected != "notapplicable") {
+      if (ability.system.statusaffected == 'nrg') {
+        let nrg = duplicate(this.system.nrg)
+        nrg.mod += Number(ability.system.statusmodifier)
         updates[`data.nrg`] = nrg
       }
-      if (ability.data.statusaffected == 'health') {
-        let health = duplicate(this.data.data.secondary.health)
-        health.bonus += Number(ability.data.statusmodifier)
+      if (ability.system.statusaffected == 'health') {
+        let health = duplicate(this.system.secondary.health)
+        health.bonus += Number(ability.system.statusmodifier)
         updates[`data.secondary.health`] = health
       }
-      if (ability.data.statusaffected == 'delirium') {
-        let delirium = duplicate(this.data.data.secondary.delirium)
-        delirium.bonus += Number(ability.data.statusmodifier)
+      if (ability.system.statusaffected == 'delirium') {
+        let delirium = duplicate(this.system.secondary.delirium)
+        delirium.bonus += Number(ability.system.statusmodifier)
         updates[`data.secondary.delirium`] = delirium
       }
     }
@@ -1280,28 +1286,28 @@ export class PegasusActor extends Actor {
       await this.update(updates)
     }
     let newItems = []
-    if (ability.data.effectsgained) {
-      for (let effect of ability.data.effectsgained) {
+    if (ability.system.effectsgained) {
+      for (let effect of ability.system.effectsgained) {
         newItems.push(effect);
       }
     }
-    if (ability.data.powersgained) {
-      for (let power of ability.data.powersgained) {
+    if (ability.system.powersgained) {
+      for (let power of ability.system.powersgained) {
         newItems.push(power);
       }
     }
-    if (ability.data.specialisations) {
-      for (let spec of ability.data.specialisations) {
+    if (ability.system.specialisations) {
+      for (let spec of ability.system.specialisations) {
         newItems.push(spec);
       }
     }
-    if (ability.data.attackgained) {
-      for (let weapon of ability.data.attackgained) {
+    if (ability.system.attackgained) {
+      for (let weapon of ability.system.attackgained) {
         newItems.push(weapon);
       }
     }
-    if (ability.data.armorgained) {
-      for (let armor of ability.data.armorgained) {
+    if (ability.system.armorgained) {
+      for (let armor of ability.system.armorgained) {
         newItems.push(armor);
       }
     }
@@ -1316,12 +1322,12 @@ export class PegasusActor extends Actor {
     await this.deleteAllItemsByType('race')
     newItems.push(race);
 
-    for (let ability of race.data.abilities) {
+    for (let ability of race.system.abilities) {
       newItems.push(ability)
       this.applyAbility(ability, updates)
     }
-    if (race.data.perksgained) {
-      for (let power of race.data.perks) {
+    if (race.system.perksgained) {
+      for (let power of race.system.perks) {
         newItems.push(power);
       }
     }
@@ -1334,7 +1340,7 @@ export class PegasusActor extends Actor {
 
   /* -------------------------------------------- */
   getIncreaseStatValue(updates, statKey) {
-    let stat = duplicate(this.data.data.statistics[statKey])
+    let stat = duplicate(this.system.statistics[statKey])
     stat.value += 1;
     updates[`data.statistics.${statKey}`] = stat
   }
@@ -1348,13 +1354,13 @@ export class PegasusActor extends Actor {
     await this.deleteAllItemsByType('role')
     newItems.push(role)
 
-    this.getIncreaseStatValue(updates, role.data.statincrease1)
-    this.getIncreaseStatValue(updates, role.data.statincrease2)
+    this.getIncreaseStatValue(updates, role.system.statincrease1)
+    this.getIncreaseStatValue(updates, role.system.statincrease2)
 
-    if (role.data.specialability.length > 0) {
-      console.log("Adding ability", role.data.specialability)
-      newItems = newItems.concat(duplicate(role.data.specialability)) // Add new ability
-      this.applyAbility(role.data.specialability[0], newItems)
+    if (role.system.specialability.length > 0) {
+      console.log("Adding ability", role.system.specialability)
+      newItems = newItems.concat(duplicate(role.system.specialability)) // Add new ability
+      this.applyAbility(role.system.specialability[0], newItems)
     }
     await this.update(updates)
     await this.createEmbeddedDocuments('Item', newItems)
@@ -1364,24 +1370,24 @@ export class PegasusActor extends Actor {
 
   /* -------------------------------------------- */
   addHindrancesList(effectsList) {
-    if (this.data.data.combat.stunlevel > 0) {
-      effectsList.push({ label: "Stun Hindrance", type: "hindrance", foreign: true, actorId: this.id, applied: false, value: this.data.data.combat.stunlevel })
+    if (this.system.combat.stunlevel > 0) {
+      effectsList.push({ label: "Stun Hindrance", type: "hindrance", foreign: true, actorId: this.id, applied: false, value: this.system.combat.stunlevel })
     }
-    if (this.data.data.combat.hindrancedice > 0) {
-      effectsList.push({ label: "Wounds Hindrance", type: "hindrance", foreign: true, actorId: this.id, applied: false, value: this.data.data.combat.hindrancedice })
+    if (this.system.combat.hindrancedice > 0) {
+      effectsList.push({ label: "Wounds Hindrance", type: "hindrance", foreign: true, actorId: this.id, applied: false, value: this.system.combat.hindrancedice })
     }
     let overCapacity = Math.floor(this.encCurrent / this.getEncumbranceCapacity())
     if (overCapacity > 0) {
       effectsList.push({ label: "Encumbrance Hindrance", type: "hindrance", foreign: true, actorId: this.id, applied: false, value: overCapacity })
     }
-    if (this.data.data.biodata.morality <= 0) {
+    if (this.system.biodata.morality <= 0) {
       effectsList.push({ label: "Morality Hindrance", type: "hindrance", foreign: true, actorId: this.id, applied: false, value: 3 })
     }
-    let effects = this.data.items.filter(item => item.type == 'effect')
+    let effects = this.items.filter(item => item.type == 'effect')
     for (let effect of effects) {
       effect = duplicate(effect)
-      if (effect.data.hindrance) {
-        effectsList.push({ label: effect.name, type: "effect", foreign: true, actorId: this.id, applied: false, effect: effect, value: effect.data.effectlevel })
+      if (effect.system.hindrance) {
+        effectsList.push({ label: effect.name, type: "effect", foreign: true, actorId: this.id, applied: false, effect: effect, value: effect.system.effectlevel })
       }
     }
   }
@@ -1392,33 +1398,33 @@ export class PegasusActor extends Actor {
 
   pushEffect(rollData, effect) {
     if (this.getTraumaState() == "none" && !this.checkNoBonusDice()) {
-      rollData.effectsList.push({ label: effect.name, type: "effect", applied: false, effect: effect, value: effect.data.effectlevel })
+      rollData.effectsList.push({ label: effect.name, type: "effect", applied: false, effect: effect, value: effect.system.effectlevel })
     } else {
-      if (!effect.data.bonusdice) { // Do not push bonus dice effect when TraumaState is activated
-        rollData.effectsList.push({ label: effect.name, type: "effect", applied: false, effect: effect, value: effect.data.effectlevel })
+      if (!effect.system.bonusdice) { // Do not push bonus dice effect when TraumaState is activated
+        rollData.effectsList.push({ label: effect.name, type: "effect", applied: false, effect: effect, value: effect.system.effectlevel })
       }
     }
   }
 
   /* -------------------------------------------- */
   addEffects(rollData, isInit = false, isPower = false, isPowerDmg = false) {
-    let effects = this.data.items.filter(item => item.type == 'effect')
+    let effects = this.items.filter(item => item.type == 'effect')
     for (let effect of effects) {
       effect = duplicate(effect)
-      if (!effect.data.hindrance
-        && (effect.data.stataffected != "notapplicable" || effect.data.specaffected.length > 0)
-        && effect.data.stataffected != "special"
-        && effect.data.stataffected != "powerroll"
-        && effect.data.stataffected != "powerdmgroll") {
-        if (effect.data.effectstatlevel) {
-          effect.data.effectlevel = this.data.data.statistics[effect.data.effectstat].value
+      if (!effect.system.hindrance
+        && (effect.system.stataffected != "notapplicable" || effect.system.specaffected.length > 0)
+        && effect.system.stataffected != "special"
+        && effect.system.stataffected != "powerroll"
+        && effect.system.stataffected != "powerdmgroll") {
+        if (effect.system.effectstatlevel) {
+          effect.system.effectlevel = this.system.statistics[effect.system.effectstat].value
         }
         this.pushEffect(rollData, effect)
       }
-      if (isPower && effect.data.stataffected == "powerroll") {
+      if (isPower && effect.system.stataffected == "powerroll") {
         this.pushEffect(rollData, effect)
       }
-      if (isPowerDmg && effect.data.stataffected == "powerdmgroll") {
+      if (isPowerDmg && effect.system.stataffected == "powerdmgroll") {
         this.pushEffect(rollData, effect)
       }
 
@@ -1430,38 +1436,38 @@ export class PegasusActor extends Actor {
     if (statKey == 'phy') {
       let armors = this.getArmors()
       for (let armor of armors) {
-        rollData.armorsList.push({ label: `Armor ${armor.name}`, type: "armor", applied: false, value: armor.data.resistance })
+        rollData.armorsList.push({ label: `Armor ${armor.name}`, type: "armor", applied: false, value: armor.system.resistance })
       }
     }
     if (useShield) {
-      let shields = this.data.items.filter(item => item.type == "shield" && item.data.data.equipped)
+      let shields = this.items.filter(item => item.type == "shield" && item.system.equipped)
       for (let sh of shields) {
-        rollData.armorsList.push({ label: `Shield ${sh.name}`, type: "shield", applied: false, value: sh.data.data.level })
+        rollData.armorsList.push({ label: `Shield ${sh.name}`, type: "shield", applied: false, value: sh.system.level })
       }
     }
   }
   addWeapons(rollData, statKey) {
     let weapons = this.getWeapons()
     for (let weapon of weapons) {
-      if (weapon.data.equipped && weapon.data.statistic == statKey) {
+      if (weapon.system.equipped && weapon.system.statistic == statKey) {
         rollData.weaponsList.push({ label: `Attack ${weapon.name}`, type: "attack", applied: false, weapon: weapon, value: 0, damageDice: PegasusUtility.getDiceFromLevel(0) })
       }
-      if (weapon.data.equipped && weapon.data.canbethrown && statKey == "agi") {
+      if (weapon.system.equipped && weapon.system.canbethrown && statKey == "agi") {
         rollData.weaponsList.push({ label: `Attack ${weapon.name}`, type: "attack", applied: false, weapon: weapon, value: 0, damageDice: PegasusUtility.getDiceFromLevel(0) })
       }
-      if (weapon.data.equipped && weapon.data.enhanced && weapon.data.enhancedstat == statKey) {
-        rollData.weaponsList.push({ label: `Enhanced Attack ${weapon.name}`, type: "enhanced", applied: false, weapon: weapon, value: weapon.data.enhancedlevel, damageDice: PegasusUtility.getDiceFromLevel(weapon.data.enhancedlevel) })
+      if (weapon.system.equipped && weapon.system.enhanced && weapon.system.enhancedstat == statKey) {
+        rollData.weaponsList.push({ label: `Enhanced Attack ${weapon.name}`, type: "enhanced", applied: false, weapon: weapon, value: weapon.system.enhancedlevel, damageDice: PegasusUtility.getDiceFromLevel(weapon.system.enhancedlevel) })
       }
-      if (weapon.data.equipped && weapon.data.damagestatistic == statKey) {
-        rollData.weaponsList.push({ label: `Damage ${weapon.name}`, type: "damage", applied: false, weapon: weapon, value: weapon.data.damage, damageDice: PegasusUtility.getDiceFromLevel(weapon.data.damage) })
+      if (weapon.system.equipped && weapon.system.damagestatistic == statKey) {
+        rollData.weaponsList.push({ label: `Damage ${weapon.name}`, type: "damage", applied: false, weapon: weapon, value: weapon.system.damage, damageDice: PegasusUtility.getDiceFromLevel(weapon.system.damage) })
       }
     }
   }
   addEquipments(rollData, statKey) {
     let equipments = this.getEquipmentsOnly()
     for (let equip of equipments) {
-      if (equip.data.equipped && equip.data.stataffected == statKey) {
-        rollData.equipmentsList.push({ label: `Item ${equip.name}`, type: "item", applied: false, equip: equip, value: equip.data.level })
+      if (equip.system.equipped && equip.system.stataffected == statKey) {
+        rollData.equipmentsList.push({ label: `Item ${equip.name}`, type: "item", applied: false, equip: equip, value: equip.system.level })
       }
     }
   }
@@ -1518,7 +1524,7 @@ export class PegasusActor extends Actor {
   /* -------------------------------------------- */
   getLevelRemainingList() {
     let options = []
-    for (let i = 0; i <= this.data.data.biodata.maxlevelremaining; i++) {
+    for (let i = 0; i <= this.system.biodata.maxlevelremaining; i++) {
       options.push(`<option value="${i}">${i}</option>`)
     }
     return options.join("\n")
@@ -1544,10 +1550,10 @@ export class PegasusActor extends Actor {
 
   /* -------------------------------------------- */
   powerDmgRoll(itemId) {
-    let power = this.data.items.get(itemId)
+    let power = this.items.get(itemId)
     if (power) {
       power = duplicate(power)
-      this.rollPool(power.data.dmgstatistic, false, "power-dmg")
+      this.rollPool(power.system.dmgstatistic, false, "power-dmg")
     }
   }
 
@@ -1606,14 +1612,14 @@ export class PegasusActor extends Actor {
   async rollSpec(specId) {
     let spec = this.getOneSpec(specId)
     if (spec) {
-      let rollData = this.getCommonRollData(spec.data.statistic)
+      let rollData = this.getCommonRollData(spec.system.statistic)
       rollData.mode = "spec"
       rollData.title = `Spec. : ${spec.name} `
       rollData.specList = [spec]
       rollData.selectedSpec = spec._id
       rollData.specName = spec.name
       rollData.img = spec.img
-      rollData.specDicesLevel = spec.data.level
+      rollData.specDicesLevel = spec.system.level
       PegasusUtility.updateSpecDicePool(rollData)
       this.startRoll(rollData)
     } else {
@@ -1623,7 +1629,7 @@ export class PegasusActor extends Actor {
 
   /* -------------------------------------------- */
   async rollMR(isInit = false, combatId = 0, combatantId = 0) {
-    let mr = duplicate(this.data.data.mr)
+    let mr = duplicate(this.system.mr)
     if (mr) {
       mr.dice = PegasusUtility.getDiceFromLevel(mr.value);
 
@@ -1645,10 +1651,10 @@ export class PegasusActor extends Actor {
 
   /* -------------------------------------------- */
   async rollArmor(armorId) {
-    let armor = this.data.items.get(armorId)
+    let armor = this.items.get(armorId)
 
     if (armor) {
-      let rollData = this.getCommonRollData(armor.data.statistic)
+      let rollData = this.getCommonRollData(armor.system.statistic)
 
       armor = duplicate(armor);
       this.checkAndPrepareEquipment(armor);
@@ -1658,7 +1664,7 @@ export class PegasusActor extends Actor {
       rollData.title = `Armor : ${armor.name}`
       rollData.isResistance = true;
       rollData.img = armor.img
-      rollData.damageDiceLevel = armor.data.resistance
+      rollData.damageDiceLevel = armor.system.resistance
 
       this.startRoll(rollData);
     } else {
@@ -1668,11 +1674,11 @@ export class PegasusActor extends Actor {
 
   /* -------------------------------------------- */
   async rollPower(powerId) {
-    let power = this.data.items.get(powerId)
+    let power = this.items.get(powerId)
 
     if (power) {
       power = duplicate(power)
-      let rollData = this.getCommonRollData(power.data.statistic, false, false, true, false)
+      let rollData = this.getCommonRollData(power.system.statistic, false, false, true, false)
 
       rollData.mode = "power"
       rollData.power = power
diff --git a/modules/pegasus-item-sheet.js b/modules/pegasus-item-sheet.js
index 87a76e9..f3ab9b4 100644
--- a/modules/pegasus-item-sheet.js
+++ b/modules/pegasus-item-sheet.js
@@ -48,9 +48,9 @@ export class PegasusItemSheet extends ItemSheet {
 
   /* -------------------------------------------- */
   async getData() {
-    const objectData = PegasusUtility.data(this.object);
+    const objectData = this.object
 
-    let itemData = foundry.utils.deepClone(PegasusUtility.templateData(this.object));
+    let itemData = foundry.utils.deepClone(objectData)
     let formData = {
       title: this.title,
       id: this.id,
@@ -61,7 +61,7 @@ export class PegasusItemSheet extends ItemSheet {
       cssClass: this.isEditable ? "editable" : "locked",
       optionsDiceList: PegasusUtility.getOptionsDiceList(),
       optionsStatusList: PegasusUtility.getOptionsStatusList(),
-      data: itemData,
+      data: itemData.system,
       limited: this.object.limited,
       options: this.options,
       owner: this.document.isOwner,
@@ -69,7 +69,7 @@ export class PegasusItemSheet extends ItemSheet {
       isGM: game.user.isGM
     }
 
-    this.options.editable = !(this.object.data.origin == "embeddedItem");
+    this.options.editable = true //!(this.object.isEmbedded)
     console.log("ITEM DATA", formData, this);
     return formData;
   }
@@ -88,7 +88,7 @@ export class PegasusItemSheet extends ItemSheet {
 
   /* -------------------------------------------- */
   postItem() {
-    let chatData = duplicate(PegasusUtility.data(this.item));
+    let chatData = this.item.system
     if (this.actor) {
       chatData.actor = { id: this.actor.id };
     }
@@ -113,10 +113,10 @@ export class PegasusItemSheet extends ItemSheet {
   async viewSubitem(ev) {
     let field = $(ev.currentTarget).data('type');
     let idx = Number($(ev.currentTarget).data('index'));
-    let itemData = this.object.data.data[field][idx];
+    let itemData = this.object.system[field][idx];
     if (itemData.name != 'None') {
       let spec = await Item.create(itemData, { temporary: true });
-      spec.data.origin = "embeddedItem";
+      spec.system.origin = "embeddedItem";
       new PegasusItemSheet(spec).render(true);
     }
   }
@@ -125,8 +125,8 @@ export class PegasusItemSheet extends ItemSheet {
   async deleteSubitem(ev) {
     let field = $(ev.currentTarget).data('type');
     let idx = Number($(ev.currentTarget).data('index'));
-    let oldArray = this.object.data.data[field];
-    let itemData = this.object.data.data[field][idx];
+    let oldArray = this.object.system[field];
+    let itemData = this.object.system[field][idx];
     if (itemData.name != 'None') {
       let newArray = [];
       for (var i = 0; i < oldArray.length; i++) {
@@ -134,16 +134,16 @@ export class PegasusItemSheet extends ItemSheet {
           newArray.push(oldArray[i]);
         }
       }
-      this.object.update({ [`data.${field}`]: newArray });
+      this.object.update({ [`system.${field}`]: newArray });
     }
   }
 
   /* -------------------------------------------- */
   async manageSpec() {
-    let itemData = this.object.data.data.specialisation[0];
+    let itemData = this.object.system.specialisation[0];
     if (itemData.name != 'None') {
       let spec = await Item.create(itemData, { temporary: true });
-      spec.data.origin = "embeddedItem";
+      spec.system.origin = "embeddedItem";
       new PegasusItemSheet(spec).render(true);
     }
   }
@@ -165,7 +165,7 @@ export class PegasusItemSheet extends ItemSheet {
     });
 
     html.find('.delete-spec').click(ev => {
-      this.object.update({ "data.specialisation": [{ name: 'None' }] });
+      this.object.update({ "system.specialisation": [{ name: 'None' }] });
     });
 
     html.find('.delete-subitem').click(ev => {
@@ -174,9 +174,9 @@ export class PegasusItemSheet extends ItemSheet {
 
     html.find('.stat-choice-flag').click(ev => {
       let idx = $(ev.currentTarget).data("stat-idx");
-      let array = duplicate(this.object.data.data.statincreasechoice);
+      let array = duplicate(this.object.system.statincreasechoice);
       array[Number(idx)].flag = !array[Number(idx)].flag;
-      this.object.update({ "data.statincreasechoice": array });
+      this.object.update({ "system.statincreasechoice": array });
     });
 
     // Update Inventory Item
@@ -197,225 +197,225 @@ export class PegasusItemSheet extends ItemSheet {
   }
 
   /* -------------------------------------------- */
-  async addAbility(event, item, dataItem) {
-    let newItem = duplicate(item.data);
-    newItem._id = randomID(dataItem.id.length);
-    console.log("ABB", event, item, dataItem)
+  async addAbility(event, item) {
+    let newItem = duplicate(item)
+    newItem._id = randomID(item.id.length);
+    console.log("ABB", event, item)
     if (event.toElement.className == 'drop-abilities') {
-      let abilityArray = duplicate(this.object.data.data.abilities);
+      let abilityArray = duplicate(this.object.system.abilities);
       abilityArray.push(newItem);
-      await this.object.update({ 'data.abilities': abilityArray });
+      await this.object.update({ 'system.abilities': abilityArray });
     }
     if (event.toElement.className == 'drop-optionnal-abilities') {
-      let abilityArray = duplicate(this.object.data.data.optionnalabilities);
+      let abilityArray = duplicate(this.object.system.optionnalabilities);
       abilityArray.push(newItem);
-      await this.object.update({ 'data.optionnalabilities': abilityArray });
+      await this.object.update({ 'system.optionnalabilities': abilityArray });
     }
   }
 
   /* -------------------------------------------- */
-  async addRacePerk(event, item, dataItem) {
-    let newItem = duplicate(item.data);
-    newItem._id = randomID(dataItem.id.length);
+  async addRacePerk(event, item) {
+    let newItem = duplicate(item);
+    newItem._id = randomID(item.id);
     if (event.toElement.className == 'drop-race-perk') {
-      let perkArray = duplicate(this.object.data.data.perks);
+      let perkArray = duplicate(this.object.system.perks);
       perkArray.push(newItem);
-      await this.object.update({ 'data.perks': perkArray });
+      await this.object.update({ 'system.perks': perkArray });
     }
   }
 
   /* -------------------------------------------- */
-  async addSpecialisation(item, dataItem) {
-    let newItem = duplicate(item.data);
-    newItem._id = randomID(dataItem.id.length);
+  async addSpecialisation(item) {
+    let newItem = duplicate(item)
+    newItem._id = randomID(item.id.length)
     let specArray = [newItem];
-    await this.object.update({ 'data.specialisation': specArray });
+    await this.object.update({ 'system.specialisation': specArray });
   }
 
   /* -------------------------------------------- */
-  async addRoleSpecialisation(event, item, dataItem) {
-    let newItem = duplicate(item.data);
-    newItem._id = randomID(dataItem.id.length);
+  async addRoleSpecialisation(event, item) {
+    let newItem = duplicate(item);
+    newItem._id = randomID(item.id.length);
     console.log("Add spec", event, newItem);
     if (event.toElement.className == 'drop-spec1') {
-      let specArray = duplicate(this.object.data.data.specialisationsplus1);
+      let specArray = duplicate(this.object.system.specialisationsplus1);
       specArray.push(newItem);
-      await this.object.update({ 'data.specialisationsplus1': specArray });
+      await this.object.update({ 'system.specialisationsplus1': specArray });
     }
     if (event.toElement.className == 'drop-spec2') {
-      let specArray = duplicate(this.object.data.data.specincrease);
+      let specArray = duplicate(this.object.system.specincrease);
       specArray.push(newItem);
-      await this.object.update({ 'data.specincrease': specArray });
+      await this.object.update({ 'system.specincrease': specArray });
     }
   }
 
   /* -------------------------------------------- */
-  async addRolePerk(event, item, dataItem) {
-    let newItem = duplicate(item.data);
-    newItem._id = randomID(dataItem.id.length);
+  async addRolePerk(event, item) {
+    let newItem = duplicate(item);
+    newItem._id = randomID(item.id.length);
     if (event.toElement.className == 'drop-perk2') {
-      let perkArray = duplicate(this.object.data.data.perks);
+      let perkArray = duplicate(this.object.system.perks);
       perkArray.push(newItem);
-      await this.object.update({ 'data.perks': perkArray });
+      await this.object.update({ 'system.perks': perkArray });
     }
     if (event.toElement.className == 'drop-specialperk1') {
-      let perkArray = duplicate(this.object.data.data.specialperk);
+      let perkArray = duplicate(this.object.system.specialperk);
       perkArray.push(newItem);
-      await this.object.update({ 'data.specialperk': perkArray });
+      await this.object.update({ 'system.specialperk': perkArray });
     }
   }
   /* -------------------------------------------- */
-  async addRoleAbility(event, item, dataItem) {
-    let newItem = duplicate(item.data)
-    newItem._id = randomID(dataItem.id.length)
+  async addRoleAbility(event, item) {
+    let newItem = duplicate(item)
+    newItem._id = randomID(item.id.length)
     if (event.toElement.className == 'drop-specialability') {
-      let abiArray = duplicate(this.object.data.data.specialability)
+      let abiArray = duplicate(this.object.system.specialability)
       abiArray.push(newItem)
-      await this.object.update({ 'data.specialability': abiArray })
+      await this.object.update({ 'system.specialability': abiArray })
     }
   }
 
   /* -------------------------------------------- */
-  async addPower(event, item, dataItem) {
-    let newItem = duplicate(item.data);
-    newItem._id = randomID(dataItem.id.length);
+  async addPower(event, item) {
+    let newItem = duplicate(item);
+    newItem._id = randomID(item.id.length);
     if (event.toElement.className == 'drop-spec-power') {
-      let powArray = duplicate(this.object.data.data.powers);
+      let powArray = duplicate(this.object.system.powers);
       powArray.push(newItem);
-      await this.object.update({ 'data.powers': powArray });
+      await this.object.update({ 'system.powers': powArray });
     }
   }
 
   /* -------------------------------------------- */
-  async addAbilityPower(event, item, dataItem) {
-    let newItem = duplicate(item.data);
-    newItem._id = randomID(dataItem.id.length);
+  async addAbilityPower(event, item) {
+    let newItem = duplicate(item);
+    newItem._id = randomID(item.id.length);
     if (event.toElement.className == 'drop-ability-power') {
-      let powArray = duplicate(this.object.data.data.powersgained);
+      let powArray = duplicate(this.object.system.powersgained);
       powArray.push(newItem);
-      await this.object.update({ 'data.powersgained': powArray });
+      await this.object.update({ 'system.powersgained': powArray });
     }
   }
   /* -------------------------------------------- */
-  async addAbilityEffect(event, item, dataItem) {
-    let newItem = duplicate(item.data);
-    newItem._id = randomID(dataItem.id.length);
+  async addAbilityEffect(event, item) {
+    let newItem = duplicate(item);
+    newItem._id = randomID(item.id.length);
     if (event.toElement.className == 'drop-ability-effect') {
-      let powArray = duplicate(this.object.data.data.effectsgained);
+      let powArray = duplicate(this.object.system.effectsgained);
       powArray.push(newItem);
-      await this.object.update({ 'data.effectsgained': powArray });
+      await this.object.update({ 'system.effectsgained': powArray });
     }
   }
 
   /* -------------------------------------------- */
-  async addAbilitySpec(event, item, dataItem) {
-    let newItem = duplicate(item.data);
-    newItem._id = randomID(dataItem.id.length);
+  async addAbilitySpec(event, item) {
+    let newItem = duplicate(item);
+    newItem._id = randomID(item.id.length);
     if (event.toElement.className == 'drop-ability-spec') {
-      let powArray = duplicate(this.object.data.data.specialisations);
+      let powArray = duplicate(this.object.system.specialisations);
       powArray.push(newItem);
-      await this.object.update({ 'data.specialisations': powArray });
+      await this.object.update({ 'system.specialisations': powArray });
     }
   }
   /* -------------------------------------------- */
-  async addAbilityWeaponArmor(event, item, dataItem) {
-    let newItem = duplicate(item.data);
-    newItem._id = randomID(dataItem.id.length);
+  async addAbilityWeaponArmor(event, item) {
+    let newItem = duplicate(item);
+    newItem._id = randomID(item.id.length);
     if (event.toElement.className == 'drop-ability-weapon') {
-      let weaponArray = duplicate(this.object.data.data.attackgained);
+      let weaponArray = duplicate(this.object.system.attackgained);
       weaponArray.push(newItem);
-      await this.object.update({ 'data.attackgained': weaponArray });
+      await this.object.update({ 'system.attackgained': weaponArray });
     }
     if (event.toElement.className == 'drop-ability-armor') {
-      let armorArray = duplicate(this.object.data.data.armorgained);
+      let armorArray = duplicate(this.object.system.armorgained);
       armorArray.push(newItem);
-      await this.object.update({ 'data.armorgained': armorArray });
+      await this.object.update({ 'system.armorgained': armorArray });
     }
   }
 
   /* -------------------------------------------- */
-  async addPerkSpecialisation(event, item, dataItem) {
-    let newItem = duplicate(item.data);
+  async addPerkSpecialisation(event, item) {
+    let newItem = duplicate(item);
     if (event.toElement.className == 'drop-spec-perk') {
       //console.log("PER SPEC", event)
       let key = event.toElement.dataset["key"];
       if (key == 'affectedspec') {
-        await this.object.update({ 'data.features.affectedspec.value': newItem.name });
+        await this.object.update({ 'system.features.affectedspec.value': newItem.name });
       } else {
-        await this.object.update({ 'data.features.gainspecdice.value': newItem.name });
+        await this.object.update({ 'system.features.gainspecdice.value': newItem.name });
       }
     }
   }
 
   /* -------------------------------------------- */
-  async addPerkEffect(event, item, dataItem) {
-    let newItem = duplicate(item.data)
+  async addPerkEffect(event, item) {
+    let newItem = duplicate(item)
     if (event.toElement.className == 'drop-perk-effect') {
-      let effectArray = duplicate(this.object.data.data.effectsgained)
+      let effectArray = duplicate(this.object.system.effectsgained)
       effectArray.push(newItem)
-      await this.object.update({ 'data.effectsgained': effectArray })
+      await this.object.update({ 'system.effectsgained': effectArray })
     }
   }
 
   /* -------------------------------------------- */
-  async addEffectPower(event, item, dataItem) {
-    let newItem = duplicate(item.data)
+  async addEffectPower(event, item) {
+    let newItem = duplicate(item)
     if (event.toElement.className == 'drop-power-effect') {
-      let effectArray = duplicate(this.object.data.data.effectsgained)
+      let effectArray = duplicate(this.object.system.effectsgained)
       effectArray.push(newItem);
-      await this.object.update({ 'data.effectsgained': effectArray })
+      await this.object.update({ 'system.effectsgained': effectArray })
     }
   }
 
   /* -------------------------------------------- */
-  async addEffectSpec(event, item, dataItem) {
-    let newItem = duplicate(item.data);
+  async addEffectSpec(event, item) {
+    let newItem = duplicate(item);
     if (event.toElement.className == 'drop-effect-spec') {
-      let specArray = duplicate(this.object.data.data.recoveryrollspec);
+      let specArray = duplicate(this.object.system.recoveryrollspec);
       specArray.push(newItem);
-      await this.object.update({ 'data.recoveryrollspec': specArray });
+      await this.object.update({ 'system.recoveryrollspec': specArray });
     }
     if (event.toElement.className == 'drop-effect-specaffected') {
-      let specArray = duplicate(this.object.data.data.specaffected);
+      let specArray = duplicate(this.object.system.specaffected);
       specArray.push(newItem);
-      await this.object.update({ 'data.specaffected': specArray });
+      await this.object.update({ 'system.specaffected': specArray });
     }
   }
 
   /* -------------------------------------------- */
-  async addEffectItem(event, item, dataItem) {
-    let newItem = duplicate(item.data);
+  async addEffectItem(event, item) {
+    let newItem = duplicate(item);
     if (event.toElement.className == 'drop-equipment-effect') {
-      let effectArray = duplicate(this.object.data.data.effects);
+      let effectArray = duplicate(this.object.system.effects);
       effectArray.push(newItem);
-      await this.object.update({ 'data.effects': effectArray });
+      await this.object.update({ 'system.effects': effectArray });
     }
   }
   /* -------------------------------------------- */
-  async addEffectVirtueVice(event, item, dataItem) {
-    let newItem = duplicate(item.data);
+  async addEffectVirtueVice(event, item) {
+    let newItem = duplicate(item);
     if (event.toElement.className == 'drop-virtue-vice-effect') {
-      let effectArray = duplicate(this.object.data.data.effectsgained);
+      let effectArray = duplicate(this.object.system.effectsgained);
       effectArray.push(newItem);
-      await this.object.update({ 'data.effectsgained': effectArray });
+      await this.object.update({ 'system.effectsgained': effectArray });
     }
   }
   /* -------------------------------------------- */
-  async addViceToVirtue(event, item, dataItem) {
-    let newItem = duplicate(item.data);
+  async addViceToVirtue(event, item) {
+    let newItem = duplicate(item);
     if (event.toElement.className == 'drop-virtue-vice') {
-      let viceArray = duplicate(this.object.data.data.unavailablevice);
+      let viceArray = duplicate(this.object.system.unavailablevice);
       viceArray.push(newItem);
-      await this.object.update({ 'data.unavailablevice': viceArray });
+      await this.object.update({ 'system.unavailablevice': viceArray });
     }
   }
   /* -------------------------------------------- */
-  async addVirtueToVice(event, item, dataItem) {
-    let newItem = duplicate(item.data);
+  async addVirtueToVice(event, item) {
+    let newItem = duplicate(item);
     if (event.toElement.className == 'drop-vice-virtue') {
-      let virtueArray = duplicate(this.object.data.data.unavailablevirtue);
+      let virtueArray = duplicate(this.object.system.unavailablevirtue);
       virtueArray.push(newItem);
-      await this.object.update({ 'data.unavailablevirtue': virtueArray });
+      await this.object.update({ 'system.unavailablevirtue': virtueArray });
     }
   }
 
@@ -423,140 +423,101 @@ export class PegasusItemSheet extends ItemSheet {
   /* -------------------------------------------- */
   async _onDrop(event) {
 
+    let data = event.dataTransfer.getData('text/plain')
+    let dataItem = JSON.parse( data)
+    console.log("DROP", event, dataItem )
+    const item = fromUuidSync(dataItem.uuid)
+    if (!item) {
+      ui.notifications.warn("Unable to find relevant item  - Aborting drag&drop " + data.uuid)
+      return
+    }
+
     if (this.object.type == 'virtue' ) {      
-      let data = event.dataTransfer.getData('text/plain');
-      if (data) {
-        let dataItem = JSON.parse(data);
-        let item = await PegasusUtility.searchItem(dataItem);
-        if (item.data.type == 'effect') {
-          return this.addEffectVirtueVice(event, item, dataItem);
-        }
-        if (item.data.type == 'vice') {
-          return this.addViceToVirtue(event, item, dataItem);
-        }
+      if (item.type == 'effect') {
+        return this.addEffectVirtueVice(event, item);
+      }
+      if (item.type == 'vice') {
+        return this.addViceToVirtue(event, item);
       }
     }
+
     if (this.object.type == 'vice' ) {      
-      let data = event.dataTransfer.getData('text/plain');
-      if (data) {
-        let dataItem = JSON.parse(data);
-        let item = await PegasusUtility.searchItem(dataItem);
-        if (item.data.type == 'effect') {
-          return this.addEffectVirtueVice(event, item, dataItem);
-        }
-        if (item.data.type == 'virtue') {
-          return this.addVirtueToVice(event, item, dataItem);
-        }
+      if (item.type == 'effect') {
+        return this.addEffectVirtueVice(event, item);
+      }
+      if (item.type == 'virtue') {
+        return this.addVirtueToVice(event, item);
       }
     }
 
     if (this.object.type == 'weapon' || this.object.type == 'armor' || this.object.type == 'shield'
         || this.object.type == 'equipment' || this.object.type == 'vehiclemodule'
         || this.object.type == 'vehicleweaponmodule') {      
-      let data = event.dataTransfer.getData('text/plain');
-      if (data) {
-        let dataItem = JSON.parse(data);
-        let item = await PegasusUtility.searchItem(dataItem);
-        if (item.data.type == 'effect') {
-          return this.addEffectItem(event, item, dataItem);
-        }
+      if (item.type == 'effect') {
+        return this.addEffectItem(event, item);
       }
     }
 
     if (this.object.type == 'power') {
-      let data = event.dataTransfer.getData('text/plain');
-      if (data) {
-        let dataItem = JSON.parse(data);
-        let item = await PegasusUtility.searchItem(dataItem);
-        if (item.data.type == 'effect') {
-          return this.addEffectPower(event, item, dataItem);
-        }
+      if (item.type == 'effect') {
+        return this.addEffectPower(event, item);
       }
     }
 
     if (this.object.type == 'effect') {
-      let data = event.dataTransfer.getData('text/plain');
-      if (data) {
-        let dataItem = JSON.parse(data);
-        let item = await PegasusUtility.searchItem(dataItem);
-        if (item.data.type == 'specialisation') {
-          return this.addEffectSpec(event, item, dataItem);
-        }
+      if (item.type == 'specialisation') {
+        return this.addEffectSpec(event, item);
       }
     }
 
     if (this.object.type == 'race') {
-      let data = event.dataTransfer.getData('text/plain');
-      if (data) {
-        let dataItem = JSON.parse(data);
-        let item = await PegasusUtility.searchItem(dataItem);
-        if (item.data.type == 'ability') {
-          return this.addAbility(event, item, dataItem);
-        }
-        if (item.data.type == 'perk') {
-          return this.addRacePerk(event, item, dataItem);
-        }
+      if (item.type == 'ability') {
+        return this.addAbility(event, item);
+      }
+      if (item.type == 'perk') {
+        return this.addRacePerk(event, item);
       }
     }
 
     if (this.object.type == 'perk') {
-      let data = event.dataTransfer.getData('text/plain')
-      if (data) {
-        let dataItem = JSON.parse(data);
-        let item = await PegasusUtility.searchItem(dataItem)
-        if (item.data.type == 'specialisation') {
-          return this.addPerkSpecialisation(event, item, dataItem)
-        }
-        if (item.data.type == 'effect') {
-          return this.addPerkEffect(event, item, dataItem);
-        }
+      if (item.type == 'specialisation') {
+        return this.addPerkSpecialisation(event, item)
+      }
+      if (item.type == 'effect') {
+        return this.addPerkEffect(event, item);
       }
     }
 
     if (this.object.type == 'specialisation') {
-      let data = event.dataTransfer.getData('text/plain');
-      if (data) {
-        let dataItem = JSON.parse(data);
-        let item = await PegasusUtility.searchItem(dataItem);
-        if (item.data.type == 'power') {
-          return this.addPower(event, item, dataItem);
-        }
+      if (item.type == 'power') {
+        return this.addPower(event, item);
       }
     }
+
     if (this.object.type == 'ability') {
-      let data = event.dataTransfer.getData('text/plain');
-      if (data) {
-        let dataItem = JSON.parse(data);
-        let item = await PegasusUtility.searchItem(dataItem);
-        if (item.data.type == 'effect') {
-          return this.addAbilityEffect(event, item, dataItem);
-        }
-        if (item.data.type == 'power') {
-          return this.addAbilityPower(event, item, dataItem);
-        }
-        if (item.data.type == 'specialisation') {
-          return this.addAbilitySpec(event, item, dataItem);
-        }
-        if (item.data.type == 'weapon' || item.data.type == 'armor') {
-          return this.addAbilityWeaponArmor(event, item, dataItem);
-        }
+      if (item.type == 'effect') {
+        return this.addAbilityEffect(event, item);
+      }
+      if (item.type == 'power') {
+        return this.addAbilityPower(event, item);
+      }
+      if (item.type == 'specialisation') {
+        return this.addAbilitySpec(event, item);
+      }
+      if (item.type == 'weapon' || item.type == 'armor') {
+        return this.addAbilityWeaponArmor(event, item);
       }
     }
 
     if (this.object.type == 'role') {
-      let data = event.dataTransfer.getData('text/plain')
-      if (data) {
-        let dataItem = JSON.parse(data)
-        let item = await PegasusUtility.searchItem(dataItem)
-        if (item.data.type == 'specialisation') {
-          return this.addRoleSpecialisation(event, item, dataItem)
-        }
-        if (item.data.type == 'perk') {
-          return this.addRolePerk(event, item, dataItem)
-        }
-        if (item.data.type == 'ability') {
-          return this.addRoleAbility(event, item, dataItem)
-        }
+      if (item.type == 'specialisation') {
+        return this.addRoleSpecialisation(event, item)
+      }
+      if (item.type == 'perk') {
+        return this.addRolePerk(event, item)
+      }
+      if (item.type == 'ability') {
+        return this.addRoleAbility(event, item)
       }
     }
     ui.notifications.warn("This item can not be dropped over another item")
diff --git a/modules/pegasus-roll-dialog.js b/modules/pegasus-roll-dialog.js
index a609326..e695ca3 100644
--- a/modules/pegasus-roll-dialog.js
+++ b/modules/pegasus-roll-dialog.js
@@ -51,10 +51,10 @@ export class PegasusRollDialog extends Dialog {
       let level, genre, idVal, key
       if (effect.type == 'effect') {
         let effectData = effect.effect
-        level = effectData.data.effectlevel
-        genre = effectData.data.genre
-        effectData.data.isUsed = toggled
-        if (effectData.data.reducedicevalue || effectData.data.statdice) {
+        level = effectData.system.effectlevel
+        genre = effectData.system.genre
+        effectData.system.isUsed = toggled
+        if (effectData.system.reducedicevalue || effectData.system.statdice) {
           idVal = "#statDicesLevel"
           key = "statLevelBonus"
         }
@@ -124,13 +124,13 @@ export class PegasusRollDialog extends Dialog {
     if (equip) {
       equip.applied = toggled
       let idVal = "#damageDiceLevel" // Default
-      if (equip.equip.data.bonusdice) {
+      if (equip.equip.system.bonusdice) {
         idVal = "#bonusDicesLevel"
       }
-      if (equip.equip.data.statdice) {
+      if (equip.equip.system.statdice) {
         idVal = "#statDicesLevel"
       }
-      if (equip.equip.data.otherdice) {
+      if (equip.equip.system.otherdice) {
         idVal = "#damageDiceLevel"
       }
       let newLevel = Number($(idVal).val())
@@ -170,7 +170,7 @@ export class PegasusRollDialog extends Dialog {
       this.rollData.selectedSpec = event.currentTarget.value
       let spec = this.rollData.specList.find(item => item._id == this.rollData.selectedSpec)
       if (spec) {
-        this.rollData.specDicesLevel = spec.data.level
+        this.rollData.specDicesLevel = spec.system.level
         this.rollData.specName = spec.name
         $('#specDicesLevel').val(this.rollData.specDicesLevel)
       } else {
diff --git a/modules/pegasus-utility.js b/modules/pegasus-utility.js
index d780116..4926d32 100644
--- a/modules/pegasus-utility.js
+++ b/modules/pegasus-utility.js
@@ -109,12 +109,12 @@ export class PegasusUtility {
   static updateEffectsBonusDice(rollData) {
     let newDicePool = rollData.dicePool.filter(dice => dice.name != "effect-bonus-dice")
     for (let effect of rollData.effectsList) {
-      if (effect && effect.applied && effect.type == "effect" && effect.effect.data.bonusdice) {
-        let diceKey = PegasusUtility.getDiceFromLevel(effect.effect.data.effectlevel)
+      if (effect && effect.applied && effect.type == "effect" && effect.effect.system.bonusdice) {
+        let diceKey = PegasusUtility.getDiceFromLevel(effect.effect.system.effectlevel)
         let diceList = diceKey.split(" ")
         for (let myDice of diceList) {
           let newDice = {
-            name: "effect-bonus-dice", key: myDice, level: effect.effect.data.effectlevel, effect: effect.effect.name,
+            name: "effect-bonus-dice", key: myDice, level: effect.effect.system.effectlevel, effect: effect.effect.name,
             img: `systems/fvtt-pegasus-rpg/images/dice/${myDice}.webp`
           }
           newDicePool.push(newDice)
@@ -128,8 +128,8 @@ export class PegasusUtility {
   static updateHindranceBonusDice(rollData) {
     let newDicePool = rollData.dicePool.filter(dice => dice.name != "effect-hindrance")
     for (let hindrance of rollData.effectsList) {
-      if (hindrance && hindrance.applied && (hindrance.type == "hindrance" || (hindrance.type == "effect" && hindrance.effect?.data?.hindrance) ) ) {
-        let diceKey = PegasusUtility.getDiceFromLevel( (hindrance.value) ? hindrance.value : hindrance.effect.data.effectlevel)
+      if (hindrance && hindrance.applied && (hindrance.type == "hindrance" || (hindrance.type == "effect" && hindrance.effect?.system?.hindrance) ) ) {
+        let diceKey = PegasusUtility.getDiceFromLevel( (hindrance.value) ? hindrance.value : hindrance.effect.system.effectlevel)
         let diceList = diceKey.split(" ")
         for (let myDice of diceList) {
           let newDice = {
@@ -500,19 +500,6 @@ export class PegasusUtility {
     return undefined;
   }
 
-  /* -------------------------------------------- */
-  static templateData(it) {
-    return PegasusUtility.data(it)?.data ?? {}
-  }
-
-  /* -------------------------------------------- */
-  static data(it) {
-    if (it instanceof Actor || it instanceof Item || it instanceof Combatant) {
-      return it.data;
-    }
-    return it;
-  }
-
   /* -------------------------------------------- */
   static getDiceValue(level = 0) {
     let diceString = this.diceList[level]
@@ -716,7 +703,7 @@ export class PegasusUtility {
     // De-actived used effects from perks
     let toRem = []
     for (let effect of rollData.effectsList) {
-      if (effect.effect.data.perkId && effect.effect.data.isUsed) {
+      if (effect.effect.system.perkId && effect.effect.system.isUsed) {
         toRem.push(effect.effect._id)
       }
     }
@@ -731,7 +718,7 @@ export class PegasusUtility {
     // De-actived used effects from perks
     let toRem = []
     for (let effect of rollData.effectsList) {
-      if (effect.effect && effect.effect.data.isUsed && effect.effect.data.oneuse) {
+      if (effect.effect && effect.effect.system.isUsed && effect.effect.system.oneuse) {
         effect.defenderTokenId = rollData.defenderTokenId
         if (effect.foreign) {
           if (game.user.isGM) {
@@ -896,7 +883,7 @@ export class PegasusUtility {
 
   /* -------------------------------------------- */
   static getUsers(filter) {
-    return game.users.filter(filter).map(user => user.data._id);
+    return game.users.filter(filter).map(user => user.id);
   }
   /* -------------------------------------------- */
   static getWhisperRecipients(rollMode, name) {
diff --git a/system.json b/system.json
index e120c2d..8ea277c 100644
--- a/system.json
+++ b/system.json
@@ -1,6 +1,4 @@
 {
-  "author": "Uberwald",
-  "compatibleCoreVersion": "9",
   "description": "Pegasus RPG system for FoundryVTT",
   "download": "https://www.uberwald.me/data/files/fvtt-pegasus-rpg/fvtt-pegasus-rpg.zip",
   "esmodules": [
@@ -15,13 +13,23 @@
       "path": "lang/en.json"
     }
   ],
+  "authors": [
+    {
+      "name": "Uberwald",
+      "flags": {}
+    }
+  ],
   "library": false,
   "license": "LICENSE.txt",
   "manifest": "https://www.uberwald.me/data/files/fvtt-pegasus-rpg/system.json",
   "manifestPlusVersion": "1.0.0",
   "media": [],
-  "minimumCoreVersion": "0.8.0",
-  "name": "fvtt-pegasus-rpg",
+  "compatibility": {
+    "minimum": "10",
+    "verified": "10.284",
+    "maximum": "10"
+  },
+  "id": "fvtt-pegasus-rpg",
   "packs": [
     {
       "type": "Item",
@@ -273,6 +281,6 @@
   "templateVersion": 109,
   "title": "Pegasus RPG",
   "url": "https://www.uberwald.me/data/files/fvtt-pegasus-rpg",
-  "version": "0.6.27",
+  "version": "10.0.0",
   "background" : "./images/ui/pegasus_welcome_page.webp"
 }
diff --git a/templates/actor-sheet.html b/templates/actor-sheet.html
index e2b3392..1c092b5 100644
--- a/templates/actor-sheet.html
+++ b/templates/actor-sheet.html
@@ -43,14 +43,14 @@
                     <h4 class="stat-text-white stat-margin"><a class="roll-stat stat-margin" data-stat-key="mr">MR</a>
                     </h4>
                   </span>
-                  <select class="status-small-label color-class-common" type="text" name="data.mr.value"
+                  <select class="status-small-label color-class-common" type="text" name="system.mr.value"
                     value="{{data.mr.value}}" data-dtype="Number" {{#unless @root.editScore}}disabled{{/unless}}>
                     {{#select data.mr.value}}
                     {{{@root.optionsDiceList}}}
                     {{/select}}
                   </select>
                   <input type="text" class="input-numeric-short padd-right status-small-label color-class-common"
-                    name="data.mr.mod" value="{{data.mr.mod}}" data-dtype="Number" {{#unless
+                    name="system.mr.mod" value="{{data.mr.mod}}" data-dtype="Number" {{#unless
                     @root.editScore}}disabled{{/unless}} />
                 </li>
               </ul>
@@ -62,7 +62,7 @@
 
             <!--
                             <label class="status-small-label">Active NRG</label> 
-                          <input type="text" class="padd-right status-small-label no-grow" name="data.nrg.activated" value="{{data.nrg.activated}}" data-dtype="Number"/>
+                          <input type="text" class="padd-right status-small-label no-grow" name="system.nrg.activated" value="{{data.nrg.activated}}" data-dtype="Number"/>
                           -->
 
           </div>
@@ -158,10 +158,10 @@
             <ul class="stat-list alternate-list">
               <li class="item stat flexrow list-item">
                 <span class="generic-label small-label">Current</span>
-                <input type="text" class="" name="data.combat.stunlevel" value="{{data.combat.stunlevel}}"
+                <input type="text" class="" name="system.combat.stunlevel" value="{{data.combat.stunlevel}}"
                   data-dtype="Number" />
                 <span class="generic-label small-label">Threshold</span>
-                <input type="text" class="" name="data.combat.stunthreshold" value="{{data.combat.stunthreshold}}"
+                <input type="text" class="" name="system.combat.stunthreshold" value="{{data.combat.stunthreshold}}"
                   data-dtype="Number" />
               </li>
             </ul>
@@ -205,16 +205,16 @@
                   src="{{perk.img}}" /></a>
               <span class="item-name-label-long">{{perk.name}}</span>
 
-              <span class="item-field-label-short">{{perk.data.level}}</span>
+              <span class="item-field-label-short">{{perk.system.level}}</span>
 
-              {{#if perk.data.features.range.flag}}
-              <span class="item-field-label-medium">{{perk.data.features.range.value}}</span>
+              {{#if perk.system.features.range.flag}}
+              <span class="item-field-label-medium">{{perk.system.features.range.value}}</span>
               {{else}}
               <span class="item-field-label-medium">&nbsp;-&nbsp;</span>
 
               {{/if}}
-              {{#if perk.data.features.nbtargets.flag}}
-              <span class="item-field-label-short">{{perk.data.features.nbtargets.value}}</span>
+              {{#if perk.system.features.nbtargets.flag}}
+              <span class="item-field-label-short">{{perk.system.features.nbtargets.value}}</span>
               {{else}}
               <span class="item-field-label-short">&nbsp;-&nbsp;</span>
               {{/if}}
@@ -224,8 +224,8 @@
                 {{#if (eq @root.traumaState "severetrauma")}}
                   Disabled
                 {{else}}
-                  <select class="perk-status" type="text" value="{{perk.data.status}}" data-dtype="String">
-                    {{#select perk.data.status}}
+                  <select class="perk-status" type="text" value="{{perk.system.status}}" data-dtype="String">
+                    {{#select perk.system.status}}
                     <option value="ready">Ready</option>
                     <option value="activated">Activated</option>
                     <option value="round2">2 Rounds left</option>
@@ -235,38 +235,38 @@
                 {{/if}}
               </span>
 
-              {{#if (ne perk.data.status "ready")}}
-              {{#if (eq perk.data.nbuse "next1action")}}
+              {{#if (ne perk.system.status "ready")}}
+              {{#if (eq perk.system.nbuse "next1action")}}
               <span class="item-field-label-short "><label
                   class="item-field-label-short attribute-value checkbox"><input type="checkbox" class="perk-used"
-                    data-use-index="1" name="perk.data.used1" {{checked perk.data.used1}} /></label></span>
+                    data-use-index="1" name="perk.system.used1" {{checked perk.system.used1}} /></label></span>
               <span class="item-field-label-short ">&nbsp;</span>
               <span class="item-field-label-short ">&nbsp;</span>
               {{/if}}
-              {{#if (eq perk.data.nbuse "next2action")}}
+              {{#if (eq perk.system.nbuse "next2action")}}
               <span class="item-field-label-short "><label
                   class="item-field-label-short attribute-value checkbox"></label><input type="checkbox"
-                  class="perk-used" data-use-index="1" name="perk.data.used1" {{checked
-                  perk.data.used1}} /></label></span>
+                  class="perk-used" data-use-index="1" name="perk.system.used1" {{checked
+                  perk.system.used1}} /></label></span>
               <span class="item-field-label-short "><label
                   class="item-field-label-short attribute-value checkbox"></label><input type="checkbox"
-                  class="perk-used" data-use-index="2" name="perk.data.used2" {{checked
-                  perk.data.used2}} /></label></span>
+                  class="perk-used" data-use-index="2" name="perk.system.used2" {{checked
+                  perk.system.used2}} /></label></span>
               <span class="item-field-label-short ">&nbsp;</span>
               {{/if}}
-              {{#if (eq perk.data.nbuse "next3action")}}
+              {{#if (eq perk.system.nbuse "next3action")}}
               <span class="item-field-label-short "><label
                   class="item-field-label-short attribute-value checkbox"></label><input type="checkbox"
-                  class="perk-used" data-use-index="1" name="perk.data.used1" {{checked
-                  perk.data.used1}} /></label></span>
+                  class="perk-used" data-use-index="1" name="perk.system.used1" {{checked
+                  perk.system.used1}} /></label></span>
               <span class="item-field-label-short "><label
                   class="item-field-label-short attribute-value checkbox"></label><input type="checkbox"
-                  class="perk-used" data-use-index="2" name="perk.data.used2" {{checked
-                  perk.data.used2}} /></label></span>
+                  class="perk-used" data-use-index="2" name="perk.system.used2" {{checked
+                  perk.system.used2}} /></label></span>
               <span class="item-field-label-short "><label
                   class="item-field-label-short attribute-value checkbox"></label><input type="checkbox"
-                  class="perk-used" data-use-index="3" name="perk.data.used3" {{checked
-                  perk.data.used3}} /></label></span>
+                  class="perk-used" data-use-index="3" name="perk.system.used3" {{checked
+                  perk.system.used3}} /></label></span>
               {{/if}}
               {{else}}
               <span class="item-field-label-short "><label class="item-field-label-short">&nbsp;</label></span>
@@ -307,10 +307,10 @@
             <a class="item-edit item-name-img" title="Edit Item"><img class="sheet-competence-img"
                 src="{{effect.img}}" /></a>
             <span class="item-name-label-long2">{{effect.name}}</span>
-            <span class="item-field-label-short">{{effect.data.effectlevel}}</span>
-            <span class="item-field-label-short">{{upperFirst effect.data.type}}</span>
-            <span class="item-field-label-short">{{upperFirst effect.data.genre}}</span>
-            <span class="item-field-label-short">{{upper effect.data.stataffected}}</span>
+            <span class="item-field-label-short">{{effect.system.effectlevel}}</span>
+            <span class="item-field-label-short">{{upperFirst effect.system.type}}</span>
+            <span class="item-field-label-short">{{upperFirst effect.datsystema.genre}}</span>
+            <span class="item-field-label-short">{{upper effect.system.stataffected}}</span>
             <div class="item-filler">&nbsp;</div>
             <div class="item-controls item-controls-fixed">
               <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
@@ -344,10 +344,10 @@
           <a class="item-edit item-name-img" title="Edit Item"><img class="sheet-competence-img"
               src="{{spec.img}}" /></a>
           <span class="item-name-label"><a class="roll-spec">{{spec.name}}</a></span>
-          <span class="item-field-label-short">{{upper spec.data.statistic}}</span>
-          <span class="item-field-label-short">{{spec.data.dice}}</span>
-          {{#if spec.data.ispowergroup}}
-          {{#if spec.data.powersactivated}}
+          <span class="item-field-label-short">{{upper spec.system.statistic}}</span>
+          <span class="item-field-label-short">{{spec.system.dice}}</span>
+          {{#if spec.system.ispowergroup}}
+          {{#if spec.system.powersactivated}}
           <span class="item-field-label-long"><a class="spec-group-deactivate">Deactivate</a></span>
           {{else}}
           <span class="item-field-label-long"><a class="spec-group-activate">Activate</a></span>
@@ -379,17 +379,17 @@
               <h4>{{data.nrg.label}}</h4>
             </span>
             <span class="small-label padd-right packed-left">Activated</span><input type="text"
-              class="padd-right update-field" data-field-name="data.nrg.activated" value="{{data.nrg.activated}}"
+              class="padd-right update-field" data-field-name="system.nrg.activated" value="{{data.nrg.activated}}"
               data-dtype="Number" />
             <span class="small-label padd-right packed-left">&nbsp;Current</span><input type="text"
-              class="padd-right update-field" data-field-name="data.nrg.value" value="{{data.nrg.value}}"
+              class="padd-right update-field" data-field-name="system.nrg.value" value="{{data.nrg.value}}"
               data-dtype="Number" />
               <a class="current-nrg-plus plus-minus-button">+</a>/<a class="current-nrg-minus plus-minus-button">&nbsp;-</a>
             <span class="small-label padd-right packed-left">&nbsp;Mod</span><input type="text"
-              class="padd-right update-field" data-field-name="data.nrg.mod" value="{{data.nrg.mod}}"
+              class="padd-right update-field" data-field-name="system.nrg.mod" value="{{data.nrg.mod}}"
               data-dtype="Number" />
             <span class="small-label padd-right packed-left">&nbsp;Max</span><input type="text"
-              class="padd-right update-field" data-field-name="data.nrg.max" value="{{data.nrg.max}}"
+              class="padd-right update-field" data-field-name="system.nrg.max" value="{{data.nrg.max}}"
               data-dtype="Number" />
             <span class="small-label padd-right packed-left"> / {{data.nrg.absolutemax}}</span>
           </li>
@@ -398,11 +398,11 @@
               <h4>Power Purchase Points (PPP)</h4>
             </span>
             <span class="small-label padd-right packed-left">Available PPP</span><input type="text"
-              class="padd-right input-numeric-short" name="data.ppp.available" value="{{data.ppp.available}}"
+              class="padd-right input-numeric-short" name="system.ppp.available" value="{{data.ppp.available}}"
               data-dtype="Number" />            
             &nbsp;&nbsp;
             <span class="small-label padd-right packed-left">Spent PPP</span><input type="text"
-              class="padd-right input-numeric-short" name="data.ppp.spent" value="{{data.ppp.spent}}"
+              class="padd-right input-numeric-short" name="system.ppp.spent" value="{{data.ppp.spent}}"
               data-dtype="Number" />            
           </li>
         </ul>
@@ -440,16 +440,16 @@
             <a class="item-edit item-name-img" title="Edit Item"><img class="sheet-competence-img"
                 src="{{power.img}}" /></a>
             <span class="item-name-label">
-              {{#if power.data.rollneeded}}
+              {{#if power.system.rollneeded}}
               <a class="power-roll">{{power.name}}</a>
               {{else}}
               {{power.name}}
               {{/if}}
             </span>
-            <span class="item-field-label-medium">{{upperFirst power.data.type}}</span>
+            <span class="item-field-label-medium">{{upperFirst power.system.type}}</span>
 
             <span class="item-field-label-short"><label class="short-label">
-                {{#if power.data.activated}}
+                {{#if power.system.activated}}
                 Activated
                 {{else}}
                 &nbsp;-&nbsp;
@@ -457,27 +457,27 @@
               </label>
             </span>
 
-            <span class="item-field-label-medium">{{upperFirst power.data.action}}</span>
+            <span class="item-field-label-medium">{{upperFirst power.system.action}}</span>
 
             <span class="item-field-label-medium"><a class="power-dmg-roll">
-                {{#if power.data.dmgroll}}
-                {{upper power.data.dmgstatistic}}
+                {{#if power.system.dmgroll}}
+                {{upper power.system.dmgstatistic}}
                 {{else}}
                 &nbsp;-&nbsp;
                 {{/if}}
               </a></span>
 
-            <span class="item-field-label-medium">{{power.data.cost}}</span>
+            <span class="item-field-label-medium">{{power.system.cost}}</span>
             <span class="item-field-label-medium">
               <input type="text" class="padd-right input-numeric-short power-cost-spent"
-                value="{{power.data.costspent}}" data-dtype="Number" />
+                value="{{power.system.costspent}}" data-dtype="Number" />
             </span>
             
-            <span class="item-field-label-medium">{{power.data.powerlevel}}</span>
+            <span class="item-field-label-medium">{{power.system.powerlevel}}</span>
 
             <div class="item-filler">&nbsp;</div>
             <div class="item-controls item-controls-fixed">
-              <a class="item-control power-activate" title="Activated">{{#if power.data.activated}}<i
+              <a class="item-control power-activate" title="Activated">{{#if power.system.activated}}<i
                   class="fas fa-circle"></i>{{else}}<i class="fas fa-genderless"></i>{{/if}}</a>
               <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
             </div>
@@ -509,10 +509,10 @@
                 src="{{ability.img}}" /></a>
             <span class="item-name-label">{{ability.name}}</span>
 
-            <span class="item-field-label-long">{{upper ability.data.affectedstat}}</span>
-            <span class="item-field-label-medium">{{ability.data.statmodifier}}</span>
-            <span class="item-field-label-medium">{{upperFirst ability.data.statusaffected}}</span>
-            <span class="item-field-label-medium">{{ability.data.statusmodifier}}</span>
+            <span class="item-field-label-long">{{upper ability.system.affectedstat}}</span>
+            <span class="item-field-label-medium">{{ability.system.statmodifier}}</span>
+            <span class="item-field-label-medium">{{upperFirst ability.system.statusaffected}}</span>
+            <span class="item-field-label-medium">{{ability.system.statusmodifier}}</span>
 
             <div class="item-filler">&nbsp;</div>
             <div class="item-controls item-controls-fixed">
@@ -561,16 +561,16 @@
           <span class="item-name-label">{{money.name}}</span>
 
           <span class="item-field-label-long"><label>
-              {{money.data.quantity}}
+              {{money.system.quantity}}
               (<a class="quantity-minus plus-minus-button"> -</a>/<a class="quantity-plus plus-minus-button">+</a>)
             </label>
           </span>
           <span class="item-field-label-medium">
-            <label>{{money.data.weight}}</label>
+            <label>{{money.system.weight}}</label>
           </span>
           <span class="item-field-label-medium">
-            {{#if money.data.idrDice}}
-            <a class="roll-idr" data-dice-value="{{money.data.idrDice}}">{{money.data.idrDice}}</a>
+            {{#if money.system.idrDice}}
+            <a class="roll-idr" data-dice-value="{{money.system.idrDice}}">{{money.system.idrDice}}</a>
             {{else}}
             &nbsp;-&nbsp;
             {{/if}}
@@ -623,13 +623,13 @@
           <a class="item-edit item-name-img" title="Edit Item"><img class="sheet-competence-img"
               src="{{weapon.img}}" /></a>
           <span class="item-name-label">{{weapon.name}}</span>
-          <span class="item-field-label-short"><label>{{upper weapon.data.statistic}}</label></span>
-          <span class="item-field-label-short"><label>{{upper weapon.data.damagestatistic}}</label></span>
-          <span class="item-field-label-short"><label>{{weapon.data.damageDice}}</label></span>
-          <span class="item-field-label-medium"><label>{{weapon.data.damagetype}} ({{weapon.data.damagetypelevel}})</label></span>
+          <span class="item-field-label-short"><label>{{upper weapon.system.statistic}}</label></span>
+          <span class="item-field-label-short"><label>{{upper weapon.system.damagestatistic}}</label></span>
+          <span class="item-field-label-short"><label>{{weapon.system.damageDice}}</label></span>
+          <span class="item-field-label-medium"><label>{{weapon.system.damagetype}} ({{weapon.system.damagetypelevel}})</label></span>
 
-          {{#if (gt weapon.data.ammomax 0)}}
-          <span class="item-field-label-long"><label>{{weapon.data.ammocurrent}}/{{weapon.data.ammomax}}
+          {{#if (gt weapon.system.ammomax 0)}}
+          <span class="item-field-label-long"><label>{{weapon.system.ammocurrent}}/{{weapon.system.ammomax}}
               (<a class="ammo-minus plus-minus-button"> -</a>/<a class="ammo-plus plus-minus-button">+</a>)
             </label></span>
           {{else}}
@@ -638,8 +638,8 @@
           {{/if}}
 
           <span class="item-field-label-medium">
-            {{#if (count weapon.data.effects)}}
-            {{#if weapon.data.activated}}
+            {{#if (count weapon.system.effects)}}
+            {{#if weapon.system.activated}}
             <a class="equip-deactivate">Deactivate</a>
             {{else}}
             <a class="equip-activate">Activate</a>
@@ -648,11 +648,11 @@
             &nbsp;-&nbsp;
             {{/if}}
           </span>
-          <span class="item-field-label-short"><label>{{weapon.data.weight}}</label></span>
+          <span class="item-field-label-short"><label>{{weapon.system.weight}}</label></span>
 
           <span class="item-field-label-medium">
-            {{#if weapon.data.idrDice}}
-            <a class="roll-idr" data-dice-value="{{weapon.data.idrDice}}">{{weapon.data.idrDice}}</a>
+            {{#if weapon.system.idrDice}}
+            <a class="roll-idr" data-dice-value="{{weapon.system.idrDice}}">{{weapon.system.idrDice}}</a>
             {{else}}
             &nbsp;-&nbsp;
             {{/if}}
@@ -660,7 +660,7 @@
 
           <div class="item-filler">&nbsp;</div>
           <div class="item-controls item-controls-fixed">
-            <a class="item-control item-equip" title="Worn">{{#if weapon.data.equipped}}<i
+            <a class="item-control item-equip" title="Worn">{{#if weapon.system.equipped}}<i
                 class="fas fa-circle"></i>{{else}}<i class="fas fa-genderless"></i>{{/if}}</a>
             <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
           </div>
@@ -702,13 +702,13 @@
           <a class="item-edit item-name-img" title="Edit Item"><img class="sheet-competence-img"
               src="{{armor.img}}" /></a>
           <span class="item-name-label">{{armor.name}}</span>
-          <span class="item-field-label-short">{{upper armor.data.statistic}}</span>
-          <span class="item-field-label-short">{{armor.data.resistanceDice}}</span>
-          <span class="item-field-label-medium">{{armor.data.locationprotected}}</span>
+          <span class="item-field-label-short">{{upper armor.system.statistic}}</span>
+          <span class="item-field-label-short">{{armor.system.resistanceDice}}</span>
+          <span class="item-field-label-medium">{{armor.system.locationprotected}}</span>
 
           <span class="item-field-label-medium">
-            {{#if (count armor.data.effects)}}
-            {{#if armor.data.activated}}
+            {{#if (count armor.system.effects)}}
+            {{#if armor.system.activated}}
             <a class="equip-deactivate">Deactivate</a>
             {{else}}
             <a class="equip-activate">Activate</a>
@@ -718,10 +718,10 @@
             {{/if}}
           </span>
 
-          <span class="item-field-label-short">{{armor.data.weight}}</span>
+          <span class="item-field-label-short">{{armor.system.weight}}</span>
           <span class="item-field-label-medium">
-            {{#if armor.data.idrDice}}
-            <a class="roll-idr" data-dice-value="{{armor.data.idrDice}}">{{armor.data.idrDice}}</a>
+            {{#if armor.system.idrDice}}
+            <a class="roll-idr" data-dice-value="{{armor.system.idrDice}}">{{armor.system.idrDice}}</a>
             {{else}}
             &nbsp;-&nbsp;
             {{/if}}
@@ -729,7 +729,7 @@
 
           <div class="item-filler">&nbsp;</div>
           <div class="item-controls item-controls-fixed">
-            <a class="item-control item-equip" title="Worn">{{#if armor.data.equipped}}<i
+            <a class="item-control item-equip" title="Worn">{{#if armor.system.equipped}}<i
                 class="fas fa-circle"></i>{{else}}<i class="fas fa-genderless"></i>{{/if}}</a>
             <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
           </div>
@@ -764,11 +764,11 @@
           <a class="item-edit item-name-img" title="Edit Item"><img class="sheet-competence-img"
               src="{{shield.img}}" /></a>
           <span class="item-name-label">{{shield.name}}</span>
-          <span class="item-field-label-short">{{shield.data.levelDice}}</span>
+          <span class="item-field-label-short">{{shield.system.levelDice}}</span>
 
           <span class="item-field-label-medium">
-            {{#if (count shield.data.effects)}}
-            {{#if shield.data.activated}}
+            {{#if (count shield.system.effects)}}
+            {{#if shield.system.activated}}
             <a class="equip-deactivate">Deactivate</a>
             {{else}}
             <a class="equip-activate">Activate</a>
@@ -778,17 +778,17 @@
             {{/if}}
           </span>
 
-          <span class="item-field-label-short">{{shield.data.weight}}</span>
+          <span class="item-field-label-short">{{shield.system.weight}}</span>
           <span class="item-field-label-medium">
-            {{#if shield.data.idrDice}}
-            <a class="roll-idr" data-dice-value="{{shield.data.idrDice}}">{{shield.data.idrDice}}</a>
+            {{#if shield.system.idrDice}}
+            <a class="roll-idr" data-dice-value="{{shield.system.idrDice}}">{{shield.system.idrDice}}</a>
             {{else}}
             &nbsp;-&nbsp;
             {{/if}}
           </span>
           <div class="item-filler">&nbsp;</div>
           <div class="item-controls item-controls-fixed">
-            <a class="item-control item-equip" title="Worn">{{#if shield.data.equipped}}<i
+            <a class="item-control item-equip" title="Worn">{{#if shield.system.equipped}}<i
                 class="fas fa-circle"></i>{{else}}<i class="fas fa-genderless"></i>{{/if}}</a>
             <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
           </div>
@@ -822,7 +822,7 @@
         {{#each containersTree as |equip key|}}
         {{> systems/fvtt-pegasus-rpg/templates/partial-actor-equipment.html equip=equip level=1}}
         <ul class="item-list list-item-shadow2 list-item-margin1">
-          {{#each equip.data.contents as |subgear key|}}
+          {{#each equip.system.contents as |subgear key|}}
           {{> systems/fvtt-pegasus-rpg/templates/partial-actor-equipment.html equip=subgear level=2}}
           {{/each}}
         </ul>
@@ -840,24 +840,24 @@
           <ul class="item-list alternate-list">
             <li class="item flexrow">
               <label class="generic-label">Origin</label>
-              <input type="text" class="" name="data.biodata.origin" value="{{data.biodata.origin}}"
+              <input type="text" class="" name="system.biodata.origin" value="{{data.biodata.origin}}"
                 data-dtype="String" />
             </li>
             <li class="item flexrow">
               <label class="generic-label">Age</label>
-              <input type="text" class="" name="data.biodata.age" value="{{data.biodata.age}}" data-dtype="String" />
+              <input type="text" class="" name="system.biodata.age" value="{{data.biodata.age}}" data-dtype="String" />
             </li>
             <li class="item flexrow">
               <label class="generic-label">Height</label>
-              <input type="text" class="" name="data.biodata.size" value="{{data.biodata.size}}" data-dtype="String" />
+              <input type="text" class="" name="system.biodata.size" value="{{data.biodata.size}}" data-dtype="String" />
             </li>
             <li class="item flexrow">
               <label class="generic-label">Eyes</label>
-              <input type="text" class="" name="data.biodata.eyes" value="{{data.biodata.eyes}}" data-dtype="String" />
+              <input type="text" class="" name="system.biodata.eyes" value="{{data.biodata.eyes}}" data-dtype="String" />
             </li>
             <li class="item flexrow">
               <label class="generic-label">Hair</label>
-              <input type="text" class="" name="data.biodata.hair" value="{{data.biodata.hair}}" data-dtype="String" />
+              <input type="text" class="" name="system.biodata.hair" value="{{data.biodata.hair}}" data-dtype="String" />
             </li>
           </ul>
         </div>
@@ -865,22 +865,22 @@
           <ul>
             <li class="flexrow item">
               <label class="generic-label">Weight</label>
-              <input type="text" class="" name="data.biodata.weight" value="{{data.biodata.weight}}"
+              <input type="text" class="" name="system.biodata.weight" value="{{data.biodata.weight}}"
                 data-dtype="String" />
             </li>
             <li class="flexrow item">
               <label class="generic-label">Sex</label>
-              <input type="text" class="" name="data.biodata.sex" value="{{data.biodata.sex}}" data-dtype="String" />
+              <input type="text" class="" name="system.biodata.sex" value="{{data.biodata.sex}}" data-dtype="String" />
             </li>
             <li class="flexrow item">
               <label class="generic-label">Preferred Hand</label>
-              <input type="text" class="" name="data.biodata.preferredhand" value="{{data.biodata.preferredhand}}"
+              <input type="text" class="" name="system.biodata.preferredhand" value="{{data.biodata.preferredhand}}"
                 data-dtype="String" />
             </li>
             <li class="flexrow item" data-item-id="{{race._id}}">
               <label class="generic-label">Race</label>
               <a class="item-edit"><img class="stat-icon" src="{{race.img}}"></a>
-              <input type="text" class="" name="data.biodata.racename" value="{{race.name}}" disabled
+              <input type="text" class="" name="system.biodata.racename" value="{{race.name}}" disabled
                 data-dtype="String" />
               <div class="item-controls">
                 <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
@@ -889,7 +889,7 @@
             <li class="flexrow item" data-item-id="{{role._id}}">
               <label class="generic-label">Role</label>
               <a class="item-edit"><img class="stat-icon" src="{{role.img}}"></a>
-              <input type="text" class="" name="data.biodata.rolename" value="{{role.name}}" disabled
+              <input type="text" class="" name="system.biodata.rolename" value="{{role.name}}" disabled
                 data-dtype="String" />
               <div class="item-controls">
                 <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
@@ -914,7 +914,7 @@
               src="{{virtue.img}}" /></a>
           <span class="item-name-label">{{virtue.name}}</span>
           <span class="item-field-label-short"><label class="short-label">
-            {{#if virtue.data.activated}}
+            {{#if virtue.system.activated}}
             Activated
             {{else}}
             &nbsp;-&nbsp;
@@ -923,7 +923,7 @@
           </span>
           <div class="item-filler">&nbsp;</div>
           <div class="item-controls item-controls-fixed">
-            <a class="item-control vice-virtue-activate" title="Activated">{{#if virtue.data.activated}}<i
+            <a class="item-control vice-virtue-activate" title="Activated">{{#if virtue.system.activated}}<i
               class="fas fa-circle"></i>{{else}}<i class="fas fa-genderless"></i>{{/if}}</a>
             <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
           </div>
@@ -947,7 +947,7 @@
               src="{{vice.img}}" /></a>
           <span class="item-name-label">{{vice.name}}</span>
           <span class="item-field-label-short"><label class="short-label">
-            {{#if vice.data.activated}}
+            {{#if vice.system.activated}}
             Activated
             {{else}}
             &nbsp;-&nbsp;
@@ -957,7 +957,7 @@
 
           <div class="item-filler">&nbsp;</div>
           <div class="item-controls item-controls-fixed">
-            <a class="item-control vice-virtue-activate" title="Activated">{{#if vice.data.activated}}<i
+            <a class="item-control vice-virtue-activate" title="Activated">{{#if vice.system.activated}}<i
               class="fas fa-circle"></i>{{else}}<i class="fas fa-genderless"></i>{{/if}}</a>
             <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
           </div>
@@ -974,17 +974,17 @@
         </li>
         <li class="flexrow">
           <label class="short-label">Worst Fear </label>
-          <input type="text" class="" name="data.biodata.worstfear" value="{{data.biodata.worstfear}}"
+          <input type="text" class="" name="system.biodata.worstfear" value="{{data.biodata.worstfear}}"
             data-dtype="String" />
           <label class="attribute-value checkbox"><input type="checkbox" class="change-worstfear"
-              name="data.biodata.worstfearactive" {{checked data.biodata.worstfearactive}} /> Active ?</label>
+              name="system.biodata.worstfearactive" {{checked data.biodata.worstfearactive}} /> Active ?</label>
         </li>
         <li class="flexrow">
           <label class="short-label">Desires </label>
-          <input type="text" class="" name="data.biodata.desires" value="{{data.biodata.desires}}"
+          <input type="text" class="" name="system.biodata.desires" value="{{data.biodata.desires}}"
             data-dtype="String" />
           <label class="attribute-value checkbox"><input type="checkbox" class="change-desires"
-              name="data.biodata.desiresactive" {{checked data.biodata.desiresactive}} /> Active ?</label>
+              name="system.biodata.desiresactive" {{checked data.biodata.desiresactive}} /> Active ?</label>
         </li>
       </ul>
 
@@ -992,17 +992,17 @@
       <ul>
         <li class="flexrow">
           <label class="short-label">Catchphrase </label>
-          <input type="text" class="" name="data.biodata.catchphrase" value="{{data.biodata.catchphrase}}"
+          <input type="text" class="" name="system.biodata.catchphrase" value="{{data.biodata.catchphrase}}"
             data-dtype="String" />
         </li>
         <li class="flexrow">
           <label class="short-label">Catchphrase Trigger : </label>
-          <input type="text" class="" name="data.biodata.catchphrasetrigger" value="{{data.biodata.catchphrasetrigger}}"
+          <input type="text" class="" name="system.biodata.catchphrasetrigger" value="{{data.biodata.catchphrasetrigger}}"
             data-dtype="String" />
         </li>
         <li class="flexrow">
           <label class="short-label">Catchphrase used </label>
-          <label class="attribute-value checkbox"><input type="checkbox" name="data.biodata.catchphraseused" {{checked
+          <label class="attribute-value checkbox"><input type="checkbox" name="system.biodata.catchphraseused" {{checked
               data.biodata.catchphraseused}} /></label>
         </li>
       </ul>
@@ -1015,28 +1015,28 @@
         </li>
         <li class="flexrow">
           <label class="short-label">Character Value : </label>
-          <input type="text" class="" name="data.biodata.charactervalue" value="{{data.biodata.charactervalue}}"
+          <input type="text" class="" name="system.biodata.charactervalue" value="{{data.biodata.charactervalue}}"
             data-dtype="String" />
         </li>
         <li class="flexrow">
           <label class="short-label">Character Development Points Total (CDP total) : </label>
-          <input type="text" class="" name="data.biodata.cdp" value="{{data.biodata.cdp}}" data-dtype="Number" />
+          <input type="text" class="" name="system.biodata.cdp" value="{{data.biodata.cdp}}" data-dtype="Number" />
         </li>
         <li class="flexrow">
           <label class="short-label">Bonus selection : </label>
-          <input type="text" class="" name="data.biodata.bonusselection" value="{{data.biodata.bonusselection}}" data-dtype="String" />
+          <input type="text" class="" name="system.biodata.bonusselection" value="{{data.biodata.bonusselection}}" data-dtype="String" />
         </li>        
         <li class="flexrow">
           <label class="short-label">Morality : </label>
-          <input type="text" class="" name="data.biodata.morality" value="{{data.biodata.morality}}" data-dtype="Number" />
+          <input type="text" class="" name="system.biodata.morality" value="{{data.biodata.morality}}" data-dtype="Number" />
         </li>
         <li class="flexrow">
           <label class="short-label">Morality threshold : </label>
-          <input type="text" class="" name="data.biodata.moralitythreshold" value="{{data.biodata.moralitythreshold}}" disabled data-dtype="Number" />
+          <input type="text" class="" name="system.biodata.moralitythreshold" value="{{data.biodata.moralitythreshold}}" disabled data-dtype="Number" />
         </li>
         <li class="flexrow">
           <label class="short-label">Hero Level (max) : </label>
-          <select class="status-small-label color-class-common" type="text" name="data.biodata.maxlevelremaining" value="{{data.biodata.maxlevelremaining}}" data-dtype="Number" {{#unless @root.editScore}}disabled{{/unless}}>
+          <select class="status-small-label color-class-common" type="text" name="system.biodata.maxlevelremaining" value="{{data.biodata.maxlevelremaining}}" data-dtype="Number" {{#unless @root.editScore}}disabled{{/unless}}>
             {{#select data.biodata.maxlevelremaining}}
             {{{@root.maxLevelRemainingList}}}
             {{/select}}
@@ -1044,7 +1044,7 @@
         </li>
         <li class="flexrow">
           <label class="short-label">Hero Levels Remaining : </label>
-          <select class="status-small-label color-class-common" type="text" name="data.biodata.currentlevelremaining" value="{{data.biodata.currentlevelremaining}}" data-dtype="Number" {{#unless @root.editScore}}disabled{{/unless}}>
+          <select class="status-small-label color-class-common" type="text" name="system.biodata.currentlevelremaining" value="{{data.biodata.currentlevelremaining}}" data-dtype="Number" {{#unless @root.editScore}}disabled{{/unless}}>
             {{#select data.biodata.currentlevelremaining}}
             {{{@root.levelRemainingList}}}
             {{/select}}
@@ -1052,7 +1052,7 @@
         </li>
         <li class="flexrow">
           <label class="short-label">Threat Level : </label>
-          <input type="text" class="" name="data.biodata.threatlevel" value="{{data.biodata.threatlevel}}"
+          <input type="text" class="" name="system.biodata.threatlevel" value="{{data.biodata.threatlevel}}"
             data-dtype="Number" />
         </li>
       </ul>
@@ -1060,13 +1060,13 @@
       <hr>
       <h3>Background : </h3>
       <div class="form-group editor">
-        {{editor content=data.biodata.description target="data.biodata.description" button=true owner=owner
+        {{editor data.biodata.description target="system.biodata.description" button=true owner=owner
         editable=editable}}
       </div>
       <hr>
       <h3>Notes : </h3>
       <div class="form-group editor">
-        {{editor content=data.biodata.notes target="data.biodata.notes" button=true owner=owner editable=editable}}
+        {{editor data.biodata.notes target="system.biodata.notes" button=true owner=owner editable=editable}}
       </div>
       <hr>
       </article>
diff --git a/templates/item-armor-sheet.html b/templates/item-armor-sheet.html
index 33b6de1..79b019e 100644
--- a/templates/item-armor-sheet.html
+++ b/templates/item-armor-sheet.html
@@ -19,7 +19,7 @@
         <div class="tab" data-group="primary">
           <ul>
             <li class="flexrow"><label class="generic-label">Related Statistic</label>
-              <select class="competence-base flexrow" type="text" name="data.statistic" value="{{data.statistic}}" data-dtype="String">
+              <select class="competence-base flexrow" type="text" name="system.statistic" value="{{data.statistic}}" data-dtype="String">
                 {{#select data.statistic}}
                 {{> systems/fvtt-pegasus-rpg/templates/partial-options-statistics.html}}
                 {{/select}}
@@ -27,29 +27,29 @@
             </li>
 
             <li class="flexrow"><label class="generic-label">DMG RES Dice</label>
-              <select class="competence-base flexrow" type="text" name="data.resistance" value="{{data.resistance}}" data-dtype="Number">
+              <select class="competence-base flexrow" type="text" name="system.resistance" value="{{data.resistance}}" data-dtype="Number">
                 {{#select data.resistance}}
                 {{{optionsDiceList}}}
                 {{/select}}
               </select> 
             </li>
             <li class="flexrow"><label class="generic-label">Location Protected</label>
-              <input type="text" class="" name="data.locationprotected" value="{{data.locationprotected}}" data-dtype="String"/>
+              <input type="text" class="" name="system.locationprotected" value="{{data.locationprotected}}" data-dtype="String"/>
             </li>
 
             {{> systems/fvtt-pegasus-rpg/templates/partial-equipment-effects.html}}
 
             <li class="flexrow"><label class="generic-label">Equipped ?</label>
-              <label class="attribute-value checkbox"><input type="checkbox" name="data.equipped" {{checked data.equipped}}/></label>
+              <label class="attribute-value checkbox"><input type="checkbox" name="system.equipped" {{checked data.equipped}}/></label>
             </li>
             <li class="flexrow"><label class="generic-label">Weight</label>
-              <input type="text" class="input-numeric-short padd-right" name="data.weight" value="{{data.weight}}" data-dtype="Number"/>
+              <input type="text" class="input-numeric-short padd-right" name="system.weight" value="{{data.weight}}" data-dtype="Number"/>
             </li>
             <li class="flexrow"><label class="generic-label">Cost</label>
-              <input type="text" class="input-numeric-short padd-right" name="data.cost" value="{{data.cost}}" data-dtype="Number"/>
+              <input type="text" class="input-numeric-short padd-right" name="system.cost" value="{{data.cost}}" data-dtype="Number"/>
             </li>
             <li class="flexrow"><label class="generic-label">IDR</label>
-              <select class="competence-base flexrow" type="text" name="data.idr" value="{{data.idr}}" data-dtype="String">
+              <select class="competence-base flexrow" type="text" name="system.idr" value="{{data.idr}}" data-dtype="String">
                 {{#select data.idr}}
                 {{{optionsDiceList}}}
                 {{/select}}
diff --git a/templates/item-combatmodule-sheet.html b/templates/item-combatmodule-sheet.html
index a1d47c5..5bfcffe 100644
--- a/templates/item-combatmodule-sheet.html
+++ b/templates/item-combatmodule-sheet.html
@@ -15,7 +15,7 @@
     <div class="tab details" data-group="primary" data-tab="details">
       <ul>
           <li class="flexrow"><label class="generic-label">Type</label>
-            <select class="competence-base flexrow" type="text" name="data.combattype" value="{{data.combattype}}" data-dtype="String">
+            <select class="competence-base flexrow" type="text" name="system.combattype" value="{{data.combattype}}" data-dtype="String">
               {{#select data.combattype}}
               <option value="civilian">Civilian</option>
               <option value="poorcombat">Poor Combat System</option>
@@ -28,7 +28,7 @@
           </li>
 
           <li class="flexrow"><label class="generic-label">FC</label>
-            <select class="competence-base flexrow" type="text" name="data.fc" value="{{data.fc}}" data-dtype="String">
+            <select class="competence-base flexrow" type="text" name="system.fc" value="{{data.fc}}" data-dtype="String">
               {{#select data.fc}}
               {{{optionsDiceList}}}
               {{/select}}
@@ -36,11 +36,11 @@
           </li>          
 
           <li class="flexrow"><label class="generic-label">Space</label>
-            <input type="text" class="" name="data.space" value="{{data.space}}" data-dtype="Number"/>
+            <input type="text" class="" name="system.space" value="{{data.space}}" data-dtype="Number"/>
           </li>
 
           <li class="flexrow"><label class="generic-label">Cost</label>
-            <input type="text" class="" name="data.cost" value="{{data.cost}}" data-dtype="Number"/>
+            <input type="text" class="" name="system.cost" value="{{data.cost}}" data-dtype="Number"/>
           </li>
 
       </ul>
diff --git a/templates/item-effect-sheet.html b/templates/item-effect-sheet.html
index 2594e66..9163822 100644
--- a/templates/item-effect-sheet.html
+++ b/templates/item-effect-sheet.html
@@ -17,7 +17,7 @@
         <div class="tab details" data-group="primary" data-tab="details">
           <ul>
             <li class="flexrow"><label class="generic-label">Type</label>
-              <select class="competence-base flexrow" type="text" name="data.type" value="{{data.type}}" data-dtype="String">
+              <select class="competence-base flexrow" type="text" name="system.type" value="{{data.type}}" data-dtype="String">
                 {{#select data.type}}
                 <option value="mental">Mental</option>
                 <option value="physical">Physical</option>
@@ -26,7 +26,7 @@
             </li>
 
             <li class="flexrow"><label class="generic-label">Positive/Negative</label>
-              <select class="competence-base flexrow" type="text" name="data.genre" value="{{data.genre}}" data-dtype="String">
+              <select class="competence-base flexrow" type="text" name="system.genre" value="{{data.genre}}" data-dtype="String">
                 {{#select data.genre}}
                 <option value="positive">Positive</option>
                 <option value="negative">Negative</option>
@@ -35,40 +35,40 @@
             </li>            
 
             <li class="flexrow"><label class="generic-label">One use?</label>
-              <label class="attribute-value checkbox"><input type="checkbox" name="data.oneuse" {{checked data.oneuse}}/></label>
+              <label class="attribute-value checkbox"><input type="checkbox" name="system.oneuse" {{checked data.oneuse}}/></label>
             </li>
             <li class="flexrow"><label class="generic-label">Ignore health penalty?</label>
-              <label class="attribute-value checkbox"><input type="checkbox" name="data.ignorehealthpenalty" {{checked data.ignorehealthpenalty}}/></label>
+              <label class="attribute-value checkbox"><input type="checkbox" name="system.ignorehealthpenalty" {{checked data.ignorehealthpenalty}}/></label>
             </li>
             <li class="flexrow"><label class="generic-label">Display Text when targetted</label>
-              <input type="text" class="padd-right" name="data.isthispossible" value="{{data.isthispossible}}" data-dtype="String"/>
+              <input type="text" class="padd-right" name="system.isthispossible" value="{{data.isthispossible}}" data-dtype="String"/>
             </li>
             <li class="flexrow"><label class="generic-label">Mental disruption ?</label>
-              <label class="attribute-value checkbox"><input type="checkbox" name="data.mentaldisruption" {{checked data.mentaldisruption}}/></label>
+              <label class="attribute-value checkbox"><input type="checkbox" name="system.mentaldisruption" {{checked data.mentaldisruption}}/></label>
             </li>
             <li class="flexrow"><label class="generic-label">Physical disruption ?</label>
-              <label class="attribute-value checkbox"><input type="checkbox" name="data.physicaldisruption" {{checked data.physicaldisruption}}/></label>
+              <label class="attribute-value checkbox"><input type="checkbox" name="system.physicaldisruption" {{checked data.physicaldisruption}}/></label>
             </li>
             <li class="flexrow"><label class="generic-label">Mental immunity ?</label>
-              <label class="attribute-value checkbox"><input type="checkbox" name="data.mentalimmunity" {{checked data.mentalimmunity}}/></label>
+              <label class="attribute-value checkbox"><input type="checkbox" name="system.mentalimmunity" {{checked data.mentalimmunity}}/></label>
             </li>
             <li class="flexrow"><label class="generic-label">Physical immunity ?</label>
-              <label class="attribute-value checkbox"><input type="checkbox" name="data.physicalimmunity" {{checked data.physicalimmunity}}/></label>
+              <label class="attribute-value checkbox"><input type="checkbox" name="system.physicalimmunity" {{checked data.physicalimmunity}}/></label>
             </li>
             <li class="flexrow"><label class="generic-label">No bonus dice ?</label>
-              <label class="attribute-value checkbox"><input type="checkbox" name="data.nobonusdice" {{checked data.nobonusdice}}/></label>
+              <label class="attribute-value checkbox"><input type="checkbox" name="system.nobonusdice" {{checked data.nobonusdice}}/></label>
             </li>
             <li class="flexrow"><label class="generic-label">No perks allowed ?</label>
-              <label class="attribute-value checkbox"><input type="checkbox" name="data.noperksallowed" {{checked data.noperksallowed}}/></label>
+              <label class="attribute-value checkbox"><input type="checkbox" name="system.noperksallowed" {{checked data.noperksallowed}}/></label>
             </li>
 
             <li class="flexrow"><label class="generic-label">Effect Level is a Stat?</label>
-              <label class="attribute-value checkbox"><input type="checkbox" name="data.effectstatlevel" {{checked data.effectstatlevel}}/></label>
+              <label class="attribute-value checkbox"><input type="checkbox" name="system.effectstatlevel" {{checked data.effectstatlevel}}/></label>
             </li>
 
             {{#if data.effectstatlevel}}
               <li class="flexrow"><label class="generic-label">Stat to use for Effect Level</label>
-                <select class="competence-base flexrow" type="text" name="data.effectstat" value="{{data.effectstat}}" data-dtype="String">
+                <select class="competence-base flexrow" type="text" name="system.effectstat" value="{{data.effectstat}}" data-dtype="String">
                   {{#select data.effectstat}}
                   {{> systems/fvtt-pegasus-rpg/templates/partial-options-statistics.html notapplicable=false mr=true all=false}}
                   {{/select}}
@@ -76,7 +76,7 @@
               </li>
             {{else}}
               <li class="flexrow"><label class="generic-label">Effect Level</label>
-                <input type="text" class="input-numeric-short padd-right" name="data.effectlevel" value="{{data.effectlevel}}" data-dtype="Number"/>
+                <input type="text" class="input-numeric-short padd-right" name="system.effectlevel" value="{{data.effectlevel}}" data-dtype="Number"/>
               </li>            
             {{/if}}
             
@@ -87,7 +87,7 @@
                 </li>
                 {{#each data.specaffected as |spec idx|}}
                   <li class="flexrow">
-                    <label name="data.specaffected[{{idx}}].name"><a class="view-subitem" data-type="specaffected" data-index="{{idx}}">{{spec.name}}</a></label>
+                    <label name="system.specaffected[{{idx}}].name"><a class="view-subitem" data-type="specaffected" data-index="{{idx}}">{{spec.name}}</a></label>
                     <div class="item-controls padd-left">
                       <a class="item-control delete-subitem padd-left" data-type="specaffected" data-index="{{idx}}" title="Delete Spec"><i class="fas fa-trash"></i></a>
                     </div>   
@@ -97,7 +97,7 @@
             </li>
 
             <li class="flexrow"><label class="generic-label">Affected Stat</label>
-              <select class="competence-base flexrow" type="text" name="data.stataffected" value="{{data.stataffected}}" data-dtype="String">
+              <select class="competence-base flexrow" type="text" name="system.stataffected" value="{{data.stataffected}}" data-dtype="String">
                 {{#select data.stataffected}}
                 {{> systems/fvtt-pegasus-rpg/templates/partial-options-statistics.html notapplicable=true mr=true all=true combat=true vehicle=true power=true}}
                 {{/select}}
@@ -108,29 +108,29 @@
 
             <li class="flexrow"><label class="generic-label">Choose one :</label></li>            
             <li class="flexrow"><label class="generic-label">Stat Dice ?</label>
-              <label class="attribute-value checkbox"><input type="checkbox" name="data.statdice" {{checked data.statdice}}/></label>
+              <label class="attribute-value checkbox"><input type="checkbox" name="system.statdice" {{checked data.statdice}}/></label>
             </li>
 
             <li class="flexrow"><label class="generic-label">Bonus Dice ?</label>
-              <label class="attribute-value checkbox"><input type="checkbox" name="data.bonusdice" {{checked data.bonusdice}}/></label>
+              <label class="attribute-value checkbox"><input type="checkbox" name="system.bonusdice" {{checked data.bonusdice}}/></label>
             </li>
             
             <li class="flexrow"><label class="generic-label">Weapon Damage ?</label>
-              <label class="attribute-value checkbox"><input type="checkbox" name="data.otherdice" {{checked data.otherdice}}/></label>
+              <label class="attribute-value checkbox"><input type="checkbox" name="system.otherdice" {{checked data.otherdice}}/></label>
             </li>
 
             {{else}}
 
             <li class="flexrow"><label class="generic-label">Reduce Dice Value ?</label>
-              <label class="attribute-value checkbox"><input type="checkbox" name="data.reducedicevalue" {{checked data.reducedicevalue}}/></label>
+              <label class="attribute-value checkbox"><input type="checkbox" name="system.reducedicevalue" {{checked data.reducedicevalue}}/></label>
             </li>
 
             <li class="flexrow"><label class="generic-label">Hindrance ?</label>
-              <label class="attribute-value checkbox"><input type="checkbox" name="data.hindrance" {{checked data.hindrance}}/></label>
+              <label class="attribute-value checkbox"><input type="checkbox" name="system.hindrance" {{checked data.hindrance}}/></label>
             </li>
 
             <li class="flexrow"><label class="generic-label">Resisted By</label>
-              <select class="competence-base flexrow" type="text" name="data.resistedby" value="{{data.resistedby}}" data-dtype="String">
+              <select class="competence-base flexrow" type="text" name="system.resistedby" value="{{data.resistedby}}" data-dtype="String">
                 {{#select data.resistedby}}
                 {{> systems/fvtt-pegasus-rpg/templates/partial-options-statistics.html notapplicable=true mr=false all=false}}
                 {{/select}}
@@ -138,12 +138,12 @@
             </li>
 
             <li class="flexrow"><label class="generic-label">Recovery Roll ?</label>
-              <label class="attribute-value checkbox"><input type="checkbox" name="data.recoveryroll" {{checked data.recoveryroll}}/></label>
+              <label class="attribute-value checkbox"><input type="checkbox" name="system.recoveryroll" {{checked data.recoveryroll}}/></label>
             </li>
             
             {{#if data.recoveryroll}}
             <li class="flexrow"><label class="generic-label">Recovery Stat</label>
-              <select class="competence-base flexrow" type="text" name="data.recoveryrollstat" value="{{data.recoveryrollstat}}" data-dtype="String">
+              <select class="competence-base flexrow" type="text" name="system.recoveryrollstat" value="{{data.recoveryrollstat}}" data-dtype="String">
                 {{#select data.recoveryrollstat}}
                 {{> systems/fvtt-pegasus-rpg/templates/partial-options-statistics.html notapplicable=true mr=false all=false}}
                 {{/select}}
@@ -158,7 +158,7 @@
                 </li>
                 {{#each data.recoveryrollspec as |spec idx|}}
                   <li class="flexrow">
-                    <label name="data.recoveryrollspec[{{idx}}].name"><a class="view-subitem" data-type="recoveryrollspec" data-index="{{idx}}">{{spec.name}}</a></label>
+                    <label name="system.recoveryrollspec[{{idx}}].name"><a class="view-subitem" data-type="recoveryrollspec" data-index="{{idx}}">{{spec.name}}</a></label>
                     <div class="item-controls padd-left">
                       <a class="item-control delete-subitem padd-left" data-type="recoveryrollspec" data-index="{{idx}}" title="Delete Spec"><i class="fas fa-trash"></i></a>
                     </div>   
diff --git a/templates/item-equipment-sheet.html b/templates/item-equipment-sheet.html
index 0d66d2d..7213418 100644
--- a/templates/item-equipment-sheet.html
+++ b/templates/item-equipment-sheet.html
@@ -16,7 +16,7 @@
     <div class="tab details" data-group="primary" data-tab="details">
       <ul>
           <li class="flexrow"><label class="generic-label">Type</label>
-            <select class="competence-base flexrow" type="text" name="data.type" value="{{data.type}}" data-dtype="String">
+            <select class="competence-base flexrow" type="text" name="system.type" value="{{data.type}}" data-dtype="String">
               {{#select data.type}}
               {{> systems/fvtt-pegasus-rpg/templates/partial-options-equipment-types.html}}
               {{/select}}
@@ -24,7 +24,7 @@
           </li>
 
           <li class="flexrow"><label class="generic-label">Related Statistic</label>
-            <select class="competence-base flexrow" type="text" name="data.stataffected" value="{{data.stataffected}}" data-dtype="String">
+            <select class="competence-base flexrow" type="text" name="system.stataffected" value="{{data.stataffected}}" data-dtype="String">
               {{#select data.stataffected}}
               {{> systems/fvtt-pegasus-rpg/templates/partial-options-statistics.html notapplicable=true mr=true}}
               {{/select}}
@@ -32,48 +32,48 @@
           </li>
 
           <li class="flexrow"><label class="generic-label">Level</label>
-            <input type="text" class="input-numeric-short padd-right" name="data.level" value="{{data.level}}" data-dtype="Number"/>
+            <input type="text" class="input-numeric-short padd-right" name="system.level" value="{{data.level}}" data-dtype="Number"/>
           </li>
 
           <li class="flexrow"><label class="generic-label">Stat Dice ?</label>
-            <label class="attribute-value checkbox"><input type="checkbox" name="data.statdice" {{checked data.statdice}}/></label>
+            <label class="attribute-value checkbox"><input type="checkbox" name="system.statdice" {{checked data.statdice}}/></label>
           </li>
 
           <li class="flexrow"><label class="generic-label">Bonus Dice ?</label>
-            <label class="attribute-value checkbox"><input type="checkbox" name="data.bonusdice" {{checked data.bonusdice}}/></label>
+            <label class="attribute-value checkbox"><input type="checkbox" name="system.bonusdice" {{checked data.bonusdice}}/></label>
           </li>
           
           <li class="flexrow"><label class="generic-label">Other Dice ?</label>
-            <label class="attribute-value checkbox"><input type="checkbox" name="data.otherdice" {{checked data.otherdice}}/></label>
+            <label class="attribute-value checkbox"><input type="checkbox" name="system.otherdice" {{checked data.otherdice}}/></label>
           </li>
 
           {{> systems/fvtt-pegasus-rpg/templates/partial-equipment-effects.html}}
 
           <li class="flexrow"><label class="generic-label">Equipped ?</label>
-            <label class="attribute-value checkbox"><input type="checkbox" name="data.equipped" {{checked data.equipped}}/></label>
+            <label class="attribute-value checkbox"><input type="checkbox" name="system.equipped" {{checked data.equipped}}/></label>
           </li>
           <li class="flexrow"><label class="generic-label">Quantity</label>
-            <input type="text" class="input-numeric-short padd-right" name="data.quantity" value="{{data.quantity}}" data-dtype="Number"/>
+            <input type="text" class="input-numeric-short padd-right" name="system.quantity" value="{{data.quantity}}" data-dtype="Number"/>
           </li>
           <li class="flexrow"><label class="generic-label">Weight</label>
-            <input type="text" class="input-numeric-short padd-right" name="data.weight" value="{{data.weight}}" data-dtype="Number"/>
+            <input type="text" class="input-numeric-short padd-right" name="system.weight" value="{{data.weight}}" data-dtype="Number"/>
           </li>
           <li class="flexrow"><label class="generic-label">Is a container ?</label>
-            <label class="attribute-value checkbox"><input type="checkbox" name="data.iscontainer" {{checked data.iscontainer}}/></label>
+            <label class="attribute-value checkbox"><input type="checkbox" name="system.iscontainer" {{checked data.iscontainer}}/></label>
           </li>
           {{#if data.iscontainer}}
           <li class="flexrow"><label class="generic-label">Container capacity</label>
-            <input type="text" class="input-numeric-short padd-right" name="data.containercapacity" value="{{data.containercapacity}}" data-dtype="Number"/>
+            <input type="text" class="input-numeric-short padd-right" name="system.containercapacity" value="{{data.containercapacity}}" data-dtype="Number"/>
           </li>
           {{/if}}
           <li class="flexrow"><label class="generic-label">Threat Level Value</label>
-            <input type="text" class="input-numeric-short padd-right" name="data.threatlevel" value="{{data.threatlevel}}" data-dtype="Number"/>
+            <input type="text" class="input-numeric-short padd-right" name="system.threatlevel" value="{{data.threatlevel}}" data-dtype="Number"/>
           </li>
           <li class="flexrow"><label class="generic-label">Cost</label>
-            <input type="text" class="input-numeric-short padd-right" name="data.cost" value="{{data.cost}}" data-dtype="Number"/>
+            <input type="text" class="input-numeric-short padd-right" name="system.cost" value="{{data.cost}}" data-dtype="Number"/>
           </li>
           <li class="flexrow"><label class="generic-label">IDR</label>
-            <select class="competence-base flexrow" type="text" name="data.idr" value="{{data.idr}}" data-dtype="String">
+            <select class="competence-base flexrow" type="text" name="system.idr" value="{{data.idr}}" data-dtype="String">
               {{#select data.idr}}
               {{{optionsDiceList}}}
               {{/select}}
diff --git a/templates/item-mobilitymodule-sheet.html b/templates/item-mobilitymodule-sheet.html
index 98678d9..9f5a733 100644
--- a/templates/item-mobilitymodule-sheet.html
+++ b/templates/item-mobilitymodule-sheet.html
@@ -15,7 +15,7 @@
     <div class="tab details" data-group="primary" data-tab="details">
       <ul>
           <li class="flexrow"><label class="generic-label">Vehicle category</label>
-            <select class="competence-base flexrow" type="text" name="data.vehiclecategory" value="{{data.vehiclecategory}}" data-dtype="String">
+            <select class="competence-base flexrow" type="text" name="system.vehiclecategory" value="{{data.vehiclecategory}}" data-dtype="String">
               {{#select data.vehiclecategory}}
               <option value="wheeled">Wheeled</option>
               <option value="walker">Walker</option>
@@ -30,7 +30,7 @@
           </li>
 
           <li class="flexrow"><label class="generic-label">Quality</label>
-            <select class="competence-base flexrow" type="text" name="data.quality" value="{{data.quality}}" data-dtype="String">
+            <select class="competence-base flexrow" type="text" name="system.quality" value="{{data.quality}}" data-dtype="String">
               {{#select data.quality}}
               <option value="poor">Poor</option>
               <option value="standard">Standard</option>
@@ -46,7 +46,7 @@
           </li>
 
           <li class="flexrow"><label class="generic-label">MR</label>
-            <select class="competence-base flexrow" type="text" name="data.mr" value="{{data.mr}}" data-dtype="String">
+            <select class="competence-base flexrow" type="text" name="system.mr" value="{{data.mr}}" data-dtype="String">
               {{#select data.mr}}
               {{{optionsDiceList}}}
               {{/select}}
@@ -54,11 +54,11 @@
           </li>          
           
           <li class="flexrow"><label class="generic-label">MAN : Apply as negative  ?</label>
-            <label class="attribute-value checkbox"><input type="checkbox" name="data.negativeman" {{checked data.negativeman}}/></label>
+            <label class="attribute-value checkbox"><input type="checkbox" name="system.negativeman" {{checked data.negativeman}}/></label>
           </li>
 
           <li class="flexrow"><label class="generic-label">MAN</label>
-            <select class="competence-base flexrow" type="text" name="data.man" value="{{data.man}}" data-dtype="String">
+            <select class="competence-base flexrow" type="text" name="system.man" value="{{data.man}}" data-dtype="String">
               {{#select data.man}}
               {{{optionsDiceList}}}
               {{/select}}
@@ -66,7 +66,7 @@
           </li>          
 
           <li class="flexrow"><label class="generic-label">Top speed - Front</label>
-            <select class="competence-base flexrow" type="text" name="data.ts_f" value="{{data.ts_f}}" data-dtype="String">
+            <select class="competence-base flexrow" type="text" name="system.ts_f" value="{{data.ts_f}}" data-dtype="String">
               {{#select data.ts_f}}
               {{> systems/fvtt-pegasus-rpg/templates/partial-options-vehicle-speed.html notapplicable=true}}
               {{/select}}
@@ -74,7 +74,7 @@
           </li>
 
           <li class="flexrow"><label class="generic-label">Top speed - Left/Tight/Top/Bottom</label>
-            <select class="competence-base flexrow" type="text" name="data.ts_s" value="{{data.ts_s}}" data-dtype="String">
+            <select class="competence-base flexrow" type="text" name="system.ts_s" value="{{data.ts_s}}" data-dtype="String">
               {{#select data.ts_s}}
               {{> systems/fvtt-pegasus-rpg/templates/partial-options-vehicle-speed.html notapplicable=true}}
               {{/select}}
@@ -82,18 +82,18 @@
           </li>
 
           <li class="flexrow"><label class="generic-label">Top speed - Rear</label>
-            <select class="competence-base flexrow" type="text" name="data.ts_r" value="{{data.ts_r}}" data-dtype="String">
+            <select class="competence-base flexrow" type="text" name="system.ts_r" value="{{data.ts_r}}" data-dtype="String">
               {{#select data.ts_r}}
               {{> systems/fvtt-pegasus-rpg/templates/partial-options-vehicle-speed.html notapplicable=true}}
               {{/select}}
             </select> 
           </li>
           <li class="flexrow"><label class="generic-label">Space</label>
-            <input type="text" class="" name="data.space" value="{{data.space}}" data-dtype="Number"/>
+            <input type="text" class="" name="system.space" value="{{data.space}}" data-dtype="Number"/>
           </li>
 
           <li class="flexrow"><label class="generic-label">Cost</label>
-            <input type="text" class="" name="data.cost" value="{{data.cost}}" data-dtype="Number"/>
+            <input type="text" class="" name="system.cost" value="{{data.cost}}" data-dtype="Number"/>
           </li>
 
 
diff --git a/templates/item-money-sheet.html b/templates/item-money-sheet.html
index da8430c..49d5147 100644
--- a/templates/item-money-sheet.html
+++ b/templates/item-money-sheet.html
@@ -14,13 +14,13 @@
     <div class="tab details" data-group="primary" data-tab="details">
       <ul>
           <li class="flexrow"><label class="generic-label">Quantity</label>
-            <input type="text" class="input-numeric-short padd-right" name="data.quantity" value="{{data.quantity}}" data-dtype="Number"/>
+            <input type="text" class="input-numeric-short padd-right" name="system.quantity" value="{{data.quantity}}" data-dtype="Number"/>
           </li>
           <li class="flexrow"><label class="generic-label">Weight</label>
-            <input type="text" class="input-numeric-short padd-right" name="data.weight" value="{{data.weight}}" data-dtype="Number"/>
+            <input type="text" class="input-numeric-short padd-right" name="system.weight" value="{{data.weight}}" data-dtype="Number"/>
           </li>
           <li class="flexrow"><label class="generic-label">IDR</label>
-            <select class="competence-base flexrow" type="text" name="data.idr" value="{{data.idr}}" data-dtype="String">
+            <select class="competence-base flexrow" type="text" name="system.idr" value="{{data.idr}}" data-dtype="String">
               {{#select data.idr}}
               {{{optionsDiceList}}}
               {{/select}}
diff --git a/templates/item-perk-sheet.html b/templates/item-perk-sheet.html
index 9ffd5ab..ab2c6ff 100644
--- a/templates/item-perk-sheet.html
+++ b/templates/item-perk-sheet.html
@@ -14,11 +14,11 @@
       <div class="tab details" data-group="primary" data-tab="details">
         <ul>
             <li class="flexrow"><label class="generic-label">Level</label>
-              <input type="text" class="input-numeric-short padd-right" name="data.level" value="{{data.level}}" data-dtype="Number"/>
+              <input type="text" class="input-numeric-short padd-right" name="system.level" value="{{data.level}}" data-dtype="Number"/>
             </li>
 
             <li class="flexrow"><label class="generic-label">Perk category</label>
-              <select class="competence-base flexrow" type="text" name="data.category" value="{{data.category}}" data-dtype="String">
+              <select class="competence-base flexrow" type="text" name="system.category" value="{{data.category}}" data-dtype="String">
                 {{#select data.category}}
                 <option value="general">General</option>
                 <option value="agitator">Agitator</option>, 
@@ -32,7 +32,7 @@
             </li>
             
             <li class="flexrow"><label class="generic-label">Perk Status</label>
-              <select class="competence-base flexrow" type="text" name="data.status" value="{{data.status}}" data-dtype="String">
+              <select class="competence-base flexrow" type="text" name="system.status" value="{{data.status}}" data-dtype="String">
                 {{#select data.status}}
                 <option value="ready">Ready</option>
                 <option value="activated">Activated</option>
@@ -42,7 +42,7 @@
               </select> 
             </li>
             <li class="flexrow"><label class="generic-label">Number of use during activation</label>
-              <select class="competence-base flexrow" type="text" name="data.nbuse" value="{{data.nbuse}}" data-dtype="String">
+              <select class="competence-base flexrow" type="text" name="system.nbuse" value="{{data.nbuse}}" data-dtype="String">
                 {{#select data.nbuse}}
                 <option value="perkduration">For Duration of Perk</option>
                 <option value="next1action">Next 1 Stated Action</option>
@@ -53,11 +53,11 @@
             </li>
 
             <li class="flexrow"><label class="generic-label">Upgradable?</label>
-              <label class="attribute-value checkbox"><input type="checkbox" name="data.upgradable" {{checked data.upgradable}}/></label>
+              <label class="attribute-value checkbox"><input type="checkbox" name="system.upgradable" {{checked data.upgradable}}/></label>
             </li>
 
             <li class="flexrow"><label class="generic-label">Is Weaver Perk?</label>
-              <label class="attribute-value checkbox"><input type="checkbox" name="data.isweaver" {{checked data.isweaver}}/></label>
+              <label class="attribute-value checkbox"><input type="checkbox" name="system.isweaver" {{checked data.isweaver}}/></label>
             </li>
 
             <li class="flexrow"><label class="generic-label">Effects Gained</label>
@@ -68,7 +68,7 @@
                 </li>
                 {{#each data.effectsgained as |effect idx|}}
                 <li class="flexrow">
-                  <label name="data.effectsgained[{{idx}}].name"><a class="view-subitem" data-type="effectsgained" data-index="{{idx}}">{{effect.name}}</a></label>
+                  <label name="system.effectsgained[{{idx}}].name"><a class="view-subitem" data-type="effectsgained" data-index="{{idx}}">{{effect.name}}</a></label>
                   <div class="item-controls padd-left">
                     <a class="item-control delete-subitem padd-left" data-type="effectsgained" data-index="{{idx}}" title="Delete Effect"><i class="fas fa-trash"></i></a>
                   </div>   
@@ -78,46 +78,46 @@
             </li>
                 
             <li class="flexrow"><label class="generic-label">When activated display text</label>
-              <input type="text" class="padd-right" name="data.activatedtext" value="{{data.activatedtext}}" data-dtype="String"/>
+              <input type="text" class="padd-right" name="system.activatedtext" value="{{data.activatedtext}}" data-dtype="String"/>
             </li>
             <li class="flexrow"><label class="generic-label">When deactivated display text</label>
-              <input type="text" class="padd-right" name="data.deactivatedtext" value="{{data.deactivatedtext}}" data-dtype="String"/>
+              <input type="text" class="padd-right" name="system.deactivatedtext" value="{{data.deactivatedtext}}" data-dtype="String"/>
             </li>
 
             {{#each data.features as |feature key|}}
               {{#if feature.isvalid}}
               <li class="flexrow">
                 <label class="generic-label">{{feature.label}} ? </label>
-                <label class="attribute-value checkbox"><input type="checkbox" name="data.features.{{key}}.flag" {{checked feature.flag}}/></label>
+                <label class="attribute-value checkbox"><input type="checkbox" name="system.features.{{key}}.flag" {{checked feature.flag}}/></label>
               </li>
                 {{#if feature.flag}}
                 <ul class="ul-level1">
                   <li class="flexrow"><label class="generic-label">{{feature.label}}</label>
                     {{#if (eq feature.type "statdice")}}
-                      <select class="competence-base flexrow" type="text" name="data.features.{{key}}.value" value="{{feature.value}}" data-dtype="String">
+                      <select class="competence-base flexrow" type="text" name="system.features.{{key}}.value" value="{{feature.value}}" data-dtype="String">
                         {{#select feature.value}}
                         {{> systems/fvtt-pegasus-rpg/templates/partial-options-statistics.html notapplicable=true}}
                         {{/select}}
                       </select> 
                     {{/if}}
                     {{#if (eq feature.type "range")}}
-                      <select class="competence-base flexrow" type="text" name="data.features.{{key}}.value" value="{{feature.value}}" data-dtype="String">
+                      <select class="competence-base flexrow" type="text" name="system.features.{{key}}.value" value="{{feature.value}}" data-dtype="String">
                         {{#select feature.value}}
                         {{> systems/fvtt-pegasus-rpg/templates/partial-options-range.html notapplicable=true}}
                         {{/select}}
                         </select> 
                     {{/if}}
                     {{#if (eq feature.type "number")}}
-                    <input type="text" class="padd-right" name="data.features.{{key}}.value" value="{{feature.value}}" data-dtype="Number"/>
+                    <input type="text" class="padd-right" name="system.features.{{key}}.value" value="{{feature.value}}" data-dtype="Number"/>
                     {{/if}}
                     {{#if (eq feature.type "string")}}
-                    <input type="text" class="padd-right" name="data.features.{{key}}.value" value="{{feature.value}}" data-dtype="String"/>
+                    <input type="text" class="padd-right" name="system.features.{{key}}.value" value="{{feature.value}}" data-dtype="String"/>
                     {{/if}}
                     {{#if (eq feature.type "dropspec")}}
                     <ul class="ul-level1">
                       <li class="flexrow"><div class="drop-spec-perk" data-key={{key}}><label>Drop Specialisation here !</label></div>
                       </li>
-                      <input type="text" class="padd-right" name="data.features.{{key}}.value" value="{{feature.value}}" data-dtype="String"/>
+                      <input type="text" class="padd-right" name="system.features.{{key}}.value" value="{{feature.value}}" data-dtype="String"/>
                     </ul>              
                     {{/if}}        
                     {{#if (eq feature.type "text")}}
diff --git a/templates/item-power-sheet.html b/templates/item-power-sheet.html
index 8d2bd72..2e7685e 100644
--- a/templates/item-power-sheet.html
+++ b/templates/item-power-sheet.html
@@ -30,12 +30,12 @@
     <div class="tab details" data-group="primary" data-tab="details">
       <ul>
         <li class="flexrow"><label class="generic-label">Roll Needed ?</label>
-          <label class="attribute-value checkbox"><input type="checkbox" name="data.rollneeded" {{checked
+          <label class="attribute-value checkbox"><input type="checkbox" name="system.rollneeded" {{checked
               data.rollneeded}} /></label>
         </li>
         {{#if data.rollneeded}}
         <li class="flexrow"><label class="generic-label">Related Statistic (only if roll is needed)</label>
-          <select class="competence-base flexrow" type="text" name="data.statistic" value="{{data.statistic}}"
+          <select class="competence-base flexrow" type="text" name="system.statistic" value="{{data.statistic}}"
             data-dtype="String">
             {{#select data.statistic}}
             {{> systems/fvtt-pegasus-rpg/templates/partial-options-statistics.html}}
@@ -46,25 +46,25 @@
 
         <li class="flexrow">
           <label class="generic-label">Activated ? </label>
-          <label class="attribute-value checkbox"><input type="checkbox" name="data.activated" {{checked
+          <label class="attribute-value checkbox"><input type="checkbox" name="system.activated" {{checked
               data.activated}} /></label>
         </li>
 
         <li class="flexrow"><label class="generic-label">NRG Cost</label>
-          <input type="text" class="input-numeric-short padd-right" name="data.cost" value="{{data.cost}}"
+          <input type="text" class="input-numeric-short padd-right" name="system.cost" value="{{data.cost}}"
             data-dtype="Number" />
         </li>
         <li class="flexrow"><label class="generic-label">NRG Spent</label>
-          <input type="text" class="input-numeric-short padd-right" name="data.costspent" value="{{data.costspent}}"
+          <input type="text" class="input-numeric-short padd-right" name="system.costspent" value="{{data.costspent}}"
             data-dtype="Number" />
         </li>
                 
         <li class="flexrow"><label class="generic-label">Power Level</label>
-          <input type="text" class="input-numeric-short padd-right" name="data.powerlevel" value="{{data.powerlevel}}" data-dtype="Number"/>
+          <input type="text" class="input-numeric-short padd-right" name="system.powerlevel" value="{{data.powerlevel}}" data-dtype="Number"/>
         </li>            
 
         <li class="flexrow"><label class="generic-label">Range</label>
-          <select class="competence-base flexrow" type="text" name="data.range" value="{{data.range}}"
+          <select class="competence-base flexrow" type="text" name="system.range" value="{{data.range}}"
             data-dtype="String">
             {{#select data.range}}
             {{> systems/fvtt-pegasus-rpg/templates/partial-options-range.html notapplicable=true}}
@@ -72,7 +72,7 @@
           </select>
         </li>
         <li class="flexrow"><label class="generic-label">Action</label>
-          <select class="competence-base flexrow" type="text" name="data.action" value="{{data.action}}"
+          <select class="competence-base flexrow" type="text" name="system.action" value="{{data.action}}"
             data-dtype="String">
             {{#select data.action}}
             <option value="soft">Soft</option>
@@ -83,7 +83,7 @@
           </select>
         </li>
         <li class="flexrow"><label class="generic-label">Type</label>
-          <select class="competence-base flexrow" type="text" name="data.type" value="{{data.type}}"
+          <select class="competence-base flexrow" type="text" name="system.type" value="{{data.type}}"
             data-dtype="String">
             {{#select data.type}}
             <option value="instant">Instant</option>
@@ -94,18 +94,18 @@
           </select>
         </li>
         <li class="flexrow"><label class="generic-label">Power Source</label>
-          <input type="text" class="padd-right" name="data.powersource" value="{{data.powersource}}"
+          <input type="text" class="padd-right" name="system.powersource" value="{{data.powersource}}"
             data-dtype="String" />
         </li>
 
         <li class="flexrow">
           <label class="generic-label">DMG Roll Needed ? </label>
-          <label class="attribute-value checkbox"><input type="checkbox" name="data.dmgroll" {{checked
+          <label class="attribute-value checkbox"><input type="checkbox" name="system.dmgroll" {{checked
               data.dmgroll}} /></label>
         </li>
         {{#if data.dmgroll}}
         <li class="flexrow"><label class="generic-label">Related DMG Statistic </label>
-          <select class="competence-base flexrow" type="text" name="data.dmgstatistic" value="{{data.dmgstatistic}}"
+          <select class="competence-base flexrow" type="text" name="system.dmgstatistic" value="{{data.dmgstatistic}}"
             data-dtype="String">
             {{#select data.dmgstatistic}}
             {{> systems/fvtt-pegasus-rpg/templates/partial-options-statistics.html}}
@@ -115,17 +115,17 @@
         {{/if}}
 
         <li class="flexrow"><label class="generic-label">When purchased display text</label>
-          <input type="text" class="padd-right" name="data.purchasedtext" value="{{data.purchasedtext}}" data-dtype="String"/>
+          <input type="text" class="padd-right" name="system.purchasedtext" value="{{data.purchasedtext}}" data-dtype="String"/>
         </li>
         <li class="flexrow"><label class="generic-label">When activated display text</label>
-          <input type="text" class="padd-right" name="data.activatedtext" value="{{data.activatedtext}}" data-dtype="String"/>
+          <input type="text" class="padd-right" name="system.activatedtext" value="{{data.activatedtext}}" data-dtype="String"/>
         </li>
         <li class="flexrow"><label class="generic-label">When deactivated display text</label>
-          <input type="text" class="padd-right" name="data.deactivatedtext" value="{{data.deactivatedtext}}" data-dtype="String"/>
+          <input type="text" class="padd-right" name="system.deactivatedtext" value="{{data.deactivatedtext}}" data-dtype="String"/>
         </li>
 
         <li class="flexrow"><label class="generic-label">Power Level Cost</label>
-          <input type="text" class="input-numeric-short padd-right" name="data.powerlevelcost" value="{{data.powerlevelcost}}"
+          <input type="text" class="input-numeric-short padd-right" name="system.powerlevelcost" value="{{data.powerlevelcost}}"
             data-dtype="Number" />
         </li>
 
@@ -138,7 +138,7 @@
             </li>
             {{#each data.effectsgained as |effect idx|}}
             <li class="flexrow">
-              <label name="data.effectsgained[{{idx}}].name"><a class="view-subitem" data-type="effectsgained"
+              <label name="system.effectsgained[{{idx}}].name"><a class="view-subitem" data-type="effectsgained"
                   data-index="{{idx}}">{{effect.name}}</a></label>
               <div class="item-controls padd-left">
                 <a class="item-control delete-subitem padd-left" data-type="effectsgained" data-index="{{idx}}"
diff --git a/templates/item-powercoremodule-sheet.html b/templates/item-powercoremodule-sheet.html
index 0ca2386..bf6bd94 100644
--- a/templates/item-powercoremodule-sheet.html
+++ b/templates/item-powercoremodule-sheet.html
@@ -15,7 +15,7 @@
     <div class="tab details" data-group="primary" data-tab="details">
       <ul>
           <li class="flexrow"><label class="generic-label">Power core type</label>
-            <select class="competence-base flexrow" type="text" name="data.coretype" value="{{data.coretype}}" data-dtype="String">
+            <select class="competence-base flexrow" type="text" name="system.coretype" value="{{data.coretype}}" data-dtype="String">
               {{#select data.coretype}}
               <option value="small">Small</option>
               <option value="standard">Standard</option>
@@ -27,7 +27,7 @@
           </li>
 
           <li class="flexrow"><label class="generic-label">PC</label>
-            <select class="competence-base flexrow" type="text" name="data.pc" value="{{data.pc}}" data-dtype="String">
+            <select class="competence-base flexrow" type="text" name="system.pc" value="{{data.pc}}" data-dtype="String">
               {{#select data.pc}}
               {{{optionsDiceList}}}
               {{/select}}
@@ -35,14 +35,14 @@
           </li>          
 
           <li class="flexrow"><label class="generic-label">NRG</label>
-            <input type="text" class="" name="data.nrg" value="{{data.nrg}}" data-dtype="Number"/>
+            <input type="text" class="" name="system.nrg" value="{{data.nrg}}" data-dtype="Number"/>
           </li>
           <li class="flexrow"><label class="generic-label">Space</label>
-            <input type="text" class="" name="data.space" value="{{data.space}}" data-dtype="Number"/>
+            <input type="text" class="" name="system.space" value="{{data.space}}" data-dtype="Number"/>
           </li>
 
           <li class="flexrow"><label class="generic-label">Cost</label>
-            <input type="text" class="" name="data.cost" value="{{data.cost}}" data-dtype="Number"/>
+            <input type="text" class="" name="system.cost" value="{{data.cost}}" data-dtype="Number"/>
           </li>
 
       </ul>
diff --git a/templates/item-propulsionmodule-sheet.html b/templates/item-propulsionmodule-sheet.html
index 9a2fb6d..1f34c5a 100644
--- a/templates/item-propulsionmodule-sheet.html
+++ b/templates/item-propulsionmodule-sheet.html
@@ -15,7 +15,7 @@
     <div class="tab details" data-group="primary" data-tab="details">
       <ul>
           <li class="flexrow"><label class="generic-label">Quality</label>
-            <select class="competence-base flexrow" type="text" name="data.quality" value="{{data.quality}}" data-dtype="String">
+            <select class="competence-base flexrow" type="text" name="system.quality" value="{{data.quality}}" data-dtype="String">
               {{#select data.quality}}
               <option value="poor">Poor</option>
               <option value="standard">Standard</option>
@@ -26,19 +26,19 @@
           </li>
 
           <li class="flexrow"><label class="generic-label">A/D</label>
-            <input type="text" class="" name="data.ad" value="{{data.ad}}" data-dtype="Number"/>
+            <input type="text" class="" name="system.ad" value="{{data.ad}}" data-dtype="Number"/>
           </li>   
 
           <li class="flexrow"><label class="generic-label">Top Speed (TS)</label>
-            <input type="text" class="" name="data.topspeed" value="{{data.topspeed}}" data-dtype="Number"/>
+            <input type="text" class="" name="system.topspeed" value="{{data.topspeed}}" data-dtype="Number"/>
           </li>   
 
           <li class="flexrow"><label class="generic-label">Space</label>
-            <input type="text" class="" name="data.space" value="{{data.space}}" data-dtype="Number"/>
+            <input type="text" class="" name="system.space" value="{{data.space}}" data-dtype="Number"/>
           </li>
 
           <li class="flexrow"><label class="generic-label">Cost</label>
-            <input type="text" class="" name="data.cost" value="{{data.cost}}" data-dtype="Number"/>
+            <input type="text" class="" name="system.cost" value="{{data.cost}}" data-dtype="Number"/>
           </li>
 
       </ul>
diff --git a/templates/item-race-sheet.html b/templates/item-race-sheet.html
index ec9bb16..287e286 100644
--- a/templates/item-race-sheet.html
+++ b/templates/item-race-sheet.html
@@ -14,19 +14,19 @@
 
       <label class="generic-label">Description</label>
       <div class="medium-editor item-text-long-line">
-        {{editor content=data.description target="data.description" button=true owner=owner editable=editable}}
+        {{editor data.description target="data.description" button=true owner=owner editable=editable}}
       </div>
       <label class="generic-label">Environment</label>
       <div class="medium-editor item-text-long-line">
-        {{editor content=data.environment target="data.environment" button=true owner=owner editable=editable}}
+        {{editor data.environment target="data.environment" button=true owner=owner editable=editable}}
       </div>
       <label class="generic-label">Society/Culture</label>
       <div class="medium-editor item-text-long-line">
-        {{editor content=data.society_culture target="data.society_culture" button=true owner=owner editable=editable}}
+        {{editor data.society_culture target="data.society_culture" button=true owner=owner editable=editable}}
       </div>
       <label class="generic-label">Outlook</label>
       <div class="medium-editor item-text-long-line">
-        {{editor content=data.outlook target="data.outlook" button=true owner=owner editable=editable}}
+        {{editor data.outlook target="data.outlook" button=true owner=owner editable=editable}}
       </div>
     </div>
 
@@ -40,7 +40,7 @@
           </li>
           {{#each data.abilities as |ability idx|}}
           <li class="flexrow">
-            <label name="data.abilities[{{idx}}].name"><a class="view-subitem" data-type="abilities"
+            <label name="system.abilities[{{idx}}].name"><a class="view-subitem" data-type="abilities"
                 data-index="{{idx}}">{{ability.name}}</a></label>
             <div class="item-controls padd-left">
               <a class="item-control delete-subitem padd-left" data-type="abilities" data-index="{{idx}}"
@@ -53,16 +53,16 @@
 
       <ul>
         <li class="flexrow"><label class="generic-label">Selectable Stats ?</label>
-          <label class="attribute-value checkbox"><input type="checkbox" name="data.selectablestats" {{checked
+          <label class="attribute-value checkbox"><input type="checkbox" name="system.selectablestats" {{checked
               data.selectablestats}} /></label>
         </li>
         {{#if data.selectablestats}}
         <li class="flexrow"><label class="generic-label">Select 1 stat only once?</label>
-          <label class="attribute-value checkbox"><input type="checkbox" name="data.statsonlyonce" {{checked
+          <label class="attribute-value checkbox"><input type="checkbox" name="system.statsonlyonce" {{checked
               data.statsonlyonce}} /></label>
         </li>
         <li class="flexrow"><label class="generic-label">Number of selectable stats</label>
-          <input type="text" class="input-numeric-short padd-right" name="data.numberstats" value="{{data.numberstats}}"
+          <input type="text" class="input-numeric-short padd-right" name="system.numberstats" value="{{data.numberstats}}"
             data-dtype="Number" />
         </li>
         {{/if}}
@@ -70,7 +70,7 @@
 
       <ul>
         <li class="flexrow"><label class="generic-label">Number of Optionnal Abilities</label>
-          <input type="text" class="input-numeric-short padd-right" name="data.nboptionnal" value="{{data.nboptionnal}}"
+          <input type="text" class="input-numeric-short padd-right" name="system.nboptionnal" value="{{data.nboptionnal}}"
             data-dtype="Number" />
         </li>
 
@@ -82,7 +82,7 @@
           </li>
           {{#each data.optionnalabilities as |ability idx|}}
           <li class="flexrow">
-            <label name="data.optionnalabilities[{{idx}}].name"><a class="view-subitem" data-type="optionnalabilities"
+            <label name="system.optionnalabilities[{{idx}}].name"><a class="view-subitem" data-type="optionnalabilities"
                 data-index="{{idx}}">{{ability.name}}</a></label>
             <div class="item-controls padd-left">
               <a class="item-control delete-subitem padd-left" data-type="optionnalabilities" data-index="{{idx}}"
@@ -95,16 +95,16 @@
 
       <ul>
         <li class="flexrow"><label class="generic-label">Perks Gained ?</label>
-          <label class="attribute-value checkbox"><input type="checkbox" name="data.perksgained" {{checked
+          <label class="attribute-value checkbox"><input type="checkbox" name="system.perksgained" {{checked
               data.perksgained}} /></label>
         </li>
         {{#if data.perksgained}}
         <li class="flexrow"><label class="generic-label">Choose in all available perks?</label>
-          <label class="attribute-value checkbox"><input type="checkbox" name="data.perksall" {{checked
+          <label class="attribute-value checkbox"><input type="checkbox" name="system.perksall" {{checked
               data.perksall}} /></label>
         </li>
         <li class="flexrow"><label class="generic-label">Number of perks to gain</label>
-          <input type="text" class="input-numeric-short padd-right" name="data.perksnumber" value="{{data.perksnumber}}"
+          <input type="text" class="input-numeric-short padd-right" name="system.perksnumber" value="{{data.perksnumber}}"
             data-dtype="Number" />
         </li>
         {{#if data.perksall}}
@@ -115,7 +115,7 @@
           </li>
           {{#each data.perks as |perk idx|}}
           <li class="flexrow">
-            <label name="data.perks[{{idx}}].name"><a class="view-subitem" data-type="perks"
+            <label name="system.perks[{{idx}}].name"><a class="view-subitem" data-type="perks"
                 data-index="{{idx}}">{{perk.name}}</a></label>
             <div class="item-controls padd-left">
               <a class="item-control delete-subitem padd-left" data-type="perks" data-index="{{idx}}"
diff --git a/templates/item-role-sheet.html b/templates/item-role-sheet.html
index ed33517..e0d3bf7 100644
--- a/templates/item-role-sheet.html
+++ b/templates/item-role-sheet.html
@@ -17,14 +17,14 @@
       <div class="tab details" data-group="primary" data-tab="details">
         <ul>
             <li class="flexrow"><label class="generic-label">Stat increase 1</label>
-              <select class="competence-base flexrow" type="text" name="data.statincrease1" value="{{data.statincrease1}}" data-dtype="String">
+              <select class="competence-base flexrow" type="text" name="system.statincrease1" value="{{data.statincrease1}}" data-dtype="String">
                 {{#select data.statincrease1}}
                 {{> systems/fvtt-pegasus-rpg/templates/partial-options-statistics.html notapplicable=false mr=false}}
                 {{/select}}
               </select> 
             </li>
             <li class="flexrow"><label class="generic-label">Stat increase 2</label>
-              <select class="competence-base flexrow" type="text" name="data.statincrease2" value="{{data.statincrease2}}" data-dtype="String">
+              <select class="competence-base flexrow" type="text" name="system.statincrease2" value="{{data.statincrease2}}" data-dtype="String">
                 {{#select data.statincrease2}}
                 {{> systems/fvtt-pegasus-rpg/templates/partial-options-statistics.html notapplicable=false mr=false}}
                 {{/select}}
@@ -38,13 +38,13 @@
                 <label class="generic-label">Starting Specialisations : </label>
               </li>
               <li class="flexrow"> 
-                <input type="text" class="padd-right" name="data.messagespecplus1" value="{{data.messagespecplus1}}" data-dtype="String"/>
+                <input type="text" class="padd-right" name="system.messagespecplus1" value="{{data.messagespecplus1}}" data-dtype="String"/>
               </li>
               <li class="flexrow"><div class="drop-spec1"><label>Drop Specialisations here !</label></div>
               </li>
               {{#each data.specialisationsplus1 as |spec idx|}}
                 <li class="flexrow">
-                  <label name="data.specialisationsplus1[{{idx}}].name"><a class="view-subitem" data-type="specialisationsplus1" data-index="{{idx}}">{{spec.name}}</a></label>
+                  <label name="system.specialisationsplus1[{{idx}}].name"><a class="view-subitem" data-type="specialisationsplus1" data-index="{{idx}}">{{spec.name}}</a></label>
                   <div class="item-controls padd-left">
                     <a class="item-control delete-subitem padd-left" data-type="specialisationsplus1" data-index="{{idx}}" title="Delete Spec"><i class="fas fa-trash"></i></a>
                   </div>   
@@ -59,7 +59,7 @@
                 </li>
                 {{#each data.specialability as |ability idx|}}
                 <li class="flexrow">
-                  <label name="data.specialability[{{idx}}].name"><a class="view-subitem" data-type="specialability" data-index="{{idx}}">{{ability.name}}</a></label>
+                  <label name="system.specialability[{{idx}}].name"><a class="view-subitem" data-type="specialability" data-index="{{idx}}">{{ability.name}}</a></label>
                   <div class="item-controls padd-left">
                     <a class="item-control delete-subitem padd-left" data-type="specialability" data-index="{{idx}}" title="Delete Ability"><i class="fas fa-trash"></i></a>
                   </div>   
@@ -84,7 +84,7 @@
               </li>
               {{#each data.specincrease as |spec idx|}}
               <li class="flexrow">
-                <label name="data.specincrease[{{idx}}].name"><a class="view-subitem" data-type="specincrease" data-index="{{idx}}">{{spec.name}}</a></label>
+                <label name="system.specincrease[{{idx}}].name"><a class="view-subitem" data-type="specincrease" data-index="{{idx}}">{{spec.name}}</a></label>
                 <div class="item-controls padd-left">
                   <a class="item-control delete-subitem padd-left" data-type="specincrease" data-index="{{idx}}" title="Delete Spec"><i class="fas fa-trash"></i></a>
                 </div>   
@@ -99,7 +99,7 @@
                 </li>
                 {{#each data.perks as |perk idx|}}
                 <li class="flexrow">
-                  <label name="data.perk[{{idx}}].name"><a class="view-subitem" data-type="perks" data-index="{{idx}}">{{perk.name}}</a></label>
+                  <label name="system.perk[{{idx}}].name"><a class="view-subitem" data-type="perks" data-index="{{idx}}">{{perk.name}}</a></label>
                   <div class="item-controls padd-left">
                     <a class="item-control delete-subitem padd-left" data-type="perks" data-index="{{idx}}" title="Delete Perk"><i class="fas fa-trash"></i></a>
                   </div>   
diff --git a/templates/item-shield-sheet.html b/templates/item-shield-sheet.html
index 5bf15f4..8261f2f 100644
--- a/templates/item-shield-sheet.html
+++ b/templates/item-shield-sheet.html
@@ -15,7 +15,7 @@
       <div class="tab details" data-group="primary" data-tab="details">
         <ul>
             <li class="flexrow"><label class="generic-label">Defense Type</label>
-              <select class="competence-base flexrow" type="text" name="data.deftype" value="{{data.deftype}}" data-dtype="String">
+              <select class="competence-base flexrow" type="text" name="system.deftype" value="{{data.deftype}}" data-dtype="String">
                 {{#select data.deftype}}
                 <option value="dodge">Dodge</option>
                 <option value="block">Block</option>
@@ -23,7 +23,7 @@
               </select> 
             </li>
             <li class="flexrow"><label class="generic-label">Bonus Dice</label>
-              <select class="competence-base flexrow" type="text" name="data.level" value="{{data.level}}" data-dtype="Number">
+              <select class="competence-base flexrow" type="text" name="system.level" value="{{data.level}}" data-dtype="Number">
                 {{#select data.level}}
                 {{> systems/fvtt-pegasus-rpg/templates/partial-options-level.html}}
                 {{/select}}
@@ -33,16 +33,16 @@
             {{> systems/fvtt-pegasus-rpg/templates/partial-equipment-effects.html}}
 
             <li class="flexrow"><label class="generic-label">Equipped ?</label>
-              <label class="attribute-value checkbox"><input type="checkbox" name="data.equipped" {{checked data.equipped}}/></label>
+              <label class="attribute-value checkbox"><input type="checkbox" name="system.equipped" {{checked data.equipped}}/></label>
             </li>
             <li class="flexrow"><label class="generic-label">Weight</label>
-              <input type="text" class="input-numeric-short padd-right" name="data.weight" value="{{data.weight}}" data-dtype="Number"/>
+              <input type="text" class="input-numeric-short padd-right" name="system.weight" value="{{data.weight}}" data-dtype="Number"/>
             </li>
             <li class="flexrow"><label class="generic-label">Cost</label>
-              <input type="text" class="input-numeric-short padd-right" name="data.cost" value="{{data.cost}}" data-dtype="Number"/>
+              <input type="text" class="input-numeric-short padd-right" name="system.cost" value="{{data.cost}}" data-dtype="Number"/>
             </li>
             <li class="flexrow"><label class="generic-label">IDR</label>
-              <select class="competence-base flexrow" type="text" name="data.idr" value="{{data.idr}}" data-dtype="String">
+              <select class="competence-base flexrow" type="text" name="system.idr" value="{{data.idr}}" data-dtype="String">
                 {{#select data.idr}}
                 {{{optionsDiceList}}}
                 {{/select}}
diff --git a/templates/item-specialisation-sheet.html b/templates/item-specialisation-sheet.html
index c5c7c1c..d32bf19 100644
--- a/templates/item-specialisation-sheet.html
+++ b/templates/item-specialisation-sheet.html
@@ -16,7 +16,7 @@
       <div class="tab details" data-group="primary" data-tab="details">
         <ul>
             <li class="flexrow"><label class="generic-label">Related Statistic</label>
-              <select class="competence-base flexrow" type="text" name="data.statistic" value="{{data.statistic}}" data-dtype="String">
+              <select class="competence-base flexrow" type="text" name="system.statistic" value="{{data.statistic}}" data-dtype="String">
                 {{#select data.statistic}}
                 {{> systems/fvtt-pegasus-rpg/templates/partial-options-statistics.html}}
                 {{/select}}
@@ -24,18 +24,18 @@
             </li>
 
             <li class="flexrow"><label class="generic-label">Level</label>
-              <select class="competence-base flexrow" type="text" name="data.level" value="{{data.level}}" data-dtype="Number">
+              <select class="competence-base flexrow" type="text" name="system.level" value="{{data.level}}" data-dtype="Number">
                 {{#select data.level}}
                 {{{optionsDiceList}}}
                 {{/select}}
               </select> 
             </li>
             <li class="flexrow"><label class="generic-label">Is Power Group ?</label>
-              <label class="attribute-value checkbox"><input type="checkbox" name="data.ispowergroup" {{checked data.ispowergroup}}/></label>
+              <label class="attribute-value checkbox"><input type="checkbox" name="system.ispowergroup" {{checked data.ispowergroup}}/></label>
             </li>
             {{#if data.ispowergroup}}              
             <li class="flexrow"><label class="generic-label">Available Power sources</label>
-              <input type="text" class="" name="data.powersource" value="{{data.powersource}}" data-dtype="String"/>
+              <input type="text" class="" name="system.powersource" value="{{data.powersource}}" data-dtype="String"/>
             </li>
             <li class="flexrow"><label class="generic-label">Available Powers</label>
             </li>
@@ -44,7 +44,7 @@
                 </li>
                 {{#each data.powers as |power idx|}}
                 <li class="flexrow">
-                  <label name="data.powers[{{idx}}].name"><a class="view-subitem" data-type="powers" data-index="{{idx}}">{{power.name}}</a></label>
+                  <label name="system.powers[{{idx}}].name"><a class="view-subitem" data-type="powers" data-index="{{idx}}">{{power.name}}</a></label>
                   <div class="item-controls padd-left">
                     <a class="item-control delete-subitem padd-left" data-type="powers" data-index="{{idx}}" title="Delete Power"><i class="fas fa-trash"></i></a>
                   </div>   
@@ -54,7 +54,7 @@
             </li>
             {{/if}}
             <li class="flexrow"><label class="generic-label">Use for Threat Level ?</label>
-              <label class="attribute-value checkbox"><input type="checkbox" name="data.isthreatlevel" {{checked data.isthreatlevel}}/></label>
+              <label class="attribute-value checkbox"><input type="checkbox" name="system.isthreatlevel" {{checked data.isthreatlevel}}/></label>
             </li>
           </ul>
         </div>
diff --git a/templates/item-vehiclehull-sheet.html b/templates/item-vehiclehull-sheet.html
index 24cc98f..4f735b8 100644
--- a/templates/item-vehiclehull-sheet.html
+++ b/templates/item-vehiclehull-sheet.html
@@ -15,7 +15,7 @@
     <div class="tab details" data-group="primary" data-tab="details">
       <ul>
           <li class="flexrow"><label class="generic-label">Hull type</label>
-            <select class="competence-base flexrow" type="text" name="data.hulltype" value="{{data.hulltype}}" data-dtype="String">
+            <select class="competence-base flexrow" type="text" name="system.hulltype" value="{{data.hulltype}}" data-dtype="String">
               {{#select data.hulltype}}
               <option value="tiny">Tiny</option>
               <option value="small">Small</option>
@@ -35,11 +35,11 @@
           </li>
 
           <li class="flexrow"><label class="generic-label">Size</label>
-            <input type="text" class="" name="data.size" value="{{data.size}}" data-dtype="Number"/>
+            <input type="text" class="" name="system.size" value="{{data.size}}" data-dtype="Number"/>
           </li>
 
           <li class="flexrow"><label class="generic-label">HR</label>
-            <select class="competence-base flexrow" type="text" name="data.hr" value="{{data.hr}}" data-dtype="String">
+            <select class="competence-base flexrow" type="text" name="system.hr" value="{{data.hr}}" data-dtype="String">
               {{#select data.hr}}
               {{{optionsDiceList}}}
               {{/select}}
@@ -47,7 +47,7 @@
           </li>          
 
           <li class="flexrow"><label class="generic-label">MAN</label>
-            <select class="competence-base flexrow" type="text" name="data.man" value="{{data.man}}" data-dtype="String">
+            <select class="competence-base flexrow" type="text" name="system.man" value="{{data.man}}" data-dtype="String">
               {{#select data.man}}
               {{{optionsDiceList}}}
               {{/select}}
@@ -55,11 +55,11 @@
           </li>          
 
           <li class="flexrow"><label class="generic-label">VMS</label>
-            <input type="text" class="" name="data.vms" value="{{data.vms}}" data-dtype="Number"/>
+            <input type="text" class="" name="system.vms" value="{{data.vms}}" data-dtype="Number"/>
           </li>
 
           <li class="flexrow"><label class="generic-label">Cost</label>
-            <input type="text" class="" name="data.cost" value="{{data.cost}}" data-dtype="Number"/>
+            <input type="text" class="" name="system.cost" value="{{data.cost}}" data-dtype="Number"/>
           </li>
 
       </ul>
diff --git a/templates/item-vehiclemodule-sheet.html b/templates/item-vehiclemodule-sheet.html
index 5276c65..2414462 100644
--- a/templates/item-vehiclemodule-sheet.html
+++ b/templates/item-vehiclemodule-sheet.html
@@ -15,7 +15,7 @@
     <div class="tab details" data-group="primary" data-tab="details">
       <ul>
           <li class="flexrow"><label class="generic-label">Category</label>
-            <select class="competence-base flexrow" type="text" name="data.category" value="{{data.category}}" data-dtype="String">
+            <select class="competence-base flexrow" type="text" name="system.category" value="{{data.category}}" data-dtype="String">
               {{#select data.category}}
               <option value="mobility">Mobility</option>
               <option value="com">Com</option>
@@ -34,7 +34,7 @@
           </li>
 
           <li class="flexrow"><label class="generic-label">Location</label>
-            <select class="competence-base flexrow" type="text" name="data.location" value="{{data.location}}" data-dtype="String">
+            <select class="competence-base flexrow" type="text" name="system.location" value="{{data.location}}" data-dtype="String">
               {{#select data.location}}
               <option value="front">Front</option>
               <option value="left">Left</option>
@@ -47,17 +47,17 @@
           </li>
 
           <li class="flexrow"><label class="generic-label">Activated ?</label>
-            <label class="attribute-value checkbox"><input type="checkbox" name="data.activated" {{checked data.activated}}/></label>
+            <label class="attribute-value checkbox"><input type="checkbox" name="system.activated" {{checked data.activated}}/></label>
           </li>
 
           <li class="flexrow"><label class="generic-label">NRG</label>
-            <input type="text" class="" name="data.nrg" value="{{data.nrg}}" data-dtype="Number"/>
+            <input type="text" class="" name="system.nrg" value="{{data.nrg}}" data-dtype="Number"/>
           </li>
 
           {{> systems/fvtt-pegasus-rpg/templates/partial-equipment-effects.html}}
 
           <li class="flexrow"><label class="generic-label">Arc coverage</label>
-            <select class="competence-base flexrow" type="text" name="data.arccoverage" value="{{data.arccoverage}}" data-dtype="String">
+            <select class="competence-base flexrow" type="text" name="system.arccoverage" value="{{data.arccoverage}}" data-dtype="String">
               {{#select data.arccoverage}}
               <option value="none">None</option>
               <option value="all">All</option>
@@ -72,21 +72,21 @@
           </li>
 
           <li class="flexrow"><label class="generic-label">Armour Dice Value</label>
-            <select class="competence-base flexrow" type="text" name="data.armourdicevalue" value="{{data.armourdicevalue}}" data-dtype="String">
+            <select class="competence-base flexrow" type="text" name="system.armourdicevalue" value="{{data.armourdicevalue}}" data-dtype="String">
               {{#select data.armourdicevalue}}
               {{{optionsDiceList}}}
               {{/select}}
             </select>           
           </li>          
           <li class="flexrow"><label class="generic-label">Shield Dice Value</label>
-            <select class="competence-base flexrow" type="text" name="data.shielddicevalue" value="{{data.shielddicevalue}}" data-dtype="String">
+            <select class="competence-base flexrow" type="text" name="system.shielddicevalue" value="{{data.shielddicevalue}}" data-dtype="String">
               {{#select data.shielddicevalue}}
               {{{optionsDiceList}}}
               {{/select}}
             </select>           
           </li>          
           <li class="flexrow"><label class="generic-label">Security Dice Value</label>
-            <select class="competence-base flexrow" type="text" name="data.securitydicevalue" value="{{data.securitydicevalue}}" data-dtype="String">
+            <select class="competence-base flexrow" type="text" name="system.securitydicevalue" value="{{data.securitydicevalue}}" data-dtype="String">
               {{#select data.securitydicevalue}}
               {{{optionsDiceList}}}
               {{/select}}
@@ -94,7 +94,7 @@
           </li>          
 
           <li class="flexrow"><label class="generic-label">Range</label>
-            <select class="competence-base flexrow" type="text" name="data.range" value="{{data.range}}" data-dtype="String">
+            <select class="competence-base flexrow" type="text" name="system.range" value="{{data.range}}" data-dtype="String">
               {{#select data.range}}
               {{> systems/fvtt-pegasus-rpg/templates/partial-options-range.html notapplicable=true}}
               {{/select}}
@@ -102,18 +102,18 @@
           </li>
           
           <li class="flexrow"><label class="generic-label">IDR</label>
-            <select class="competence-base flexrow" type="text" name="data.idr" value="{{data.idr}}" data-dtype="String">
+            <select class="competence-base flexrow" type="text" name="system.idr" value="{{data.idr}}" data-dtype="String">
               {{#select data.idr}}
               {{{optionsDiceList}}}
               {{/select}}
             </select> 
           </li>
           <li class="flexrow"><label class="generic-label">Space</label>
-            <input type="text" class="" name="data.space" value="{{data.space}}" data-dtype="Number"/>
+            <input type="text" class="" name="system.space" value="{{data.space}}" data-dtype="Number"/>
           </li>
 
           <li class="flexrow"><label class="generic-label">Cost</label>
-            <input type="text" class="" name="data.cost" value="{{data.cost}}" data-dtype="Number"/>
+            <input type="text" class="" name="system.cost" value="{{data.cost}}" data-dtype="Number"/>
           </li>
 
         </ul>
diff --git a/templates/item-vehicleweaponmodule-sheet.html b/templates/item-vehicleweaponmodule-sheet.html
index 4ee2199..b821bd3 100644
--- a/templates/item-vehicleweaponmodule-sheet.html
+++ b/templates/item-vehicleweaponmodule-sheet.html
@@ -15,7 +15,7 @@
     <div class="tab details" data-group="primary" data-tab="details">
       <ul>
           <li class="flexrow"><label class="generic-label">Location</label>
-            <select class="competence-base flexrow" type="text" name="data.location" value="{{data.location}}" data-dtype="String">
+            <select class="competence-base flexrow" type="text" name="system.location" value="{{data.location}}" data-dtype="String">
               {{#select data.location}}
               <option value="front">Front</option>
               <option value="left">Left</option>
@@ -28,28 +28,28 @@
           </li>
 
           <li class="flexrow"><label class="generic-label">Weapon size</label>
-            <input type="text" class="" name="data.size" value="{{data.size}}" data-dtype="Number"/>
+            <input type="text" class="" name="system.size" value="{{data.size}}" data-dtype="Number"/>
           </li>
 
           <li class="flexrow"><label class="generic-label">Activated ?</label>
-            <label class="attribute-value checkbox"><input type="checkbox" name="data.activated" {{checked data.activated}}/></label>
+            <label class="attribute-value checkbox"><input type="checkbox" name="system.activated" {{checked data.activated}}/></label>
           </li>
 
           <li class="flexrow"><label class="generic-label">NRG</label>
-            <input type="text" class="" name="data.nrg" value="{{data.nrg}}" data-dtype="Number"/>
+            <input type="text" class="" name="system.nrg" value="{{data.nrg}}" data-dtype="Number"/>
           </li>
 
           {{> systems/fvtt-pegasus-rpg/templates/partial-equipment-effects.html}}
 
           <li class="flexrow"><label class="generic-label">Damage Dice Value</label>
-            <select class="competence-base flexrow" type="text" name="data.damagedicevalue" value="{{data.damagedicevalue}}" data-dtype="String">
+            <select class="competence-base flexrow" type="text" name="system.damagedicevalue" value="{{data.damagedicevalue}}" data-dtype="String">
               {{#select data.damagedicevalue}}
               {{{optionsDiceList}}}
               {{/select}}
             </select>           
           </li>          
           <li class="flexrow"><label class="generic-label">Damage Type</label>
-            <select class="competence-base flexrow" type="text" name="data.damagetype" value="{{data.damagetype}}" data-dtype="String">
+            <select class="competence-base flexrow" type="text" name="system.damagetype" value="{{data.damagetype}}" data-dtype="String">
               {{#select data.damagetype}} None, Cr, Pi, Sl, EMP, Kin, Therm, Pi&Therm, Pi&EMP, Pi&Kin, Cr&Therm, Cr&EMP, Cr&Kin
               <option value="none">None</option>
               <option value="cr">Cr</option>
@@ -68,7 +68,7 @@
           </li>          
 
           <li class="flexrow"><label class="generic-label">Optimal Range</label>
-            <select class="competence-base flexrow" type="text" name="data.range" value="{{data.range}}" data-dtype="String">
+            <select class="competence-base flexrow" type="text" name="system.range" value="{{data.range}}" data-dtype="String">
               {{#select data.range}}
               {{> systems/fvtt-pegasus-rpg/templates/partial-options-range.html notapplicable=true}}
               {{/select}}
@@ -76,7 +76,7 @@
           </li>          
 
           <li class="flexrow"><label class="generic-label">AoE</label>
-            <select class="competence-base flexrow" type="text" name="data.aoe" value="{{data.aoe}}" data-dtype="String">
+            <select class="competence-base flexrow" type="text" name="system.aoe" value="{{data.aoe}}" data-dtype="String">
               {{#select data.aoe}}
               <option value="none">None</option>
               <option value="tz">TZ</option>
@@ -91,7 +91,7 @@
 
 
           <li class="flexrow"><label class="generic-label">Turret</label>
-            <select class="competence-base flexrow" type="text" name="data.turret" value="{{data.turret}}" data-dtype="Number">
+            <select class="competence-base flexrow" type="text" name="system.turret" value="{{data.turret}}" data-dtype="Number">
               {{#select data.turret}} F Front, F Left, F Right, F Rear, F Up, F Down, T 180 Front, T 180 Left, T 180 Rear, T 180 Right, T 360
               <option value="ffront">F Front</option>
               <option value="fleft">F Left</option>
@@ -109,11 +109,11 @@
           </li>          
 
           <li class="flexrow"><label class="generic-label">Linked weapon ?</label>
-            <label class="attribute-value checkbox"><input type="checkbox" name="data.linkedweapon" {{checked data.linkedweapon}}/></label>
+            <label class="attribute-value checkbox"><input type="checkbox" name="system.linkedweapon" {{checked data.linkedweapon}}/></label>
           </li>
           
           <li class="flexrow"><label class="generic-label">IDR</label>
-            <select class="competence-base flexrow" type="text" name="data.idr" value="{{data.idr}}" data-dtype="String">
+            <select class="competence-base flexrow" type="text" name="system.idr" value="{{data.idr}}" data-dtype="String">
               {{#select data.idr}}
               {{{optionsDiceList}}}
               {{/select}}
@@ -121,11 +121,11 @@
           </li>
 
           <li class="flexrow"><label class="generic-label">Space</label>
-            <input type="text" class="" name="data.space" value="{{data.space}}" data-dtype="Number"/>
+            <input type="text" class="" name="system.space" value="{{data.space}}" data-dtype="Number"/>
           </li>
 
           <li class="flexrow"><label class="generic-label">Cost</label>
-            <input type="text" class="" name="data.cost" value="{{data.cost}}" data-dtype="Number"/>
+            <input type="text" class="" name="system.cost" value="{{data.cost}}" data-dtype="Number"/>
           </li>
 
         </ul>
diff --git a/templates/item-vice-sheet.html b/templates/item-vice-sheet.html
index b29414c..a9fd77b 100644
--- a/templates/item-vice-sheet.html
+++ b/templates/item-vice-sheet.html
@@ -22,7 +22,7 @@
             </li>
             {{#each data.unavailablevirtue as |vice idx|}}
             <li class="flexrow">
-              <label name="data.unavailablevirtue[{{idx}}].name"><a class="view-subitem" data-type="unavailablevirtue" data-index="{{idx}}">{{vice.name}}</a></label>
+              <label name="system.unavailablevirtue[{{idx}}].name"><a class="view-subitem" data-type="unavailablevirtue" data-index="{{idx}}">{{vice.name}}</a></label>
               <div class="item-controls padd-left">
                 <a class="item-control delete-subitem padd-left" data-type="unavailablevirtue" data-index="{{idx}}" title="Delete Virtue"><i class="fas fa-trash"></i></a>
               </div>   
@@ -33,7 +33,7 @@
 
         <li class="flexrow">
           <label class="generic-label">Activated ? </label>
-          <label class="attribute-value checkbox"><input type="checkbox" name="data.activated" {{checked
+          <label class="attribute-value checkbox"><input type="checkbox" name="system.activated" {{checked
               data.activated}} /></label>
         </li>
 
@@ -45,7 +45,7 @@
             </li>
             {{#each data.effectsgained as |effect idx|}}
             <li class="flexrow">
-              <label name="data.effectsgained[{{idx}}].name"><a class="view-subitem" data-type="effectsgained" data-index="{{idx}}">{{effect.name}}</a></label>
+              <label name="system.effectsgained[{{idx}}].name"><a class="view-subitem" data-type="effectsgained" data-index="{{idx}}">{{effect.name}}</a></label>
               <div class="item-controls padd-left">
                 <a class="item-control delete-subitem padd-left" data-type="effectsgained" data-index="{{idx}}" title="Delete Effect"><i class="fas fa-trash"></i></a>
               </div>   
@@ -55,7 +55,7 @@
         </li>
 
         <li class="flexrow"><label class="generic-label">Threat Level Value</label>
-          <input type="text" class="input-numeric-short padd-right" name="data.threatlevel" value="{{data.threatlevel}}" data-dtype="Number"/>
+          <input type="text" class="input-numeric-short padd-right" name="system.threatlevel" value="{{data.threatlevel}}" data-dtype="Number"/>
         </li>
 
       </ul>
diff --git a/templates/item-virtue-sheet.html b/templates/item-virtue-sheet.html
index da2f47a..4bc2a1f 100644
--- a/templates/item-virtue-sheet.html
+++ b/templates/item-virtue-sheet.html
@@ -22,7 +22,7 @@
             </li>
             {{#each data.unavailablevice as |vice idx|}}
             <li class="flexrow">
-              <label name="data.unavailablevice[{{idx}}].name"><a class="view-subitem" data-type="unavailablevice" data-index="{{idx}}">{{vice.name}}</a></label>
+              <label name="system.unavailablevice[{{idx}}].name"><a class="view-subitem" data-type="unavailablevice" data-index="{{idx}}">{{vice.name}}</a></label>
               <div class="item-controls padd-left">
                 <a class="item-control delete-subitem padd-left" data-type="unavailablevice" data-index="{{idx}}" title="Delete Vice"><i class="fas fa-trash"></i></a>
               </div>   
@@ -33,7 +33,7 @@
 
         <li class="flexrow">
           <label class="generic-label">Activated ? </label>
-          <label class="attribute-value checkbox"><input type="checkbox" name="data.activated" {{checked
+          <label class="attribute-value checkbox"><input type="checkbox" name="system.activated" {{checked
               data.activated}} /></label>
         </li>
 
@@ -45,7 +45,7 @@
             </li>
             {{#each data.effectsgained as |effect idx|}}
             <li class="flexrow">
-              <label name="data.effectsgained[{{idx}}].name"><a class="view-subitem" data-type="effectsgained" data-index="{{idx}}">{{effect.name}}</a></label>
+              <label name="system.effectsgained[{{idx}}].name"><a class="view-subitem" data-type="effectsgained" data-index="{{idx}}">{{effect.name}}</a></label>
               <div class="item-controls padd-left">
                 <a class="item-control delete-subitem padd-left" data-type="effectsgained" data-index="{{idx}}" title="Delete Effect"><i class="fas fa-trash"></i></a>
               </div>   
@@ -55,7 +55,7 @@
         </li>
 
         <li class="flexrow"><label class="generic-label">Threat Level Value</label>
-          <input type="text" class="input-numeric-short padd-right" name="data.threatlevel" value="{{data.threatlevel}}" data-dtype="Number"/>
+          <input type="text" class="input-numeric-short padd-right" name="system.threatlevel" value="{{data.threatlevel}}" data-dtype="Number"/>
         </li>
 
       </ul>
diff --git a/templates/item-weapon-sheet.html b/templates/item-weapon-sheet.html
index 447656b..9a44624 100644
--- a/templates/item-weapon-sheet.html
+++ b/templates/item-weapon-sheet.html
@@ -15,7 +15,7 @@
     <div class="tab details" data-group="primary" data-tab="details">
       <ul>
           <li class="flexrow"><label class="generic-label">Related Attack Statistic</label>
-            <select class="competence-base flexrow" type="text" name="data.statistic" value="{{data.statistic}}" data-dtype="String">
+            <select class="competence-base flexrow" type="text" name="system.statistic" value="{{data.statistic}}" data-dtype="String">
               {{#select data.statistic}}
               {{> systems/fvtt-pegasus-rpg/templates/partial-options-statistics.html notapplicable=false special=true}}
               {{/select}}
@@ -23,7 +23,7 @@
           </li>
 
           <li class="flexrow"><label class="generic-label">Related DMG Statistic</label>
-            <select class="competence-base flexrow" type="text" name="data.damagestatistic" value="{{data.damagestatistic}}" data-dtype="String">
+            <select class="competence-base flexrow" type="text" name="system.damagestatistic" value="{{data.damagestatistic}}" data-dtype="String">
               {{#select data.damagestatistic}}
               {{> systems/fvtt-pegasus-rpg/templates/partial-options-statistics.html notapplicable=false special=true}}
               {{/select}}
@@ -31,7 +31,7 @@
           </li>
 
           <li class="flexrow"><label class="generic-label">Damage Dice</label>
-            <select class="competence-base flexrow" type="text" name="data.damage" value="{{data.damage}}" data-dtype="String">
+            <select class="competence-base flexrow" type="text" name="system.damage" value="{{data.damage}}" data-dtype="String">
               {{#select data.damage}}
               {{{optionsDiceList}}}
               {{/select}}
@@ -39,11 +39,11 @@
           </li>
 
           <li class="flexrow"><label class="generic-label">Item size</label>
-            <input type="text" class="" name="data.itemsize" value="{{data.itemsize}}" data-dtype="String"/>
+            <input type="text" class="" name="system.itemsize" value="{{data.itemsize}}" data-dtype="String"/>
           </li>
 
           <li class="flexrow"><label class="generic-label">Optimal Range</label>
-            <select class="competence-base flexrow" type="text" name="data.range" value="{{data.range}}" data-dtype="String">
+            <select class="competence-base flexrow" type="text" name="system.range" value="{{data.range}}" data-dtype="String">
               {{#select data.range}}
               {{> systems/fvtt-pegasus-rpg/templates/partial-options-range.html notapplicable=true}}
               {{/select}}
@@ -51,11 +51,11 @@
           </li>          
 
           <li class="flexrow"><label class="generic-label">Max Range</label>
-            <input type="text" class="" name="data.maxrange" value="{{data.maxrange}}" data-dtype="String"/>
+            <input type="text" class="" name="system.maxrange" value="{{data.maxrange}}" data-dtype="String"/>
           </li>
 
           <li class="flexrow"><label class="generic-label">AoE</label>
-            <select class="competence-base flexrow" type="text" name="data.aoe" value="{{data.aoe}}" data-dtype="String">
+            <select class="competence-base flexrow" type="text" name="system.aoe" value="{{data.aoe}}" data-dtype="String">
               {{#select data.aoe}}
               <option value="none">None</option>
               <option value="tz">TZ</option>
@@ -69,7 +69,7 @@
           </li>
 
           <li class="flexrow"><label class="generic-label">Damage Type</label>
-            <select class="competence-base flexrow" type="text" name="data.damagetype" value="{{data.damagetype}}" data-dtype="String">
+            <select class="competence-base flexrow" type="text" name="system.damagetype" value="{{data.damagetype}}" data-dtype="String">
               {{#select data.damagetype}}
               <option value="none">None</option>
               <option value="slashing">Slashing</option>
@@ -81,11 +81,11 @@
           </li>
 
           <li class="flexrow"><label class="generic-label">Damage Type Level</label>
-            <input type="text" class="input-numeric-short padd-right" name="data.damagetypelevel" value="{{data.damagetypelevel}}" data-dtype="Number"/>
+            <input type="text" class="input-numeric-short padd-right" name="system.damagetypelevel" value="{{data.damagetypelevel}}" data-dtype="Number"/>
           </li>
           
           <li class="flexrow"><label class="generic-label">Vehicle Damage Type</label>
-            <select class="competence-base flexrow" type="text" name="data.vehicledamagetype" value="{{data.vehicledamagetype}}" data-dtype="String">
+            <select class="competence-base flexrow" type="text" name="system.vehicledamagetype" value="{{data.vehicledamagetype}}" data-dtype="String">
               {{#select data.vehicledamagetype}}
               <option value="none">None</option>
               <option value="emp">EMP</option>
@@ -99,48 +99,48 @@
           {{> systems/fvtt-pegasus-rpg/templates/partial-equipment-effects.html}}
 
           <li class="flexrow"><label class="generic-label">Vehicle Damage Type Level</label>
-            <input type="text" class="input-numeric-short padd-right" name="data.vehicledamagetypelevel" value="{{data.vehicledamagetypelevel}}" data-dtype="Number"/>
+            <input type="text" class="input-numeric-short padd-right" name="system.vehicledamagetypelevel" value="{{data.vehicledamagetypelevel}}" data-dtype="Number"/>
           </li>
           
           <li class="flexrow"><label class="generic-label">Ammo - Current</label>
-            <input type="text" class="input-numeric-short padd-right" name="data.ammocurrent" value="{{data.ammocurrent}}" data-dtype="Number"/>
+            <input type="text" class="input-numeric-short padd-right" name="system.ammocurrent" value="{{data.ammocurrent}}" data-dtype="Number"/>
           </li>
 
           <li class="flexrow"><label class="generic-label">Ammo - Max</label>
-            <input type="text" class="input-numeric-short padd-right" name="data.ammomax" value="{{data.ammomax}}" data-dtype="Number"/>
+            <input type="text" class="input-numeric-short padd-right" name="system.ammomax" value="{{data.ammomax}}" data-dtype="Number"/>
           </li>
 
           <li class="flexrow"><label class="generic-label">Equipped ?</label>
-            <label class="attribute-value checkbox"><input type="checkbox" name="data.equipped" {{checked data.equipped}}/></label>
+            <label class="attribute-value checkbox"><input type="checkbox" name="system.equipped" {{checked data.equipped}}/></label>
           </li>
           <li class="flexrow"><label class="generic-label">Can be thrown ?</label>
-            <label class="attribute-value checkbox"><input type="checkbox" name="data.canbethrown" {{checked data.canbethrown}}/></label>
+            <label class="attribute-value checkbox"><input type="checkbox" name="system.canbethrown" {{checked data.canbethrown}}/></label>
           </li>
 
           <li class="flexrow"><label class="generic-label">Enhanced ?</label>
-            <label class="attribute-value checkbox"><input type="checkbox" name="data.enhanced" {{checked data.enhanced}}/></label>
+            <label class="attribute-value checkbox"><input type="checkbox" name="system.enhanced" {{checked data.enhanced}}/></label>
           </li>
           {{#if data.enhanced}}
           <li class="flexrow"><label class="generic-label">Enhanced Attack Statistic</label>
-            <select class="competence-base flexrow" type="text" name="data.enhancedstat" value="{{data.enhancedstat}}" data-dtype="String">
+            <select class="competence-base flexrow" type="text" name="system.enhancedstat" value="{{data.enhancedstat}}" data-dtype="String">
               {{#select data.enhancedstat}}
               {{> systems/fvtt-pegasus-rpg/templates/partial-options-statistics.html notapplicable=false special=false}}
               {{/select}}
             </select> 
           </li>
           <li class="flexrow"><label class="generic-label">Enhance Level</label>
-            <input type="text" class="input-numeric-short padd-right" name="data.enhancedlevel" value="{{data.enhancedlevel}}" data-dtype="Number"/>
+            <input type="text" class="input-numeric-short padd-right" name="system.enhancedlevel" value="{{data.enhancedlevel}}" data-dtype="Number"/>
           </li>
           {{/if}}
 
           <li class="flexrow"><label class="generic-label">Weight</label>
-            <input type="text" class="input-numeric-short padd-right" name="data.weight" value="{{data.weight}}" data-dtype="Number"/>
+            <input type="text" class="input-numeric-short padd-right" name="system.weight" value="{{data.weight}}" data-dtype="Number"/>
           </li>
           <li class="flexrow"><label class="generic-label">Cost</label>
-            <input type="text" class="input-numeric-short padd-right" name="data.cost" value="{{data.cost}}" data-dtype="Number"/>
+            <input type="text" class="input-numeric-short padd-right" name="system.cost" value="{{data.cost}}" data-dtype="Number"/>
           </li>
           <li class="flexrow"><label class="generic-label">IDR</label>
-            <select class="competence-base flexrow" type="text" name="data.idr" value="{{data.idr}}" data-dtype="String">
+            <select class="competence-base flexrow" type="text" name="system.idr" value="{{data.idr}}" data-dtype="String">
               {{#select data.idr}}
               {{{optionsDiceList}}}
               {{/select}}
diff --git a/templates/npc-sheet.html b/templates/npc-sheet.html
index 6bfa5f1..172e10b 100644
--- a/templates/npc-sheet.html
+++ b/templates/npc-sheet.html
@@ -31,7 +31,7 @@
             <div class="">
 
               <span class="generic-label"><h3>Type</h3>
-              <select class="competence-base flexrow" type="text" name="data.npctype" value="{{data.npctype}}" data-dtype="String" {{#unless @root.editScore}}disabled{{/unless}}>
+              <select class="competence-base flexrow" type="text" name="system.npctype" value="{{data.npctype}}" data-dtype="String" {{#unless @root.editScore}}disabled{{/unless}}>
                 {{#select data.npctype}}
                 <option value="henchman">Henchman</option>
                 <option value="drone">Troop</option>
@@ -65,7 +65,7 @@
                 {{#each data.spec as |spec key|}}
                 <li class="item flexrow list-item stack-left" data-attr-key="{{key}}">
                   <span class="stat-label padd-right npc-stat-label" name="{{key}}">{{spec.label}}</span>
-                  <input type="text" class="input-numeric-short padd-right" name="data.spec.{{key}}.value" value="{{spec.value}}" data-dtype="Number" {{#unless @root.editScore}}disabled{{/unless}}/>
+                  <input type="text" class="input-numeric-short padd-right" name="system.spec.{{key}}.value" value="{{spec.value}}" data-dtype="Number" {{#unless @root.editScore}}disabled{{/unless}}/>
                 </li>
                 {{/each}}
               </ul>    
@@ -84,12 +84,12 @@
             <ul>
               <li class="item flexrow list-item stack-left">
                 <span class="stat-label padd-right"><strong>{{fight.label}}</strong></span>                
-                <input type="text" class="input-numeric-short padd-right" name="data.fight.{{key}}.value" value="{{fight.value}}" data-dtype="Number"/>
+                <input type="text" class="input-numeric-short padd-right" name="system.fight.{{key}}.value" value="{{fight.value}}" data-dtype="Number"/>
               </li>
               {{#each fight.derivated as |derivated keydev|}}   
               <li class="item flexrow list-item">
                 <span class="stat-label flexrow ">{{derivated.label}}</span>
-                <input type="text" class="input-numeric-short padd-right"  name="data.fight.{{key}}.derivated.{{keydev}}.value" value="{{derivated.value}}" data-dtype="Number"/>
+                <input type="text" class="input-numeric-short padd-right"  name="system.fight.{{key}}.derivated.{{keydev}}.value" value="{{derivated.value}}" data-dtype="Number"/>
               </li>
               {{/each}}
             </ul>    
diff --git a/templates/partial-actor-stat-block.html b/templates/partial-actor-stat-block.html
index d2cdb82..dd47241 100644
--- a/templates/partial-actor-stat-block.html
+++ b/templates/partial-actor-stat-block.html
@@ -5,12 +5,12 @@
   <span class="stat-label stat-margin" name="{{key}}">
     <h4 class="stat-text-white stat-margin"><a class="roll-stat stat-margin" data-stat-key="{{key}}">{{stat.abbrev}}</a></h4>
   </span>
-  <select class="status-small-label color-class-common" type="text" name="data.statistics.{{key}}.value" value="{{stat.value}}"
+  <select class="status-small-label color-class-common" type="text" name="system.statistics.{{key}}.value" value="{{stat.value}}"
     data-dtype="Number" {{#unless @root.editScore}}disabled{{/unless}}>
     {{#select stat.value}}
     {{{@root.optionsDiceList}}}
     {{/select}}
   </select>
-  <input type="text" class="input-numeric-short padd-right status-small-label color-class-common" name="data.statistics.{{key}}.mod" value="{{stat.mod}}"
+  <input type="text" class="input-numeric-short padd-right status-small-label color-class-common" name="system.statistics.{{key}}.mod" value="{{stat.mod}}"
     data-dtype="Number" {{#unless @root.editScore}}disabled{{/unless}} />
 </li>
\ No newline at end of file
diff --git a/templates/partial-actor-status.html b/templates/partial-actor-status.html
index 171c3ed..80460d4 100644
--- a/templates/partial-actor-status.html
+++ b/templates/partial-actor-status.html
@@ -17,18 +17,18 @@
           {{/if}}
         </label>
       </span>
-      <input type="text" class="padd-right status-small-label no-grow" name="data.secondary.{{key}}.value" value="{{stat2.value}}" data-dtype="Number"/>
-      <input type="text" class="padd-right status-small-label no-grow" name="data.secondary.{{key}}.bonus" value="{{stat2.bonus}}" data-dtype="Number"/>
-      <input type="text" class="padd-right status-small-label no-grow" name="data.secondary.{{key}}.max" value="{{stat2.max}}" data-dtype="Number"/>
+      <input type="text" class="padd-right status-small-label no-grow" name="system.secondary.{{key}}.value" value="{{stat2.value}}" data-dtype="Number"/>
+      <input type="text" class="padd-right status-small-label no-grow" name="system.secondary.{{key}}.bonus" value="{{stat2.bonus}}" data-dtype="Number"/>
+      <input type="text" class="padd-right status-small-label no-grow" name="system.secondary.{{key}}.max" value="{{stat2.max}}" data-dtype="Number"/>
     </li>
   {{/each}}
   <li class="item flexrow " data-key="nrg">
     <span class="stat-label flexrow status-col-name" name="nrg">
       <label class="status-small-label"><strong>{{data.nrg.label}}</strong></label>               
     </span>
-    <input type="text" class="padd-right status-small-label no-grow" name="data.nrg.value" value="{{data.nrg.value}}" data-dtype="Number"/>
-    <input type="text" class="padd-right status-small-label no-grow" name="data.nrg.mod" value="{{data.nrg.mod}}" data-dtype="Number"/>
-    <input type="text" class="padd-right status-small-label no-grow" name="data.nrg.max" value="{{data.nrg.max}}" data-dtype="Number"/>
+    <input type="text" class="padd-right status-small-label no-grow" name="system.nrg.value" value="{{data.nrg.value}}" data-dtype="Number"/>
+    <input type="text" class="padd-right status-small-label no-grow" name="system.nrg.mod" value="{{data.nrg.mod}}" data-dtype="Number"/>
+    <input type="text" class="padd-right status-small-label no-grow" name="system.nrg.max" value="{{data.nrg.max}}" data-dtype="Number"/>
     <span class="small-label status-small-label">&nbsp;/ {{data.nrg.absolutemax}}</span>
   </li>
   <li class="item flexrow " data-key="nrg">
@@ -36,7 +36,7 @@
       <label class="status-small-label"><strong>Activated NRG</strong><br>
     </span>
     <span class="stat-label flexrow status-col-name" name="activated-nrg">
-      <input type="text" class="padd-right status-small-label no-grow" name="data.nrg.activated" value="{{data.nrg.activated}}" data-dtype="Number"/>
+      <input type="text" class="padd-right status-small-label no-grow" name="system.nrg.activated" value="{{data.nrg.activated}}" data-dtype="Number"/>
     </span>
     <span class="padd-right status-small-label no-grow">
       <a class="current-nrg-plus plus-minus-button">+</a>
@@ -53,12 +53,12 @@
     <span class="stat-label flexrow status-col-name" name="momentum">
       <label class="status-small-label"><strong>Momentum</strong></label>               
     </span>
-    <input type="text" class="padd-right status-small-label no-grow" name="data.momentum.value" value="{{data.momentum.value}}" data-dtype="Number"/>
+    <input type="text" class="padd-right status-small-label no-grow" name="system.momentum.value" value="{{data.momentum.value}}" data-dtype="Number"/>
     <span class="padd-right status-small-label no-grow">
       <a class="momentum-plus plus-minus-button">+</a>
       <a class="momentum-minus plus-minus-button">&nbsp;-</a>
     </span>
-    <input type="text" class="padd-right status-small-label no-grow" name="data.momentum.max" value="{{data.momentum.max}}" data-dtype="Number"/>
+    <input type="text" class="padd-right status-small-label no-grow" name="system.momentum.max" value="{{data.momentum.max}}" data-dtype="Number"/>
     <span class="small-label status-small-label">&nbsp;</span>
   </li>
   <!--<li class="item flexrow list-item" data-key="lock-unlock">
@@ -72,5 +72,5 @@
 </ul>
 
 <!--    <span class="small-label padd-right packed-left">Act</span>
-      <input type="text" class="padd-right" name="data.nrg.activated" value="{{data.nrg.activated}}" data-dtype="Number"/>
+      <input type="text" class="padd-right" name="system.nrg.activated" value="{{data.nrg.activated}}" data-dtype="Number"/>
 -->
\ No newline at end of file
diff --git a/templates/partial-equipment-effects.html b/templates/partial-equipment-effects.html
index 1736d89..22d081d 100644
--- a/templates/partial-equipment-effects.html
+++ b/templates/partial-equipment-effects.html
@@ -6,7 +6,7 @@
     </li>
     {{#each data.effects as |effect idx|}}
     <li class="flexrow">
-      <label name="data.effects[{{idx}}].name"><a class="view-subitem" data-type="effects" data-index="{{idx}}">{{effect.name}}</a></label>
+      <label name="system.effects[{{idx}}].name"><a class="view-subitem" data-type="effects" data-index="{{idx}}">{{effect.name}}</a></label>
       <div class="item-controls padd-left">
         <a class="item-control delete-subitem padd-left" data-type="effects" data-index="{{idx}}" title="Delete Effect"><i class="fas fa-trash"></i></a>
       </div>   
diff --git a/templates/partial-item-description.html b/templates/partial-item-description.html
index a78040b..c97c210 100644
--- a/templates/partial-item-description.html
+++ b/templates/partial-item-description.html
@@ -2,7 +2,7 @@
   <div>
     <label class="generic-label">Description</label>
     <div class="medium-editor item-text-long-line">
-    {{editor content=data.description target="data.description" button=true owner=owner editable=editable}}
+    {{editor data.description target="system.description" button=true owner=owner editable=editable}}
     </div>
   </div>
 </div>