diff --git a/src/engine/powers/EffectsBase.java b/src/engine/powers/EffectsBase.java
index 87a3a857..13b91904 100644
--- a/src/engine/powers/EffectsBase.java
+++ b/src/engine/powers/EffectsBase.java
@@ -28,8 +28,8 @@ import engine.powers.effectmodifiers.*;
 import engine.server.MBServerStatics;
 import engine.util.Hasher;
 import engine.wpak.data.ConditionEntry;
-import engine.wpak.data.EffectEntry;
-import engine.wpak.data.EffectModifier;
+import engine.wpak.data.Effect;
+import engine.wpak.data.ModifierEntry;
 import org.pmw.tinylog.Logger;
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -87,7 +87,7 @@ public class EffectsBase {
      * EffectEntry Constructor
      */
 
-    public EffectsBase(EffectEntry entry) {
+    public EffectsBase(Effect entry) {
         this.IDString = entry.effect_id;
         this.name = entry.effect_name;
         this.token = Hasher.SBStringHash(entry.effect_name);
@@ -113,7 +113,7 @@ public class EffectsBase {
             this.isSuffix = true;
 
         //load effect modifiers
-        for (EffectModifier mod : entry.mods)
+        for (ModifierEntry mod : entry.mods)
             this.effectModifiers.add(getCombinedModifiers(null, mod, this, mod.type));
 
         //load sources
@@ -367,7 +367,7 @@ public class EffectsBase {
                 float duration = ab.getDurationInSeconds(trains);
                 if (pb.getToken() == 1672601862) {
 
-                    Effect eff = awo.getEffects().get("DeathShroud");
+                    engine.objects.Effect eff = awo.getEffects().get("DeathShroud");
 
 
                     if (eff != null) {
@@ -659,7 +659,7 @@ public class EffectsBase {
         this.name = name;
     }
 
-    public static AbstractEffectModifier getCombinedModifiers(AbstractEffectModifier abstractEffectModifier, EffectModifier rs, EffectsBase effectBase, mbEnums.ModType modifier){
+    public static AbstractEffectModifier getCombinedModifiers(AbstractEffectModifier abstractEffectModifier, ModifierEntry rs, EffectsBase effectBase, mbEnums.ModType modifier){
         switch (modifier) {
             case AdjustAboveDmgCap:
                 abstractEffectModifier = new AdjustAboveDmgCapEffectModifier(rs);
diff --git a/src/engine/powers/effectmodifiers/AbstractEffectModifier.java b/src/engine/powers/effectmodifiers/AbstractEffectModifier.java
index cac0175c..18cf392d 100644
--- a/src/engine/powers/effectmodifiers/AbstractEffectModifier.java
+++ b/src/engine/powers/effectmodifiers/AbstractEffectModifier.java
@@ -17,7 +17,7 @@ import engine.objects.AbstractWorldObject;
 import engine.objects.Building;
 import engine.objects.Item;
 import engine.powers.EffectsBase;
-import engine.wpak.data.EffectModifier;
+import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -40,25 +40,10 @@ public abstract class AbstractEffectModifier {
     protected String string1;
     protected String string2;
 
-    public AbstractEffectModifier(ResultSet rs) throws SQLException {
+    public AbstractEffectModifier(ResultSet rs){
 
-        this.UUID = rs.getInt("ID");
-        this.IDString = rs.getString("IDString");
-        this.effectType = rs.getString("modType");
-        this.modType = ModType.GetModType(this.effectType);
-        this.type = rs.getString("type").replace("\"", "");
-        this.sourceType = SourceType.GetSourceType(this.type.replace(" ", "").replace("-", ""));
-        this.minMod = rs.getFloat("minMod");
-        this.maxMod = rs.getFloat("maxMod");
-        this.percentMod = rs.getFloat("percentMod");
-        this.ramp = rs.getFloat("ramp");
-        this.useRampAdd = (rs.getInt("useRampAdd") == 1) ? true : false;
-
-        this.string1 = rs.getString("string1");
-        this.string2 = rs.getString("string2");
     }
-
-    public AbstractEffectModifier(EffectModifier mod) {
+    public AbstractEffectModifier(ModifierEntry mod) {
 
         this.IDString = mod.type.name();
         this.effectType = mod.type.name();
@@ -67,7 +52,7 @@ public abstract class AbstractEffectModifier {
         this.sourceType = SourceType.GetSourceType(this.type.replace(" ", "").replace("-", ""));
         this.minMod = mod.min;
         this.maxMod = mod.max;
-        this.percentMod = mod.scale;
+        this.percentMod = mod.value;
         this.ramp = (float)mod.compoundCurveType.getValue();
         this.useRampAdd = (float)mod.compoundCurveType.getValue() != 0;
 
diff --git a/src/engine/powers/effectmodifiers/AdjustAboveDmgCapEffectModifier.java b/src/engine/powers/effectmodifiers/AdjustAboveDmgCapEffectModifier.java
index 72c4e316..4520638d 100644
--- a/src/engine/powers/effectmodifiers/AdjustAboveDmgCapEffectModifier.java
+++ b/src/engine/powers/effectmodifiers/AdjustAboveDmgCapEffectModifier.java
@@ -11,7 +11,7 @@ package engine.powers.effectmodifiers;
 
 import engine.jobs.AbstractEffectJob;
 import engine.objects.*;
-import engine.wpak.data.EffectModifier;
+import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -19,11 +19,7 @@ import java.sql.SQLException;
 
 public class AdjustAboveDmgCapEffectModifier extends AbstractEffectModifier {
 
-    public AdjustAboveDmgCapEffectModifier(ResultSet rs) throws SQLException {
-        super(rs);
-    }
-
-    public AdjustAboveDmgCapEffectModifier(EffectModifier rs){
+    public AdjustAboveDmgCapEffectModifier(ModifierEntry rs){
         super(rs);
     }
 
diff --git a/src/engine/powers/effectmodifiers/AmbidexterityEffectModifier.java b/src/engine/powers/effectmodifiers/AmbidexterityEffectModifier.java
index 9a107657..a2dad0eb 100644
--- a/src/engine/powers/effectmodifiers/AmbidexterityEffectModifier.java
+++ b/src/engine/powers/effectmodifiers/AmbidexterityEffectModifier.java
@@ -13,7 +13,7 @@ import engine.jobs.AbstractEffectJob;
 import engine.mbEnums.ModType;
 import engine.mbEnums.SourceType;
 import engine.objects.*;
-import engine.wpak.data.EffectModifier;
+import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -21,10 +21,7 @@ import java.sql.SQLException;
 
 public class AmbidexterityEffectModifier extends AbstractEffectModifier {
 
-    public AmbidexterityEffectModifier(ResultSet rs) throws SQLException {
-        super(rs);
-    }
-    public AmbidexterityEffectModifier(EffectModifier rs) {
+    public AmbidexterityEffectModifier(ModifierEntry rs) {
         super(rs);
     }
 
diff --git a/src/engine/powers/effectmodifiers/ArmorPiercingEffectModifier.java b/src/engine/powers/effectmodifiers/ArmorPiercingEffectModifier.java
index afe7dd5e..6b739a36 100644
--- a/src/engine/powers/effectmodifiers/ArmorPiercingEffectModifier.java
+++ b/src/engine/powers/effectmodifiers/ArmorPiercingEffectModifier.java
@@ -11,7 +11,7 @@ package engine.powers.effectmodifiers;
 
 import engine.jobs.AbstractEffectJob;
 import engine.objects.*;
-import engine.wpak.data.EffectModifier;
+import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -19,11 +19,7 @@ import java.sql.SQLException;
 
 public class ArmorPiercingEffectModifier extends AbstractEffectModifier {
 
-    public ArmorPiercingEffectModifier(ResultSet rs) throws SQLException {
-        super(rs);
-    }
-
-    public ArmorPiercingEffectModifier(EffectModifier rs){
+    public ArmorPiercingEffectModifier(ModifierEntry rs){
         super(rs);
     }
 
diff --git a/src/engine/powers/effectmodifiers/AttackDelayEffectModifier.java b/src/engine/powers/effectmodifiers/AttackDelayEffectModifier.java
index ab657de1..d7a7749a 100644
--- a/src/engine/powers/effectmodifiers/AttackDelayEffectModifier.java
+++ b/src/engine/powers/effectmodifiers/AttackDelayEffectModifier.java
@@ -11,7 +11,7 @@ package engine.powers.effectmodifiers;
 
 import engine.jobs.AbstractEffectJob;
 import engine.objects.*;
-import engine.wpak.data.EffectModifier;
+import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -22,7 +22,7 @@ public class AttackDelayEffectModifier extends AbstractEffectModifier {
     public AttackDelayEffectModifier(ResultSet rs) throws SQLException {
         super(rs);
     }
-    public AttackDelayEffectModifier(EffectModifier rs){
+    public AttackDelayEffectModifier(ModifierEntry rs){
         super(rs);
     }
 
diff --git a/src/engine/powers/effectmodifiers/AttributeEffectModifier.java b/src/engine/powers/effectmodifiers/AttributeEffectModifier.java
index 39782d6d..55e616c3 100644
--- a/src/engine/powers/effectmodifiers/AttributeEffectModifier.java
+++ b/src/engine/powers/effectmodifiers/AttributeEffectModifier.java
@@ -11,7 +11,7 @@ package engine.powers.effectmodifiers;
 
 import engine.jobs.AbstractEffectJob;
 import engine.objects.*;
-import engine.wpak.data.EffectModifier;
+import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -23,7 +23,7 @@ public class AttributeEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
-    public AttributeEffectModifier(EffectModifier rs) {
+    public AttributeEffectModifier(ModifierEntry rs) {
         super(rs);
     }
 
diff --git a/src/engine/powers/effectmodifiers/BlackMantleEffectModifier.java b/src/engine/powers/effectmodifiers/BlackMantleEffectModifier.java
index 75dcc308..ba1c9c5c 100644
--- a/src/engine/powers/effectmodifiers/BlackMantleEffectModifier.java
+++ b/src/engine/powers/effectmodifiers/BlackMantleEffectModifier.java
@@ -13,7 +13,8 @@ import engine.jobs.AbstractEffectJob;
 import engine.mbEnums.ModType;
 import engine.mbEnums.SourceType;
 import engine.objects.*;
-import engine.wpak.data.EffectModifier;
+import engine.wpak.data.ModifierEntry;
+import engine.wpak.data.ModifierEntry;
 import org.pmw.tinylog.Logger;
 
 import java.sql.ResultSet;
@@ -26,7 +27,7 @@ public class BlackMantleEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
-    public BlackMantleEffectModifier(EffectModifier rs) {
+    public BlackMantleEffectModifier(ModifierEntry rs) {
         super(rs);
     }
 
diff --git a/src/engine/powers/effectmodifiers/BladeTrailsEffectModifier.java b/src/engine/powers/effectmodifiers/BladeTrailsEffectModifier.java
index 8b678323..e40a388d 100644
--- a/src/engine/powers/effectmodifiers/BladeTrailsEffectModifier.java
+++ b/src/engine/powers/effectmodifiers/BladeTrailsEffectModifier.java
@@ -14,7 +14,7 @@ import engine.objects.AbstractCharacter;
 import engine.objects.AbstractWorldObject;
 import engine.objects.Building;
 import engine.objects.Item;
-import engine.wpak.data.EffectModifier;
+import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -25,7 +25,7 @@ public class BladeTrailsEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
-    public BladeTrailsEffectModifier(EffectModifier rs) {
+    public BladeTrailsEffectModifier(ModifierEntry rs) {
         super(rs);
     }
 
diff --git a/src/engine/powers/effectmodifiers/BlockEffectModifier.java b/src/engine/powers/effectmodifiers/BlockEffectModifier.java
index 5fc120ce..d07d4218 100644
--- a/src/engine/powers/effectmodifiers/BlockEffectModifier.java
+++ b/src/engine/powers/effectmodifiers/BlockEffectModifier.java
@@ -11,7 +11,7 @@ package engine.powers.effectmodifiers;
 
 import engine.jobs.AbstractEffectJob;
 import engine.objects.*;
-import engine.wpak.data.EffectModifier;
+import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -23,7 +23,7 @@ public class BlockEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
-    public BlockEffectModifier(EffectModifier rs) {
+    public BlockEffectModifier(ModifierEntry rs) {
         super(rs);
     }
 
diff --git a/src/engine/powers/effectmodifiers/BlockedPowerTypeEffectModifier.java b/src/engine/powers/effectmodifiers/BlockedPowerTypeEffectModifier.java
index bf792125..5b9be4ba 100644
--- a/src/engine/powers/effectmodifiers/BlockedPowerTypeEffectModifier.java
+++ b/src/engine/powers/effectmodifiers/BlockedPowerTypeEffectModifier.java
@@ -12,7 +12,7 @@ package engine.powers.effectmodifiers;
 import engine.jobs.AbstractEffectJob;
 import engine.mbEnums.ModType;
 import engine.objects.*;
-import engine.wpak.data.EffectModifier;
+import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -25,7 +25,7 @@ public class BlockedPowerTypeEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
-    public BlockedPowerTypeEffectModifier(EffectModifier rs) {
+    public BlockedPowerTypeEffectModifier(ModifierEntry rs) {
         super(rs);
     }
 
diff --git a/src/engine/powers/effectmodifiers/CannotAttackEffectModifier.java b/src/engine/powers/effectmodifiers/CannotAttackEffectModifier.java
index bba4c0cf..ca94ac4a 100644
--- a/src/engine/powers/effectmodifiers/CannotAttackEffectModifier.java
+++ b/src/engine/powers/effectmodifiers/CannotAttackEffectModifier.java
@@ -11,7 +11,7 @@ package engine.powers.effectmodifiers;
 
 import engine.jobs.AbstractEffectJob;
 import engine.objects.*;
-import engine.wpak.data.EffectModifier;
+import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -23,7 +23,7 @@ public class CannotAttackEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
-    public CannotAttackEffectModifier(EffectModifier rs) {
+    public CannotAttackEffectModifier(ModifierEntry rs) {
         super(rs);
     }
 
diff --git a/src/engine/powers/effectmodifiers/CannotCastEffectModifier.java b/src/engine/powers/effectmodifiers/CannotCastEffectModifier.java
index f257d155..3cfbcf73 100644
--- a/src/engine/powers/effectmodifiers/CannotCastEffectModifier.java
+++ b/src/engine/powers/effectmodifiers/CannotCastEffectModifier.java
@@ -12,7 +12,7 @@ package engine.powers.effectmodifiers;
 import engine.jobs.AbstractEffectJob;
 import engine.mbEnums;
 import engine.objects.*;
-import engine.wpak.data.EffectModifier;
+import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -24,7 +24,7 @@ public class CannotCastEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
-    public CannotCastEffectModifier(EffectModifier rs) {
+    public CannotCastEffectModifier(ModifierEntry rs) {
         super(rs);
     }
 
diff --git a/src/engine/powers/effectmodifiers/CannotMoveEffectModifier.java b/src/engine/powers/effectmodifiers/CannotMoveEffectModifier.java
index 9d819464..42c0355b 100644
--- a/src/engine/powers/effectmodifiers/CannotMoveEffectModifier.java
+++ b/src/engine/powers/effectmodifiers/CannotMoveEffectModifier.java
@@ -11,7 +11,7 @@ package engine.powers.effectmodifiers;
 
 import engine.jobs.AbstractEffectJob;
 import engine.objects.*;
-import engine.wpak.data.EffectModifier;
+import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -23,7 +23,7 @@ public class CannotMoveEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
-    public CannotMoveEffectModifier(EffectModifier rs) {
+    public CannotMoveEffectModifier(ModifierEntry rs) {
         super(rs);
     }
 
diff --git a/src/engine/powers/effectmodifiers/CannotTrackEffectModifier.java b/src/engine/powers/effectmodifiers/CannotTrackEffectModifier.java
index 40f604d3..da701901 100644
--- a/src/engine/powers/effectmodifiers/CannotTrackEffectModifier.java
+++ b/src/engine/powers/effectmodifiers/CannotTrackEffectModifier.java
@@ -11,7 +11,7 @@ package engine.powers.effectmodifiers;
 
 import engine.jobs.AbstractEffectJob;
 import engine.objects.*;
-import engine.wpak.data.EffectModifier;
+import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -23,7 +23,7 @@ public class CannotTrackEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
-    public CannotTrackEffectModifier(EffectModifier rs) {
+    public CannotTrackEffectModifier(ModifierEntry rs) {
         super(rs);
     }
 
diff --git a/src/engine/powers/effectmodifiers/CharmedEffectModifier.java b/src/engine/powers/effectmodifiers/CharmedEffectModifier.java
index 4f05b967..6c5ac396 100644
--- a/src/engine/powers/effectmodifiers/CharmedEffectModifier.java
+++ b/src/engine/powers/effectmodifiers/CharmedEffectModifier.java
@@ -14,7 +14,7 @@ import engine.objects.AbstractCharacter;
 import engine.objects.AbstractWorldObject;
 import engine.objects.Building;
 import engine.objects.Item;
-import engine.wpak.data.EffectModifier;
+import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -25,7 +25,7 @@ public class CharmedEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
-    public CharmedEffectModifier(EffectModifier rs) {
+    public CharmedEffectModifier(ModifierEntry rs) {
         super(rs);
     }
 
diff --git a/src/engine/powers/effectmodifiers/ConstrainedAmbidexterityEffectModifier.java b/src/engine/powers/effectmodifiers/ConstrainedAmbidexterityEffectModifier.java
index 621294e3..c1b3864c 100644
--- a/src/engine/powers/effectmodifiers/ConstrainedAmbidexterityEffectModifier.java
+++ b/src/engine/powers/effectmodifiers/ConstrainedAmbidexterityEffectModifier.java
@@ -11,7 +11,7 @@ package engine.powers.effectmodifiers;
 
 import engine.jobs.AbstractEffectJob;
 import engine.objects.*;
-import engine.wpak.data.EffectModifier;
+import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -23,7 +23,7 @@ public class ConstrainedAmbidexterityEffectModifier extends AbstractEffectModifi
         super(rs);
     }
 
-    public ConstrainedAmbidexterityEffectModifier(EffectModifier rs) {
+    public ConstrainedAmbidexterityEffectModifier(ModifierEntry rs) {
         super(rs);
     }
 
diff --git a/src/engine/powers/effectmodifiers/DCVEffectModifier.java b/src/engine/powers/effectmodifiers/DCVEffectModifier.java
index f8d38253..58aecaf9 100644
--- a/src/engine/powers/effectmodifiers/DCVEffectModifier.java
+++ b/src/engine/powers/effectmodifiers/DCVEffectModifier.java
@@ -11,7 +11,7 @@ package engine.powers.effectmodifiers;
 
 import engine.jobs.AbstractEffectJob;
 import engine.objects.*;
-import engine.wpak.data.EffectModifier;
+import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -23,7 +23,7 @@ public class DCVEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
-    public DCVEffectModifier(EffectModifier rs) {
+    public DCVEffectModifier(ModifierEntry rs) {
         super(rs);
     }
 
diff --git a/src/engine/powers/effectmodifiers/DREffectModifier.java b/src/engine/powers/effectmodifiers/DREffectModifier.java
index d79a9463..4a094159 100644
--- a/src/engine/powers/effectmodifiers/DREffectModifier.java
+++ b/src/engine/powers/effectmodifiers/DREffectModifier.java
@@ -14,7 +14,7 @@ import engine.objects.AbstractCharacter;
 import engine.objects.AbstractWorldObject;
 import engine.objects.Building;
 import engine.objects.Item;
-import engine.wpak.data.EffectModifier;
+import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -25,7 +25,7 @@ public class DREffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
-    public DREffectModifier(EffectModifier rs) {
+    public DREffectModifier(ModifierEntry rs) {
         super(rs);
     }
 
diff --git a/src/engine/powers/effectmodifiers/DamageCapEffectModifier.java b/src/engine/powers/effectmodifiers/DamageCapEffectModifier.java
index cc912f9b..073e7849 100644
--- a/src/engine/powers/effectmodifiers/DamageCapEffectModifier.java
+++ b/src/engine/powers/effectmodifiers/DamageCapEffectModifier.java
@@ -11,7 +11,7 @@ package engine.powers.effectmodifiers;
 
 import engine.jobs.AbstractEffectJob;
 import engine.objects.*;
-import engine.wpak.data.EffectModifier;
+import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -23,7 +23,7 @@ public class DamageCapEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
-    public DamageCapEffectModifier(EffectModifier rs) {
+    public DamageCapEffectModifier(ModifierEntry rs) {
         super(rs);
     }
 
diff --git a/src/engine/powers/effectmodifiers/DamageShieldEffectModifier.java b/src/engine/powers/effectmodifiers/DamageShieldEffectModifier.java
index e9640a55..9931e95e 100644
--- a/src/engine/powers/effectmodifiers/DamageShieldEffectModifier.java
+++ b/src/engine/powers/effectmodifiers/DamageShieldEffectModifier.java
@@ -13,7 +13,7 @@ import engine.jobs.AbstractEffectJob;
 import engine.mbEnums;
 import engine.objects.*;
 import engine.powers.DamageShield;
-import engine.wpak.data.EffectModifier;
+import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -25,7 +25,7 @@ public class DamageShieldEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
-    public DamageShieldEffectModifier(EffectModifier rs) {
+    public DamageShieldEffectModifier(ModifierEntry rs) {
         super(rs);
     }
 
diff --git a/src/engine/powers/effectmodifiers/DodgeEffectModifier.java b/src/engine/powers/effectmodifiers/DodgeEffectModifier.java
index a4308f39..ff863b63 100644
--- a/src/engine/powers/effectmodifiers/DodgeEffectModifier.java
+++ b/src/engine/powers/effectmodifiers/DodgeEffectModifier.java
@@ -11,7 +11,7 @@ package engine.powers.effectmodifiers;
 
 import engine.jobs.AbstractEffectJob;
 import engine.objects.*;
-import engine.wpak.data.EffectModifier;
+import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -23,7 +23,7 @@ public class DodgeEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
-    public DodgeEffectModifier(EffectModifier rs) {
+    public DodgeEffectModifier(ModifierEntry rs) {
         super(rs);
     }
 
diff --git a/src/engine/powers/effectmodifiers/DurabilityEffectModifier.java b/src/engine/powers/effectmodifiers/DurabilityEffectModifier.java
index 28b7cb82..685d136a 100644
--- a/src/engine/powers/effectmodifiers/DurabilityEffectModifier.java
+++ b/src/engine/powers/effectmodifiers/DurabilityEffectModifier.java
@@ -14,7 +14,7 @@ import engine.objects.AbstractCharacter;
 import engine.objects.AbstractWorldObject;
 import engine.objects.Building;
 import engine.objects.Item;
-import engine.wpak.data.EffectModifier;
+import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -25,7 +25,7 @@ public class DurabilityEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
-    public DurabilityEffectModifier(EffectModifier rs) {
+    public DurabilityEffectModifier(ModifierEntry rs) {
         super(rs);
     }
 
diff --git a/src/engine/powers/effectmodifiers/ExclusiveDamageCapEffectModifier.java b/src/engine/powers/effectmodifiers/ExclusiveDamageCapEffectModifier.java
index 009221f7..2d1d9f83 100644
--- a/src/engine/powers/effectmodifiers/ExclusiveDamageCapEffectModifier.java
+++ b/src/engine/powers/effectmodifiers/ExclusiveDamageCapEffectModifier.java
@@ -11,7 +11,7 @@ package engine.powers.effectmodifiers;
 
 import engine.jobs.AbstractEffectJob;
 import engine.objects.*;
-import engine.wpak.data.EffectModifier;
+import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -23,7 +23,7 @@ public class ExclusiveDamageCapEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
-    public ExclusiveDamageCapEffectModifier(EffectModifier rs) {
+    public ExclusiveDamageCapEffectModifier(ModifierEntry rs) {
         super(rs);
     }
 
diff --git a/src/engine/powers/effectmodifiers/FadeEffectModifier.java b/src/engine/powers/effectmodifiers/FadeEffectModifier.java
index 1af0a9cd..1d394a9d 100644
--- a/src/engine/powers/effectmodifiers/FadeEffectModifier.java
+++ b/src/engine/powers/effectmodifiers/FadeEffectModifier.java
@@ -14,7 +14,7 @@ import engine.objects.AbstractCharacter;
 import engine.objects.AbstractWorldObject;
 import engine.objects.Building;
 import engine.objects.Item;
-import engine.wpak.data.EffectModifier;
+import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -25,7 +25,7 @@ public class FadeEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
-    public FadeEffectModifier(EffectModifier rs) {
+    public FadeEffectModifier(ModifierEntry rs) {
         super(rs);
     }
 
diff --git a/src/engine/powers/effectmodifiers/FlyEffectModifier.java b/src/engine/powers/effectmodifiers/FlyEffectModifier.java
index 651b73a6..9048dc02 100644
--- a/src/engine/powers/effectmodifiers/FlyEffectModifier.java
+++ b/src/engine/powers/effectmodifiers/FlyEffectModifier.java
@@ -11,7 +11,7 @@ package engine.powers.effectmodifiers;
 
 import engine.jobs.AbstractEffectJob;
 import engine.objects.*;
-import engine.wpak.data.EffectModifier;
+import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -22,7 +22,7 @@ public class FlyEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
-    public FlyEffectModifier(EffectModifier rs) {
+    public FlyEffectModifier(ModifierEntry rs) {
         super(rs);
     }
 
diff --git a/src/engine/powers/effectmodifiers/HealthEffectModifier.java b/src/engine/powers/effectmodifiers/HealthEffectModifier.java
index 7232be25..32b5e1d6 100644
--- a/src/engine/powers/effectmodifiers/HealthEffectModifier.java
+++ b/src/engine/powers/effectmodifiers/HealthEffectModifier.java
@@ -20,7 +20,7 @@ import engine.net.AbstractNetMsg;
 import engine.net.client.msg.ModifyHealthKillMsg;
 import engine.net.client.msg.ModifyHealthMsg;
 import engine.objects.*;
-import engine.wpak.data.EffectModifier;
+import engine.wpak.data.ModifierEntry;
 import org.pmw.tinylog.Logger;
 
 import java.sql.ResultSet;
@@ -42,7 +42,7 @@ public class HealthEffectModifier extends AbstractEffectModifier {
         }
     }
 
-    public HealthEffectModifier(EffectModifier rs) {
+    public HealthEffectModifier(ModifierEntry rs) {
         super(rs);
     }
 
diff --git a/src/engine/powers/effectmodifiers/HealthFullEffectModifier.java b/src/engine/powers/effectmodifiers/HealthFullEffectModifier.java
index 43dc595e..bcda8cb1 100644
--- a/src/engine/powers/effectmodifiers/HealthFullEffectModifier.java
+++ b/src/engine/powers/effectmodifiers/HealthFullEffectModifier.java
@@ -11,7 +11,7 @@ package engine.powers.effectmodifiers;
 
 import engine.jobs.AbstractEffectJob;
 import engine.objects.*;
-import engine.wpak.data.EffectModifier;
+import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -22,7 +22,7 @@ public class HealthFullEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
-    public HealthFullEffectModifier(EffectModifier rs) {
+    public HealthFullEffectModifier(ModifierEntry rs) {
         super(rs);
     }
 
diff --git a/src/engine/powers/effectmodifiers/HealthRecoverRateEffectModifier.java b/src/engine/powers/effectmodifiers/HealthRecoverRateEffectModifier.java
index df6df373..c4326f64 100644
--- a/src/engine/powers/effectmodifiers/HealthRecoverRateEffectModifier.java
+++ b/src/engine/powers/effectmodifiers/HealthRecoverRateEffectModifier.java
@@ -11,7 +11,7 @@ package engine.powers.effectmodifiers;
 
 import engine.jobs.AbstractEffectJob;
 import engine.objects.*;
-import engine.wpak.data.EffectModifier;
+import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -22,7 +22,7 @@ public class HealthRecoverRateEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
-    public HealthRecoverRateEffectModifier(EffectModifier rs) {
+    public HealthRecoverRateEffectModifier(ModifierEntry rs) {
         super(rs);
     }
 
diff --git a/src/engine/powers/effectmodifiers/IgnoreDamageCapEffectModifier.java b/src/engine/powers/effectmodifiers/IgnoreDamageCapEffectModifier.java
index 129e9de2..e860d114 100644
--- a/src/engine/powers/effectmodifiers/IgnoreDamageCapEffectModifier.java
+++ b/src/engine/powers/effectmodifiers/IgnoreDamageCapEffectModifier.java
@@ -11,7 +11,7 @@ package engine.powers.effectmodifiers;
 
 import engine.jobs.AbstractEffectJob;
 import engine.objects.*;
-import engine.wpak.data.EffectModifier;
+import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -23,7 +23,7 @@ public class IgnoreDamageCapEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
-    public IgnoreDamageCapEffectModifier(EffectModifier rs) {
+    public IgnoreDamageCapEffectModifier(ModifierEntry rs) {
         super(rs);
     }
 
diff --git a/src/engine/powers/effectmodifiers/IgnorePassiveDefenseEffectModifier.java b/src/engine/powers/effectmodifiers/IgnorePassiveDefenseEffectModifier.java
index 44912699..661ea243 100644
--- a/src/engine/powers/effectmodifiers/IgnorePassiveDefenseEffectModifier.java
+++ b/src/engine/powers/effectmodifiers/IgnorePassiveDefenseEffectModifier.java
@@ -11,7 +11,7 @@ package engine.powers.effectmodifiers;
 
 import engine.jobs.AbstractEffectJob;
 import engine.objects.*;
-import engine.wpak.data.EffectModifier;
+import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -22,7 +22,7 @@ public class IgnorePassiveDefenseEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
-    public IgnorePassiveDefenseEffectModifier(EffectModifier rs) {
+    public IgnorePassiveDefenseEffectModifier(ModifierEntry rs) {
         super(rs);
     }
 
diff --git a/src/engine/powers/effectmodifiers/ImmuneToAttackEffectModifier.java b/src/engine/powers/effectmodifiers/ImmuneToAttackEffectModifier.java
index be454471..512b73c0 100644
--- a/src/engine/powers/effectmodifiers/ImmuneToAttackEffectModifier.java
+++ b/src/engine/powers/effectmodifiers/ImmuneToAttackEffectModifier.java
@@ -11,7 +11,7 @@ package engine.powers.effectmodifiers;
 
 import engine.jobs.AbstractEffectJob;
 import engine.objects.*;
-import engine.wpak.data.EffectModifier;
+import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -22,7 +22,7 @@ public class ImmuneToAttackEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
-    public ImmuneToAttackEffectModifier(EffectModifier rs) {
+    public ImmuneToAttackEffectModifier(ModifierEntry rs) {
         super(rs);
     }
 
diff --git a/src/engine/powers/effectmodifiers/ImmuneToEffectModifier.java b/src/engine/powers/effectmodifiers/ImmuneToEffectModifier.java
index 9b930e9d..5a727cdd 100644
--- a/src/engine/powers/effectmodifiers/ImmuneToEffectModifier.java
+++ b/src/engine/powers/effectmodifiers/ImmuneToEffectModifier.java
@@ -11,7 +11,7 @@ package engine.powers.effectmodifiers;
 
 import engine.jobs.AbstractEffectJob;
 import engine.objects.*;
-import engine.wpak.data.EffectModifier;
+import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -22,7 +22,7 @@ public class ImmuneToEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
-    public ImmuneToEffectModifier(EffectModifier rs) {
+    public ImmuneToEffectModifier(ModifierEntry rs) {
         super(rs);
     }
 
diff --git a/src/engine/powers/effectmodifiers/ImmuneToPowersEffectModifier.java b/src/engine/powers/effectmodifiers/ImmuneToPowersEffectModifier.java
index 381274ae..d868a66a 100644
--- a/src/engine/powers/effectmodifiers/ImmuneToPowersEffectModifier.java
+++ b/src/engine/powers/effectmodifiers/ImmuneToPowersEffectModifier.java
@@ -11,7 +11,7 @@ package engine.powers.effectmodifiers;
 
 import engine.jobs.AbstractEffectJob;
 import engine.objects.*;
-import engine.wpak.data.EffectModifier;
+import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -22,7 +22,7 @@ public class ImmuneToPowersEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
-    public ImmuneToPowersEffectModifier(EffectModifier rs) {
+    public ImmuneToPowersEffectModifier(ModifierEntry rs) {
         super(rs);
     }
 
diff --git a/src/engine/powers/effectmodifiers/InvisibleEffectModifier.java b/src/engine/powers/effectmodifiers/InvisibleEffectModifier.java
index 8666c38c..990e1c35 100644
--- a/src/engine/powers/effectmodifiers/InvisibleEffectModifier.java
+++ b/src/engine/powers/effectmodifiers/InvisibleEffectModifier.java
@@ -16,7 +16,7 @@ import engine.net.client.ClientConnection;
 import engine.objects.*;
 import engine.powers.ActionsBase;
 import engine.powers.PowersBase;
-import engine.wpak.data.EffectModifier;
+import engine.wpak.data.ModifierEntry;
 import org.pmw.tinylog.Logger;
 
 import java.sql.ResultSet;
@@ -28,7 +28,7 @@ public class InvisibleEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
-    public InvisibleEffectModifier(EffectModifier rs) {
+    public InvisibleEffectModifier(ModifierEntry rs) {
         super(rs);
     }
 
diff --git a/src/engine/powers/effectmodifiers/ItemNameEffectModifier.java b/src/engine/powers/effectmodifiers/ItemNameEffectModifier.java
index c4f39a8b..129ce4ae 100644
--- a/src/engine/powers/effectmodifiers/ItemNameEffectModifier.java
+++ b/src/engine/powers/effectmodifiers/ItemNameEffectModifier.java
@@ -15,7 +15,7 @@ import engine.objects.AbstractWorldObject;
 import engine.objects.Building;
 import engine.objects.Item;
 import engine.powers.EffectsBase;
-import engine.wpak.data.EffectModifier;
+import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -123,7 +123,7 @@ public class ItemNameEffectModifier extends AbstractEffectModifier {
         EffectsBase.addItemEffectsByName(n, IDString);
     }
 
-    public ItemNameEffectModifier(EffectModifier rs) {
+    public ItemNameEffectModifier(ModifierEntry rs) {
         super(rs);
     }
 
diff --git a/src/engine/powers/effectmodifiers/ManaEffectModifier.java b/src/engine/powers/effectmodifiers/ManaEffectModifier.java
index ba73c920..8f338de8 100644
--- a/src/engine/powers/effectmodifiers/ManaEffectModifier.java
+++ b/src/engine/powers/effectmodifiers/ManaEffectModifier.java
@@ -21,7 +21,7 @@ import engine.powers.ActionsBase;
 import engine.powers.poweractions.AbstractPowerAction;
 import engine.powers.poweractions.DamageOverTimePowerAction;
 import engine.powers.poweractions.DirectDamagePowerAction;
-import engine.wpak.data.EffectModifier;
+import engine.wpak.data.ModifierEntry;
 import org.pmw.tinylog.Logger;
 
 import java.sql.ResultSet;
@@ -44,7 +44,7 @@ public class ManaEffectModifier extends AbstractEffectModifier {
         }
     }
 
-    public ManaEffectModifier(EffectModifier rs) {
+    public ManaEffectModifier(ModifierEntry rs) {
         super(rs);
     }
 
diff --git a/src/engine/powers/effectmodifiers/ManaFullEffectModifier.java b/src/engine/powers/effectmodifiers/ManaFullEffectModifier.java
index 5aa5e39e..035024c6 100644
--- a/src/engine/powers/effectmodifiers/ManaFullEffectModifier.java
+++ b/src/engine/powers/effectmodifiers/ManaFullEffectModifier.java
@@ -11,7 +11,7 @@ package engine.powers.effectmodifiers;
 
 import engine.jobs.AbstractEffectJob;
 import engine.objects.*;
-import engine.wpak.data.EffectModifier;
+import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -22,7 +22,7 @@ public class ManaFullEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
-    public ManaFullEffectModifier(EffectModifier rs) {
+    public ManaFullEffectModifier(ModifierEntry rs) {
         super(rs);
     }
 
diff --git a/src/engine/powers/effectmodifiers/ManaRecoverRateEffectModifier.java b/src/engine/powers/effectmodifiers/ManaRecoverRateEffectModifier.java
index cd43f5e9..3c42d0d6 100644
--- a/src/engine/powers/effectmodifiers/ManaRecoverRateEffectModifier.java
+++ b/src/engine/powers/effectmodifiers/ManaRecoverRateEffectModifier.java
@@ -11,7 +11,7 @@ package engine.powers.effectmodifiers;
 
 import engine.jobs.AbstractEffectJob;
 import engine.objects.*;
-import engine.wpak.data.EffectModifier;
+import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -22,7 +22,7 @@ public class ManaRecoverRateEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
-    public ManaRecoverRateEffectModifier(EffectModifier rs) {
+    public ManaRecoverRateEffectModifier(ModifierEntry rs) {
         super(rs);
     }
 
diff --git a/src/engine/powers/effectmodifiers/MaxDamageEffectModifier.java b/src/engine/powers/effectmodifiers/MaxDamageEffectModifier.java
index 92a34848..8f7b8ce0 100644
--- a/src/engine/powers/effectmodifiers/MaxDamageEffectModifier.java
+++ b/src/engine/powers/effectmodifiers/MaxDamageEffectModifier.java
@@ -14,7 +14,7 @@ import engine.objects.AbstractCharacter;
 import engine.objects.AbstractWorldObject;
 import engine.objects.Building;
 import engine.objects.Item;
-import engine.wpak.data.EffectModifier;
+import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -25,7 +25,7 @@ public class MaxDamageEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
-    public MaxDamageEffectModifier(EffectModifier rs) {
+    public MaxDamageEffectModifier(ModifierEntry rs) {
         super(rs);
     }
 
diff --git a/src/engine/powers/effectmodifiers/MeleeDamageEffectModifier.java b/src/engine/powers/effectmodifiers/MeleeDamageEffectModifier.java
index 801e8987..097a8ca2 100644
--- a/src/engine/powers/effectmodifiers/MeleeDamageEffectModifier.java
+++ b/src/engine/powers/effectmodifiers/MeleeDamageEffectModifier.java
@@ -11,7 +11,7 @@ package engine.powers.effectmodifiers;
 
 import engine.jobs.AbstractEffectJob;
 import engine.objects.*;
-import engine.wpak.data.EffectModifier;
+import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -22,7 +22,7 @@ public class MeleeDamageEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
-    public MeleeDamageEffectModifier(EffectModifier rs) {
+    public MeleeDamageEffectModifier(ModifierEntry rs) {
         super(rs);
     }
 
diff --git a/src/engine/powers/effectmodifiers/MinDamageEffectModifier.java b/src/engine/powers/effectmodifiers/MinDamageEffectModifier.java
index 6d1d6fc4..a037e216 100644
--- a/src/engine/powers/effectmodifiers/MinDamageEffectModifier.java
+++ b/src/engine/powers/effectmodifiers/MinDamageEffectModifier.java
@@ -14,7 +14,7 @@ import engine.objects.AbstractCharacter;
 import engine.objects.AbstractWorldObject;
 import engine.objects.Building;
 import engine.objects.Item;
-import engine.wpak.data.EffectModifier;
+import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -25,7 +25,7 @@ public class MinDamageEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
-    public MinDamageEffectModifier(EffectModifier rs) {
+    public MinDamageEffectModifier(ModifierEntry rs) {
         super(rs);
     }
 
diff --git a/src/engine/powers/effectmodifiers/NoModEffectModifier.java b/src/engine/powers/effectmodifiers/NoModEffectModifier.java
index 0b31fa62..81d0ba5f 100644
--- a/src/engine/powers/effectmodifiers/NoModEffectModifier.java
+++ b/src/engine/powers/effectmodifiers/NoModEffectModifier.java
@@ -12,7 +12,7 @@ package engine.powers.effectmodifiers;
 import engine.jobs.AbstractEffectJob;
 import engine.mbEnums.GameObjectType;
 import engine.objects.*;
-import engine.wpak.data.EffectModifier;
+import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -23,7 +23,7 @@ public class NoModEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
-    public NoModEffectModifier(EffectModifier rs) {
+    public NoModEffectModifier(ModifierEntry rs) {
         super(rs);
     }
 
diff --git a/src/engine/powers/effectmodifiers/OCVEffectModifier.java b/src/engine/powers/effectmodifiers/OCVEffectModifier.java
index 5a00b584..1a3023fc 100644
--- a/src/engine/powers/effectmodifiers/OCVEffectModifier.java
+++ b/src/engine/powers/effectmodifiers/OCVEffectModifier.java
@@ -11,7 +11,7 @@ package engine.powers.effectmodifiers;
 
 import engine.jobs.AbstractEffectJob;
 import engine.objects.*;
-import engine.wpak.data.EffectModifier;
+import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -22,7 +22,7 @@ public class OCVEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
-    public OCVEffectModifier(EffectModifier rs) {
+    public OCVEffectModifier(ModifierEntry rs) {
         super(rs);
     }
 
diff --git a/src/engine/powers/effectmodifiers/ParryEffectModifier.java b/src/engine/powers/effectmodifiers/ParryEffectModifier.java
index 71835664..3be046d0 100644
--- a/src/engine/powers/effectmodifiers/ParryEffectModifier.java
+++ b/src/engine/powers/effectmodifiers/ParryEffectModifier.java
@@ -11,7 +11,7 @@ package engine.powers.effectmodifiers;
 
 import engine.jobs.AbstractEffectJob;
 import engine.objects.*;
-import engine.wpak.data.EffectModifier;
+import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -22,7 +22,7 @@ public class ParryEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
-    public ParryEffectModifier(EffectModifier rs) {
+    public ParryEffectModifier(ModifierEntry rs) {
         super(rs);
     }
 
diff --git a/src/engine/powers/effectmodifiers/PassiveDefenseEffectModifier.java b/src/engine/powers/effectmodifiers/PassiveDefenseEffectModifier.java
index 84f825f4..8f5f8466 100644
--- a/src/engine/powers/effectmodifiers/PassiveDefenseEffectModifier.java
+++ b/src/engine/powers/effectmodifiers/PassiveDefenseEffectModifier.java
@@ -11,7 +11,7 @@ package engine.powers.effectmodifiers;
 
 import engine.jobs.AbstractEffectJob;
 import engine.objects.*;
-import engine.wpak.data.EffectModifier;
+import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -22,7 +22,7 @@ public class PassiveDefenseEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
-    public PassiveDefenseEffectModifier(EffectModifier rs) {
+    public PassiveDefenseEffectModifier(ModifierEntry rs) {
         super(rs);
     }
 
diff --git a/src/engine/powers/effectmodifiers/PowerCostEffectModifier.java b/src/engine/powers/effectmodifiers/PowerCostEffectModifier.java
index 4a5c95b8..4ac50549 100644
--- a/src/engine/powers/effectmodifiers/PowerCostEffectModifier.java
+++ b/src/engine/powers/effectmodifiers/PowerCostEffectModifier.java
@@ -11,7 +11,7 @@ package engine.powers.effectmodifiers;
 
 import engine.jobs.AbstractEffectJob;
 import engine.objects.*;
-import engine.wpak.data.EffectModifier;
+import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -22,7 +22,7 @@ public class PowerCostEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
-    public PowerCostEffectModifier(EffectModifier rs) {
+    public PowerCostEffectModifier(ModifierEntry rs) {
         super(rs);
     }
 
diff --git a/src/engine/powers/effectmodifiers/PowerCostHealthEffectModifier.java b/src/engine/powers/effectmodifiers/PowerCostHealthEffectModifier.java
index 26d3508b..634f20c0 100644
--- a/src/engine/powers/effectmodifiers/PowerCostHealthEffectModifier.java
+++ b/src/engine/powers/effectmodifiers/PowerCostHealthEffectModifier.java
@@ -14,7 +14,7 @@ import engine.objects.AbstractCharacter;
 import engine.objects.AbstractWorldObject;
 import engine.objects.Building;
 import engine.objects.Item;
-import engine.wpak.data.EffectModifier;
+import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -25,7 +25,7 @@ public class PowerCostHealthEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
-    public PowerCostHealthEffectModifier(EffectModifier rs) {
+    public PowerCostHealthEffectModifier(ModifierEntry rs) {
         super(rs);
     }
 
diff --git a/src/engine/powers/effectmodifiers/PowerDamageEffectModifier.java b/src/engine/powers/effectmodifiers/PowerDamageEffectModifier.java
index ade57340..f4cece4d 100644
--- a/src/engine/powers/effectmodifiers/PowerDamageEffectModifier.java
+++ b/src/engine/powers/effectmodifiers/PowerDamageEffectModifier.java
@@ -11,7 +11,7 @@ package engine.powers.effectmodifiers;
 
 import engine.jobs.AbstractEffectJob;
 import engine.objects.*;
-import engine.wpak.data.EffectModifier;
+import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -22,7 +22,7 @@ public class PowerDamageEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
-    public PowerDamageEffectModifier(EffectModifier rs) {
+    public PowerDamageEffectModifier(ModifierEntry rs) {
         super(rs);
     }
 
diff --git a/src/engine/powers/effectmodifiers/ProtectionFromEffectModifier.java b/src/engine/powers/effectmodifiers/ProtectionFromEffectModifier.java
index afa750a9..b7b476ea 100644
--- a/src/engine/powers/effectmodifiers/ProtectionFromEffectModifier.java
+++ b/src/engine/powers/effectmodifiers/ProtectionFromEffectModifier.java
@@ -11,7 +11,7 @@ package engine.powers.effectmodifiers;
 
 import engine.jobs.AbstractEffectJob;
 import engine.objects.*;
-import engine.wpak.data.EffectModifier;
+import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -22,7 +22,7 @@ public class ProtectionFromEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
-    public ProtectionFromEffectModifier(EffectModifier rs) {
+    public ProtectionFromEffectModifier(ModifierEntry rs) {
         super(rs);
     }
 
diff --git a/src/engine/powers/effectmodifiers/ResistanceEffectModifier.java b/src/engine/powers/effectmodifiers/ResistanceEffectModifier.java
index 93a1ff1b..e9f293c4 100644
--- a/src/engine/powers/effectmodifiers/ResistanceEffectModifier.java
+++ b/src/engine/powers/effectmodifiers/ResistanceEffectModifier.java
@@ -11,7 +11,7 @@ package engine.powers.effectmodifiers;
 
 import engine.jobs.AbstractEffectJob;
 import engine.objects.*;
-import engine.wpak.data.EffectModifier;
+import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -22,7 +22,7 @@ public class ResistanceEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
-    public ResistanceEffectModifier(EffectModifier rs) {
+    public ResistanceEffectModifier(ModifierEntry rs) {
         super(rs);
     }
 
diff --git a/src/engine/powers/effectmodifiers/ScaleHeightEffectModifier.java b/src/engine/powers/effectmodifiers/ScaleHeightEffectModifier.java
index d5b4e5f3..b9a4030e 100644
--- a/src/engine/powers/effectmodifiers/ScaleHeightEffectModifier.java
+++ b/src/engine/powers/effectmodifiers/ScaleHeightEffectModifier.java
@@ -14,7 +14,7 @@ import engine.objects.AbstractCharacter;
 import engine.objects.AbstractWorldObject;
 import engine.objects.Building;
 import engine.objects.Item;
-import engine.wpak.data.EffectModifier;
+import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -25,7 +25,7 @@ public class ScaleHeightEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
-    public ScaleHeightEffectModifier(EffectModifier rs) {
+    public ScaleHeightEffectModifier(ModifierEntry rs) {
         super(rs);
     }
 
diff --git a/src/engine/powers/effectmodifiers/ScaleWidthEffectModifier.java b/src/engine/powers/effectmodifiers/ScaleWidthEffectModifier.java
index a4128ea3..c608d6dd 100644
--- a/src/engine/powers/effectmodifiers/ScaleWidthEffectModifier.java
+++ b/src/engine/powers/effectmodifiers/ScaleWidthEffectModifier.java
@@ -14,7 +14,7 @@ import engine.objects.AbstractCharacter;
 import engine.objects.AbstractWorldObject;
 import engine.objects.Building;
 import engine.objects.Item;
-import engine.wpak.data.EffectModifier;
+import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -25,7 +25,7 @@ public class ScaleWidthEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
-    public ScaleWidthEffectModifier(EffectModifier rs) {
+    public ScaleWidthEffectModifier(ModifierEntry rs) {
         super(rs);
     }
 
diff --git a/src/engine/powers/effectmodifiers/ScanRangeEffectModifier.java b/src/engine/powers/effectmodifiers/ScanRangeEffectModifier.java
index b2ed8aee..7793ead4 100644
--- a/src/engine/powers/effectmodifiers/ScanRangeEffectModifier.java
+++ b/src/engine/powers/effectmodifiers/ScanRangeEffectModifier.java
@@ -11,7 +11,7 @@ package engine.powers.effectmodifiers;
 
 import engine.jobs.AbstractEffectJob;
 import engine.objects.*;
-import engine.wpak.data.EffectModifier;
+import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -22,7 +22,7 @@ public class ScanRangeEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
-    public ScanRangeEffectModifier(EffectModifier rs) {
+    public ScanRangeEffectModifier(ModifierEntry rs) {
         super(rs);
     }
 
diff --git a/src/engine/powers/effectmodifiers/SeeInvisibleEffectModifier.java b/src/engine/powers/effectmodifiers/SeeInvisibleEffectModifier.java
index 859429c8..247a1dca 100644
--- a/src/engine/powers/effectmodifiers/SeeInvisibleEffectModifier.java
+++ b/src/engine/powers/effectmodifiers/SeeInvisibleEffectModifier.java
@@ -11,7 +11,7 @@ package engine.powers.effectmodifiers;
 
 import engine.jobs.AbstractEffectJob;
 import engine.objects.*;
-import engine.wpak.data.EffectModifier;
+import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -22,7 +22,7 @@ public class SeeInvisibleEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
-    public SeeInvisibleEffectModifier(EffectModifier rs) {
+    public SeeInvisibleEffectModifier(ModifierEntry rs) {
         super(rs);
     }
 
diff --git a/src/engine/powers/effectmodifiers/SilencedEffectModifier.java b/src/engine/powers/effectmodifiers/SilencedEffectModifier.java
index 1f2db5ff..adc70727 100644
--- a/src/engine/powers/effectmodifiers/SilencedEffectModifier.java
+++ b/src/engine/powers/effectmodifiers/SilencedEffectModifier.java
@@ -11,7 +11,7 @@ package engine.powers.effectmodifiers;
 
 import engine.jobs.AbstractEffectJob;
 import engine.objects.*;
-import engine.wpak.data.EffectModifier;
+import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -22,7 +22,7 @@ public class SilencedEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
-    public SilencedEffectModifier(EffectModifier rs) {
+    public SilencedEffectModifier(ModifierEntry rs) {
         super(rs);
     }
 
diff --git a/src/engine/powers/effectmodifiers/SkillEffectModifier.java b/src/engine/powers/effectmodifiers/SkillEffectModifier.java
index 63af13a0..c6af7694 100644
--- a/src/engine/powers/effectmodifiers/SkillEffectModifier.java
+++ b/src/engine/powers/effectmodifiers/SkillEffectModifier.java
@@ -11,7 +11,7 @@ package engine.powers.effectmodifiers;
 
 import engine.jobs.AbstractEffectJob;
 import engine.objects.*;
-import engine.wpak.data.EffectModifier;
+import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -22,7 +22,7 @@ public class SkillEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
-    public SkillEffectModifier(EffectModifier rs) {
+    public SkillEffectModifier(ModifierEntry rs) {
         super(rs);
     }
 
diff --git a/src/engine/powers/effectmodifiers/SlayEffectModifier.java b/src/engine/powers/effectmodifiers/SlayEffectModifier.java
index 8c08a184..daed31a3 100644
--- a/src/engine/powers/effectmodifiers/SlayEffectModifier.java
+++ b/src/engine/powers/effectmodifiers/SlayEffectModifier.java
@@ -11,7 +11,7 @@ package engine.powers.effectmodifiers;
 
 import engine.jobs.AbstractEffectJob;
 import engine.objects.*;
-import engine.wpak.data.EffectModifier;
+import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -22,7 +22,7 @@ public class SlayEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
-    public SlayEffectModifier(EffectModifier rs) {
+    public SlayEffectModifier(ModifierEntry rs) {
         super(rs);
     }
 
diff --git a/src/engine/powers/effectmodifiers/SpeedEffectModifier.java b/src/engine/powers/effectmodifiers/SpeedEffectModifier.java
index e1dfb35c..878f1f92 100644
--- a/src/engine/powers/effectmodifiers/SpeedEffectModifier.java
+++ b/src/engine/powers/effectmodifiers/SpeedEffectModifier.java
@@ -11,7 +11,7 @@ package engine.powers.effectmodifiers;
 
 import engine.jobs.AbstractEffectJob;
 import engine.objects.*;
-import engine.wpak.data.EffectModifier;
+import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -22,7 +22,7 @@ public class SpeedEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
-    public SpeedEffectModifier(EffectModifier rs) {
+    public SpeedEffectModifier(ModifierEntry rs) {
         super(rs);
     }
 
diff --git a/src/engine/powers/effectmodifiers/SpireBlockEffectModifier.java b/src/engine/powers/effectmodifiers/SpireBlockEffectModifier.java
index d4dc88be..a1b492fe 100644
--- a/src/engine/powers/effectmodifiers/SpireBlockEffectModifier.java
+++ b/src/engine/powers/effectmodifiers/SpireBlockEffectModifier.java
@@ -11,7 +11,7 @@ package engine.powers.effectmodifiers;
 
 import engine.jobs.AbstractEffectJob;
 import engine.objects.*;
-import engine.wpak.data.EffectModifier;
+import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -22,7 +22,7 @@ public class SpireBlockEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
-    public SpireBlockEffectModifier(EffectModifier rs) {
+    public SpireBlockEffectModifier(ModifierEntry rs) {
         super(rs);
     }
 
diff --git a/src/engine/powers/effectmodifiers/StaminaEffectModifier.java b/src/engine/powers/effectmodifiers/StaminaEffectModifier.java
index fa11ffef..899b9ca1 100644
--- a/src/engine/powers/effectmodifiers/StaminaEffectModifier.java
+++ b/src/engine/powers/effectmodifiers/StaminaEffectModifier.java
@@ -21,7 +21,7 @@ import engine.powers.ActionsBase;
 import engine.powers.poweractions.AbstractPowerAction;
 import engine.powers.poweractions.DamageOverTimePowerAction;
 import engine.powers.poweractions.DirectDamagePowerAction;
-import engine.wpak.data.EffectModifier;
+import engine.wpak.data.ModifierEntry;
 import org.pmw.tinylog.Logger;
 
 import java.sql.ResultSet;
@@ -44,7 +44,7 @@ public class StaminaEffectModifier extends AbstractEffectModifier {
         }
     }
 
-    public StaminaEffectModifier(EffectModifier rs) {
+    public StaminaEffectModifier(ModifierEntry rs) {
         super(rs);
     }
 
diff --git a/src/engine/powers/effectmodifiers/StaminaFullEffectModifier.java b/src/engine/powers/effectmodifiers/StaminaFullEffectModifier.java
index 3c33f4dc..5a598640 100644
--- a/src/engine/powers/effectmodifiers/StaminaFullEffectModifier.java
+++ b/src/engine/powers/effectmodifiers/StaminaFullEffectModifier.java
@@ -11,7 +11,7 @@ package engine.powers.effectmodifiers;
 
 import engine.jobs.AbstractEffectJob;
 import engine.objects.*;
-import engine.wpak.data.EffectModifier;
+import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -22,7 +22,7 @@ public class StaminaFullEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
-    public StaminaFullEffectModifier(EffectModifier rs) {
+    public StaminaFullEffectModifier(ModifierEntry rs) {
         super(rs);
     }
 
diff --git a/src/engine/powers/effectmodifiers/StaminaRecoverRateEffectModifier.java b/src/engine/powers/effectmodifiers/StaminaRecoverRateEffectModifier.java
index 08ba57f0..e482c78c 100644
--- a/src/engine/powers/effectmodifiers/StaminaRecoverRateEffectModifier.java
+++ b/src/engine/powers/effectmodifiers/StaminaRecoverRateEffectModifier.java
@@ -11,7 +11,7 @@ package engine.powers.effectmodifiers;
 
 import engine.jobs.AbstractEffectJob;
 import engine.objects.*;
-import engine.wpak.data.EffectModifier;
+import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -22,7 +22,7 @@ public class StaminaRecoverRateEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
-    public StaminaRecoverRateEffectModifier(EffectModifier rs) {
+    public StaminaRecoverRateEffectModifier(ModifierEntry rs) {
         super(rs);
     }
 
diff --git a/src/engine/powers/effectmodifiers/StunnedEffectModifier.java b/src/engine/powers/effectmodifiers/StunnedEffectModifier.java
index 60658abd..8313ffae 100644
--- a/src/engine/powers/effectmodifiers/StunnedEffectModifier.java
+++ b/src/engine/powers/effectmodifiers/StunnedEffectModifier.java
@@ -12,7 +12,7 @@ package engine.powers.effectmodifiers;
 import engine.jobs.AbstractEffectJob;
 import engine.mbEnums.GameObjectType;
 import engine.objects.*;
-import engine.wpak.data.EffectModifier;
+import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -23,7 +23,7 @@ public class StunnedEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
-    public StunnedEffectModifier(EffectModifier rs) {
+    public StunnedEffectModifier(ModifierEntry rs) {
         super(rs);
     }
 
diff --git a/src/engine/powers/effectmodifiers/ValueEffectModifier.java b/src/engine/powers/effectmodifiers/ValueEffectModifier.java
index 6998bcdc..fbabc5e1 100644
--- a/src/engine/powers/effectmodifiers/ValueEffectModifier.java
+++ b/src/engine/powers/effectmodifiers/ValueEffectModifier.java
@@ -14,7 +14,7 @@ import engine.objects.AbstractCharacter;
 import engine.objects.AbstractWorldObject;
 import engine.objects.Building;
 import engine.objects.Item;
-import engine.wpak.data.EffectModifier;
+import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -25,7 +25,7 @@ public class ValueEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
-    public ValueEffectModifier(EffectModifier rs) {
+    public ValueEffectModifier(ModifierEntry rs) {
         super(rs);
     }
 
diff --git a/src/engine/powers/effectmodifiers/WeaponProcEffectModifier.java b/src/engine/powers/effectmodifiers/WeaponProcEffectModifier.java
index 9daaf43a..0d93a6bd 100644
--- a/src/engine/powers/effectmodifiers/WeaponProcEffectModifier.java
+++ b/src/engine/powers/effectmodifiers/WeaponProcEffectModifier.java
@@ -16,7 +16,7 @@ import engine.objects.AbstractCharacter;
 import engine.objects.AbstractWorldObject;
 import engine.objects.Building;
 import engine.objects.Item;
-import engine.wpak.data.EffectModifier;
+import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -27,7 +27,7 @@ public class WeaponProcEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
-    public WeaponProcEffectModifier(EffectModifier rs) {
+    public WeaponProcEffectModifier(ModifierEntry rs) {
         super(rs);
     }
 
diff --git a/src/engine/powers/effectmodifiers/WeaponRangeEffectModifier.java b/src/engine/powers/effectmodifiers/WeaponRangeEffectModifier.java
index 9a7f2287..5d8a9f6a 100644
--- a/src/engine/powers/effectmodifiers/WeaponRangeEffectModifier.java
+++ b/src/engine/powers/effectmodifiers/WeaponRangeEffectModifier.java
@@ -11,7 +11,7 @@ package engine.powers.effectmodifiers;
 
 import engine.jobs.AbstractEffectJob;
 import engine.objects.*;
-import engine.wpak.data.EffectModifier;
+import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -22,7 +22,7 @@ public class WeaponRangeEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
-    public WeaponRangeEffectModifier(EffectModifier rs) {
+    public WeaponRangeEffectModifier(ModifierEntry rs) {
         super(rs);
     }
 
diff --git a/src/engine/powers/effectmodifiers/WeaponSpeedEffectModifier.java b/src/engine/powers/effectmodifiers/WeaponSpeedEffectModifier.java
index fccd8338..c9f9c079 100644
--- a/src/engine/powers/effectmodifiers/WeaponSpeedEffectModifier.java
+++ b/src/engine/powers/effectmodifiers/WeaponSpeedEffectModifier.java
@@ -14,7 +14,7 @@ import engine.objects.AbstractCharacter;
 import engine.objects.AbstractWorldObject;
 import engine.objects.Building;
 import engine.objects.Item;
-import engine.wpak.data.EffectModifier;
+import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -25,7 +25,7 @@ public class WeaponSpeedEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
-    public WeaponSpeedEffectModifier(EffectModifier rs) {
+    public WeaponSpeedEffectModifier(ModifierEntry rs) {
         super(rs);
     }