diff --git a/eos/effects.py b/eos/effects.py
index c475c7f11..a46f3554e 100644
--- a/eos/effects.py
+++ b/eos/effects.py
@@ -26,7 +26,7 @@ from eos.utils.spoolSupport import SpoolType, SpoolOptions, calculateSpoolup, re
 class BaseEffect:
 
     @staticmethod
-    def handler(fit, module, context, *args, **kwargs):
+    def handler(fit, module, context, **kwargs):
         pass
 
 
@@ -46,10 +46,10 @@ class Effect4(BaseEffect):
     type = 'active'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         amount = module.getModifiedItemAttr('shieldBonus')
         speed = module.getModifiedItemAttr('duration') / 1000.0
-        fit.extraAttributes.increase('shieldRepair', amount / speed)
+        fit.extraAttributes.increase('shieldRepair', amount / speed, **kwargs)
 
 
 class Effect10(BaseEffect):
@@ -64,7 +64,7 @@ class Effect10(BaseEffect):
     type = 'active'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         # Set reload time to 1 second
         module.reloadTime = 1000
 
@@ -81,12 +81,12 @@ class Effect17(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, container, context):
+    def handler(fit, container, context, **kwargs):
         miningDroneAmountPercent = container.getModifiedItemAttr('miningDroneAmountPercent')
         if (miningDroneAmountPercent is None) or (miningDroneAmountPercent == 0):
             pass
         else:
-            container.multiplyItemAttr('miningAmount', miningDroneAmountPercent / 100)
+            container.multiplyItemAttr('miningAmount', miningDroneAmountPercent / 100, **kwargs)
 
 
 class Effect21(BaseEffect):
@@ -101,8 +101,8 @@ class Effect21(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
-        fit.ship.increaseItemAttr('shieldCapacity', module.getModifiedItemAttr('capacityBonus'))
+    def handler(fit, module, context, **kwargs):
+        fit.ship.increaseItemAttr('shieldCapacity', module.getModifiedItemAttr('capacityBonus'), **kwargs)
 
 
 class Effect25(BaseEffect):
@@ -116,8 +116,8 @@ class Effect25(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
-        fit.ship.increaseItemAttr('capacitorCapacity', ship.getModifiedItemAttr('capacitorBonus'))
+    def handler(fit, ship, context, **kwargs):
+        fit.ship.increaseItemAttr('capacitorCapacity', ship.getModifiedItemAttr('capacitorBonus'), **kwargs)
 
 
 class Effect26(BaseEffect):
@@ -132,10 +132,10 @@ class Effect26(BaseEffect):
     type = 'active'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         amount = module.getModifiedItemAttr('structureDamageAmount')
         speed = module.getModifiedItemAttr('duration') / 1000.0
-        fit.extraAttributes.increase('hullRepair', amount / speed)
+        fit.extraAttributes.increase('hullRepair', amount / speed, **kwargs)
 
 
 class Effect27(BaseEffect):
@@ -150,13 +150,13 @@ class Effect27(BaseEffect):
     type = 'active'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         amount = module.getModifiedItemAttr('armorDamageAmount')
         speed = module.getModifiedItemAttr('duration') / 1000.0
         rps = amount / speed
-        fit.extraAttributes.increase('armorRepair', rps)
-        fit.extraAttributes.increase('armorRepairPreSpool', rps)
-        fit.extraAttributes.increase('armorRepairFullSpool', rps)
+        fit.extraAttributes.increase('armorRepair', rps, **kwargs)
+        fit.extraAttributes.increase('armorRepairPreSpool', rps, **kwargs)
+        fit.extraAttributes.increase('armorRepairFullSpool', rps, **kwargs)
 
 
 class Effect34(BaseEffect):
@@ -171,7 +171,7 @@ class Effect34(BaseEffect):
     type = 'active'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         rt = module.getModifiedItemAttr('reloadTime')
         if not rt:
             # Set reload time to 10 seconds
@@ -202,9 +202,9 @@ class Effect39(BaseEffect):
     type = 'projected', 'active'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         if 'projected' in context:
-            fit.ship.increaseItemAttr('warpScrambleStatus', module.getModifiedItemAttr('warpScrambleStrength'))
+            fit.ship.increaseItemAttr('warpScrambleStatus', module.getModifiedItemAttr('warpScrambleStrength'), **kwargs)
 
 
 class Effect48(BaseEffect):
@@ -218,7 +218,7 @@ class Effect48(BaseEffect):
     type = 'active'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         # Set reload time to 10 seconds
         module.reloadTime = 10000
         # Make so that reloads are always taken into account during clculations
@@ -245,8 +245,8 @@ class Effect50(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
-        fit.ship.multiplyItemAttr('shieldRechargeRate', module.getModifiedItemAttr('shieldRechargeRateMultiplier') or 1)
+    def handler(fit, module, context, **kwargs):
+        fit.ship.multiplyItemAttr('shieldRechargeRate', module.getModifiedItemAttr('shieldRechargeRateMultiplier') or 1, **kwargs)
 
 
 class Effect51(BaseEffect):
@@ -265,8 +265,8 @@ class Effect51(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
-        fit.ship.multiplyItemAttr('rechargeRate', module.getModifiedItemAttr('capacitorRechargeRateMultiplier'))
+    def handler(fit, module, context, **kwargs):
+        fit.ship.multiplyItemAttr('rechargeRate', module.getModifiedItemAttr('capacitorRechargeRateMultiplier'), **kwargs)
 
 
 class Effect55(BaseEffect):
@@ -295,10 +295,10 @@ class Effect56(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         # We default this to None as there are times when the source attribute doesn't exist (for example, Cap Power Relay).
         # It will return 0 as it doesn't exist, which would nullify whatever the target attribute is
-        fit.ship.multiplyItemAttr('powerOutput', module.getModifiedItemAttr('powerOutputMultiplier', None))
+        fit.ship.multiplyItemAttr('powerOutput', module.getModifiedItemAttr('powerOutputMultiplier', None), **kwargs)
 
 
 class Effect57(BaseEffect):
@@ -315,10 +315,10 @@ class Effect57(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         # We default this to None as there are times when the source attribute doesn't exist (for example, Cap Power Relay).
         # It will return 0 as it doesn't exist, which would nullify whatever the target attribute is
-        fit.ship.multiplyItemAttr('shieldCapacity', module.getModifiedItemAttr('shieldCapacityMultiplier', None))
+        fit.ship.multiplyItemAttr('shieldCapacity', module.getModifiedItemAttr('shieldCapacityMultiplier', None), **kwargs)
 
 
 class Effect58(BaseEffect):
@@ -336,10 +336,10 @@ class Effect58(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         # We default this to None as there are times when the source attribute doesn't exist (for example, Cap Power Relay).
         # It will return 0 as it doesn't exist, which would nullify whatever the target attribute is
-        fit.ship.multiplyItemAttr('capacitorCapacity', module.getModifiedItemAttr('capacitorCapacityMultiplier', None))
+        fit.ship.multiplyItemAttr('capacitorCapacity', module.getModifiedItemAttr('capacitorCapacityMultiplier', None), **kwargs)
 
 
 class Effect59(BaseEffect):
@@ -355,8 +355,8 @@ class Effect59(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
-        fit.ship.multiplyItemAttr('capacity', module.getModifiedItemAttr('cargoCapacityMultiplier'))
+    def handler(fit, module, context, **kwargs):
+        fit.ship.multiplyItemAttr('capacity', module.getModifiedItemAttr('cargoCapacityMultiplier'), **kwargs)
 
 
 class Effect60(BaseEffect):
@@ -371,8 +371,8 @@ class Effect60(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
-        fit.ship.multiplyItemAttr('hp', module.getModifiedItemAttr('structureHPMultiplier'))
+    def handler(fit, module, context, **kwargs):
+        fit.ship.multiplyItemAttr('hp', module.getModifiedItemAttr('structureHPMultiplier'), **kwargs)
 
 
 class Effect61(BaseEffect):
@@ -386,8 +386,8 @@ class Effect61(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
-        fit.ship.increaseItemAttr('agility', src.getModifiedItemAttr('agilityBonusAdd'))
+    def handler(fit, src, context, **kwargs):
+        fit.ship.increaseItemAttr('agility', src.getModifiedItemAttr('agilityBonusAdd'), **kwargs)
 
 
 class Effect63(BaseEffect):
@@ -402,8 +402,8 @@ class Effect63(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
-        fit.ship.multiplyItemAttr('armorHP', module.getModifiedItemAttr('armorHPMultiplier'))
+    def handler(fit, module, context, **kwargs):
+        fit.ship.multiplyItemAttr('armorHP', module.getModifiedItemAttr('armorHPMultiplier'), **kwargs)
 
 
 class Effect67(BaseEffect):
@@ -420,7 +420,7 @@ class Effect67(BaseEffect):
     type = 'active'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         # Set reload time to 1 second
         module.reloadTime = 1000
 
@@ -436,10 +436,10 @@ class Effect89(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == 'Projectile Weapon',
                                          'speed', module.getModifiedItemAttr('speedMultiplier'),
-                                         stackingPenalties=True)
+                                         stackingPenalties=True, **kwargs)
 
 
 class Effect91(BaseEffect):
@@ -453,10 +453,10 @@ class Effect91(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == 'Energy Weapon',
                                          'damageMultiplier', module.getModifiedItemAttr('damageMultiplier'),
-                                         stackingPenalties=True)
+                                         stackingPenalties=True, **kwargs)
 
 
 class Effect92(BaseEffect):
@@ -470,10 +470,10 @@ class Effect92(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == 'Projectile Weapon',
                                          'damageMultiplier', module.getModifiedItemAttr('damageMultiplier'),
-                                         stackingPenalties=True)
+                                         stackingPenalties=True, **kwargs)
 
 
 class Effect93(BaseEffect):
@@ -487,10 +487,10 @@ class Effect93(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == 'Hybrid Weapon',
                                          'damageMultiplier', module.getModifiedItemAttr('damageMultiplier'),
-                                         stackingPenalties=True)
+                                         stackingPenalties=True, **kwargs)
 
 
 class Effect95(BaseEffect):
@@ -504,10 +504,10 @@ class Effect95(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == 'Energy Weapon',
                                          'speed', module.getModifiedItemAttr('speedMultiplier'),
-                                         stackingPenalties=True)
+                                         stackingPenalties=True, **kwargs)
 
 
 class Effect96(BaseEffect):
@@ -521,10 +521,10 @@ class Effect96(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == 'Hybrid Weapon',
                                          'speed', module.getModifiedItemAttr('speedMultiplier'),
-                                         stackingPenalties=True)
+                                         stackingPenalties=True, **kwargs)
 
 
 class Effect101(BaseEffect):
@@ -541,7 +541,7 @@ class Effect101(BaseEffect):
     type = 'active', 'projected'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         # Set reload time to 10 seconds
         src.reloadTime = 10000
 
@@ -576,8 +576,8 @@ class Effect118(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
-        fit.ship.increaseItemAttr('maxLockedTargets', module.getModifiedItemAttr('maxLockedTargetsBonus'))
+    def handler(fit, module, context, **kwargs):
+        fit.ship.increaseItemAttr('maxLockedTargets', module.getModifiedItemAttr('maxLockedTargetsBonus'), **kwargs)
 
 
 class Effect157(BaseEffect):
@@ -592,10 +592,10 @@ class Effect157(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, container, context):
+    def handler(fit, container, context, **kwargs):
         level = container.level if 'skill' in context else 1
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Large Hybrid Turret'),
-                                      'damageMultiplier', container.getModifiedItemAttr('damageMultiplierBonus') * level)
+                                      'damageMultiplier', container.getModifiedItemAttr('damageMultiplierBonus') * level, **kwargs)
 
 
 class Effect159(BaseEffect):
@@ -610,10 +610,10 @@ class Effect159(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, container, context):
+    def handler(fit, container, context, **kwargs):
         level = container.level if 'skill' in context else 1
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Energy Turret'),
-                                      'damageMultiplier', container.getModifiedItemAttr('damageMultiplierBonus') * level)
+                                      'damageMultiplier', container.getModifiedItemAttr('damageMultiplierBonus') * level, **kwargs)
 
 
 class Effect160(BaseEffect):
@@ -628,10 +628,10 @@ class Effect160(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, container, context):
+    def handler(fit, container, context, **kwargs):
         level = container.level if 'skill' in context else 1
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Hybrid Turret'),
-                                      'damageMultiplier', container.getModifiedItemAttr('damageMultiplierBonus') * level)
+                                      'damageMultiplier', container.getModifiedItemAttr('damageMultiplierBonus') * level, **kwargs)
 
 
 class Effect161(BaseEffect):
@@ -646,10 +646,10 @@ class Effect161(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, container, context):
+    def handler(fit, container, context, **kwargs):
         level = container.level if 'skill' in context else 1
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Projectile Turret'),
-                                      'damageMultiplier', container.getModifiedItemAttr('damageMultiplierBonus') * level)
+                                      'damageMultiplier', container.getModifiedItemAttr('damageMultiplierBonus') * level, **kwargs)
 
 
 class Effect162(BaseEffect):
@@ -665,10 +665,10 @@ class Effect162(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, container, context):
+    def handler(fit, container, context, **kwargs):
         level = container.level if 'skill' in context else 1
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Large Energy Turret'),
-                                      'damageMultiplier', container.getModifiedItemAttr('damageMultiplierBonus') * level)
+                                      'damageMultiplier', container.getModifiedItemAttr('damageMultiplierBonus') * level, **kwargs)
 
 
 class Effect172(BaseEffect):
@@ -683,10 +683,10 @@ class Effect172(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, container, context):
+    def handler(fit, container, context, **kwargs):
         level = container.level if 'skill' in context else 1
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Energy Turret'),
-                                      'damageMultiplier', container.getModifiedItemAttr('damageMultiplierBonus') * level)
+                                      'damageMultiplier', container.getModifiedItemAttr('damageMultiplierBonus') * level, **kwargs)
 
 
 class Effect173(BaseEffect):
@@ -701,10 +701,10 @@ class Effect173(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, container, context):
+    def handler(fit, container, context, **kwargs):
         level = container.level if 'skill' in context else 1
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Hybrid Turret'),
-                                      'damageMultiplier', container.getModifiedItemAttr('damageMultiplierBonus') * level)
+                                      'damageMultiplier', container.getModifiedItemAttr('damageMultiplierBonus') * level, **kwargs)
 
 
 class Effect174(BaseEffect):
@@ -719,10 +719,10 @@ class Effect174(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, container, context):
+    def handler(fit, container, context, **kwargs):
         level = container.level if 'skill' in context else 1
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Projectile Turret'),
-                                      'damageMultiplier', container.getModifiedItemAttr('damageMultiplierBonus') * level)
+                                      'damageMultiplier', container.getModifiedItemAttr('damageMultiplierBonus') * level, **kwargs)
 
 
 class Effect212(BaseEffect):
@@ -738,10 +738,10 @@ class Effect212(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, container, context):
+    def handler(fit, container, context, **kwargs):
         level = container.level if 'skill' in context else 1
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Electronics Upgrades'),
-                                      'cpu', container.getModifiedItemAttr('cpuNeedBonus') * level)
+                                      'cpu', container.getModifiedItemAttr('cpuNeedBonus') * level, **kwargs)
 
 
 class Effect214(BaseEffect):
@@ -755,9 +755,9 @@ class Effect214(BaseEffect):
     type = 'passive', 'structure'
 
     @staticmethod
-    def handler(fit, skill, context):
+    def handler(fit, skill, context, **kwargs):
         amount = skill.getModifiedItemAttr('maxTargetBonus') * skill.level
-        fit.extraAttributes.increase('maxTargetsLockedFromSkills', amount)
+        fit.extraAttributes.increase('maxTargetsLockedFromSkills', amount, **kwargs)
 
 
 class Effect223(BaseEffect):
@@ -772,8 +772,8 @@ class Effect223(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, implant, context):
-        fit.ship.boostItemAttr('maxVelocity', implant.getModifiedItemAttr('velocityBonus'))
+    def handler(fit, implant, context, **kwargs):
+        fit.ship.boostItemAttr('maxVelocity', implant.getModifiedItemAttr('velocityBonus'), **kwargs)
 
 
 class Effect227(BaseEffect):
@@ -787,9 +787,9 @@ class Effect227(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, container, context):
+    def handler(fit, container, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Propulsion Module',
-                                      'capacitorNeed', container.getModifiedItemAttr('capNeedBonus'))
+                                      'capacitorNeed', container.getModifiedItemAttr('capNeedBonus'), **kwargs)
 
 
 class Effect230(BaseEffect):
@@ -805,10 +805,10 @@ class Effect230(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, container, context):
+    def handler(fit, container, context, **kwargs):
         level = container.level if 'skill' in context else 1
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Afterburner'),
-                                      'duration', container.getModifiedItemAttr('durationBonus') * level)
+                                      'duration', container.getModifiedItemAttr('durationBonus') * level, **kwargs)
 
 
 class Effect235(BaseEffect):
@@ -822,8 +822,8 @@ class Effect235(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, implant, context):
-        fit.ship.boostItemAttr('warpCapacitorNeed', implant.getModifiedItemAttr('warpCapacitorNeedBonus'))
+    def handler(fit, implant, context, **kwargs):
+        fit.ship.boostItemAttr('warpCapacitorNeed', implant.getModifiedItemAttr('warpCapacitorNeedBonus'), **kwargs)
 
 
 class Effect242(BaseEffect):
@@ -837,9 +837,9 @@ class Effect242(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, implant, context):
+    def handler(fit, implant, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Propulsion Module',
-                                      'speedFactor', implant.getModifiedItemAttr('speedFBonus'))
+                                      'speedFactor', implant.getModifiedItemAttr('speedFBonus'), **kwargs)
 
 
 class Effect244(BaseEffect):
@@ -854,10 +854,10 @@ class Effect244(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, container, context):
+    def handler(fit, container, context, **kwargs):
         level = container.level if 'skill' in context else 1
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('High Speed Maneuvering'),
-                                      'capacitorNeed', container.getModifiedItemAttr('capNeedBonus') * level)
+                                      'capacitorNeed', container.getModifiedItemAttr('capNeedBonus') * level, **kwargs)
 
 
 class Effect271(BaseEffect):
@@ -875,9 +875,9 @@ class Effect271(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, container, context):
+    def handler(fit, container, context, **kwargs):
         level = container.level if 'skill' in context else 1
-        fit.ship.boostItemAttr('armorHP', (container.getModifiedItemAttr('armorHpBonus') or 0) * level)
+        fit.ship.boostItemAttr('armorHP', (container.getModifiedItemAttr('armorHpBonus') or 0) * level, **kwargs)
 
 
 class Effect272(BaseEffect):
@@ -894,10 +894,10 @@ class Effect272(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, container, context):
+    def handler(fit, container, context, **kwargs):
         level = container.level if 'skill' in context else 1
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Repair Systems'),
-                                      'duration', container.getModifiedItemAttr('durationSkillBonus') * level)
+                                      'duration', container.getModifiedItemAttr('durationSkillBonus') * level, **kwargs)
 
 
 class Effect273(BaseEffect):
@@ -913,10 +913,10 @@ class Effect273(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, container, context):
+    def handler(fit, container, context, **kwargs):
         level = container.level if 'skill' in context else 1
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Upgrades'),
-                                      'power', container.getModifiedItemAttr('powerNeedBonus') * level)
+                                      'power', container.getModifiedItemAttr('powerNeedBonus') * level, **kwargs)
 
 
 class Effect277(BaseEffect):
@@ -930,8 +930,8 @@ class Effect277(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, skill, context):
-        fit.ship.increaseItemAttr('shieldUniformity', skill.getModifiedItemAttr('uniformityBonus') * skill.level)
+    def handler(fit, skill, context, **kwargs):
+        fit.ship.increaseItemAttr('shieldUniformity', skill.getModifiedItemAttr('uniformityBonus') * skill.level, **kwargs)
 
 
 class Effect279(BaseEffect):
@@ -946,10 +946,10 @@ class Effect279(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, container, context):
+    def handler(fit, container, context, **kwargs):
         level = container.level if 'skill' in context else 1
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Emission Systems'),
-                                      'capacitorNeed', container.getModifiedItemAttr('capNeedBonus') * level)
+                                      'capacitorNeed', container.getModifiedItemAttr('capNeedBonus') * level, **kwargs)
 
 
 class Effect287(BaseEffect):
@@ -964,10 +964,10 @@ class Effect287(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, container, context):
+    def handler(fit, container, context, **kwargs):
         level = container.level if 'skill' in context else 1
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Gunnery'),
-                                      'capacitorNeed', container.getModifiedItemAttr('capNeedBonus') * level)
+                                      'capacitorNeed', container.getModifiedItemAttr('capNeedBonus') * level, **kwargs)
 
 
 class Effect290(BaseEffect):
@@ -983,10 +983,10 @@ class Effect290(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, container, context):
+    def handler(fit, container, context, **kwargs):
         level = container.level if 'skill' in context else 1
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Gunnery'),
-                                      'maxRange', container.getModifiedItemAttr('rangeSkillBonus') * level)
+                                      'maxRange', container.getModifiedItemAttr('rangeSkillBonus') * level, **kwargs)
 
 
 class Effect298(BaseEffect):
@@ -1002,10 +1002,10 @@ class Effect298(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, container, context):
+    def handler(fit, container, context, **kwargs):
         level = container.level if 'skill' in context else 1
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Gunnery'),
-                                      'falloff', container.getModifiedItemAttr('falloffBonus') * level)
+                                      'falloff', container.getModifiedItemAttr('falloffBonus') * level, **kwargs)
 
 
 class Effect315(BaseEffect):
@@ -1019,9 +1019,9 @@ class Effect315(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, skill, context):
+    def handler(fit, skill, context, **kwargs):
         amount = skill.getModifiedItemAttr('maxActiveDroneBonus') * skill.level
-        fit.extraAttributes.increase('maxActiveDrones', amount)
+        fit.extraAttributes.increase('maxActiveDrones', amount, **kwargs)
 
 
 class Effect391(BaseEffect):
@@ -1038,10 +1038,10 @@ class Effect391(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, container, context):
+    def handler(fit, container, context, **kwargs):
         level = container.level if 'skill' in context else 1
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Mining'),
-                                      'miningAmount', container.getModifiedItemAttr('miningAmountBonus') * level)
+                                      'miningAmount', container.getModifiedItemAttr('miningAmountBonus') * level, **kwargs)
 
 
 class Effect392(BaseEffect):
@@ -1057,9 +1057,9 @@ class Effect392(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, container, context):
+    def handler(fit, container, context, **kwargs):
         level = container.level if 'skill' in context else 1
-        fit.ship.boostItemAttr('hp', container.getModifiedItemAttr('hullHpBonus') * level)
+        fit.ship.boostItemAttr('hp', container.getModifiedItemAttr('hullHpBonus') * level, **kwargs)
 
 
 class Effect394(BaseEffect):
@@ -1078,11 +1078,12 @@ class Effect394(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, container, context):
+    def handler(fit, container, context, **kwargs):
         level = container.level if 'skill' in context else 1
         amount = container.getModifiedItemAttr('velocityBonus') or 0
+        penalties = 'skill' not in context and 'implant' not in context and 'booster' not in context
         fit.ship.boostItemAttr('maxVelocity', amount * level,
-                               stackingPenalties='skill' not in context and 'implant' not in context and 'booster' not in context)
+                               stackingPenalties=penalties, **kwargs)
 
 
 class Effect395(BaseEffect):
@@ -1102,10 +1103,11 @@ class Effect395(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, container, context):
+    def handler(fit, container, context, **kwargs):
         level = container.level if 'skill' in context else 1
+        penalties = 'skill' not in context and 'implant' not in context
         fit.ship.boostItemAttr('agility', container.getModifiedItemAttr('agilityBonus') * level,
-                               stackingPenalties='skill' not in context and 'implant' not in context)
+                               stackingPenalties=penalties, **kwargs)
 
 
 class Effect396(BaseEffect):
@@ -1121,10 +1123,10 @@ class Effect396(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, container, context):
+    def handler(fit, container, context, **kwargs):
         level = container.level if 'skill' in context else 1
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Energy Grid Upgrades'),
-                                      'cpu', container.getModifiedItemAttr('cpuNeedBonus') * level)
+                                      'cpu', container.getModifiedItemAttr('cpuNeedBonus') * level, **kwargs)
 
 
 class Effect397(BaseEffect):
@@ -1142,9 +1144,9 @@ class Effect397(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, container, context):
+    def handler(fit, container, context, **kwargs):
         level = container.level if 'skill' in context else 1
-        fit.ship.boostItemAttr('cpuOutput', container.getModifiedItemAttr('cpuOutputBonus2') * level)
+        fit.ship.boostItemAttr('cpuOutput', container.getModifiedItemAttr('cpuOutputBonus2') * level, **kwargs)
 
 
 class Effect408(BaseEffect):
@@ -1159,10 +1161,10 @@ class Effect408(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, container, context):
+    def handler(fit, container, context, **kwargs):
         level = container.level if 'skill' in context else 1
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Large Projectile Turret'),
-                                      'damageMultiplier', container.getModifiedItemAttr('damageMultiplierBonus') * level)
+                                      'damageMultiplier', container.getModifiedItemAttr('damageMultiplierBonus') * level, **kwargs)
 
 
 class Effect414(BaseEffect):
@@ -1178,10 +1180,10 @@ class Effect414(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, container, context):
+    def handler(fit, container, context, **kwargs):
         level = container.level if 'skill' in context else 1
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Gunnery'),
-                                      'speed', container.getModifiedItemAttr('turretSpeeBonus') * level)
+                                      'speed', container.getModifiedItemAttr('turretSpeeBonus') * level, **kwargs)
 
 
 class Effect446(BaseEffect):
@@ -1199,9 +1201,9 @@ class Effect446(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, container, context):
+    def handler(fit, container, context, **kwargs):
         level = container.level if 'skill' in context else 1
-        fit.ship.boostItemAttr('shieldCapacity', container.getModifiedItemAttr('shieldCapacityBonus') * level)
+        fit.ship.boostItemAttr('shieldCapacity', container.getModifiedItemAttr('shieldCapacityBonus') * level, **kwargs)
 
 
 class Effect485(BaseEffect):
@@ -1218,9 +1220,9 @@ class Effect485(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, container, context):
+    def handler(fit, container, context, **kwargs):
         level = container.level if 'skill' in context else 1
-        fit.ship.boostItemAttr('rechargeRate', container.getModifiedItemAttr('capRechargeBonus') * level)
+        fit.ship.boostItemAttr('rechargeRate', container.getModifiedItemAttr('capRechargeBonus') * level, **kwargs)
 
 
 class Effect486(BaseEffect):
@@ -1237,9 +1239,9 @@ class Effect486(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, container, context):
+    def handler(fit, container, context, **kwargs):
         level = container.level if 'skill' in context else 1
-        fit.ship.boostItemAttr('shieldRechargeRate', container.getModifiedItemAttr('rechargeratebonus') * level)
+        fit.ship.boostItemAttr('shieldRechargeRate', container.getModifiedItemAttr('rechargeratebonus') * level, **kwargs)
 
 
 class Effect490(BaseEffect):
@@ -1257,9 +1259,9 @@ class Effect490(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, container, context):
+    def handler(fit, container, context, **kwargs):
         level = container.level if 'skill' in context else 1
-        fit.ship.boostItemAttr('powerOutput', container.getModifiedItemAttr('powerEngineeringOutputBonus') * level)
+        fit.ship.boostItemAttr('powerOutput', container.getModifiedItemAttr('powerEngineeringOutputBonus') * level, **kwargs)
 
 
 class Effect494(BaseEffect):
@@ -1274,10 +1276,10 @@ class Effect494(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, container, context):
+    def handler(fit, container, context, **kwargs):
         level = container.level if 'skill' in context else 1
         fit.ship.boostItemAttr('warpCapacitorNeed', container.getModifiedItemAttr('warpCapacitorNeedBonus') * level,
-                               stackingPenalties='skill' not in context)
+                               stackingPenalties='skill' not in context, **kwargs)
 
 
 class Effect504(BaseEffect):
@@ -1292,10 +1294,10 @@ class Effect504(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, container, context):
+    def handler(fit, container, context, **kwargs):
         level = container.level if 'skill' in context else 1
         amount = container.getModifiedItemAttr('droneRangeBonus') * level
-        fit.extraAttributes.increase('droneControlRange', amount)
+        fit.extraAttributes.increase('droneControlRange', amount, **kwargs)
 
 
 class Effect506(BaseEffect):
@@ -1310,9 +1312,9 @@ class Effect506(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, skill, context):
+    def handler(fit, skill, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Afterburner'),
-                                      'capacitorNeed', skill.getModifiedItemAttr('capNeedBonus') * skill.level)
+                                      'capacitorNeed', skill.getModifiedItemAttr('capNeedBonus') * skill.level, **kwargs)
 
 
 class Effect507(BaseEffect):
@@ -1327,9 +1329,9 @@ class Effect507(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, container, context):
+    def handler(fit, container, context, **kwargs):
         level = container.level if 'skill' in context else 1
-        fit.ship.boostItemAttr('maxTargetRange', container.getModifiedItemAttr('maxTargetRangeBonus') * level)
+        fit.ship.boostItemAttr('maxTargetRange', container.getModifiedItemAttr('maxTargetRangeBonus') * level, **kwargs)
 
 
 class Effect508(BaseEffect):
@@ -1349,9 +1351,9 @@ class Effect508(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Projectile Turret'),
-                                      'damageMultiplier', ship.getModifiedItemAttr('shipBonusMF'), skill='Minmatar Frigate')
+                                      'damageMultiplier', ship.getModifiedItemAttr('shipBonusMF'), skill='Minmatar Frigate', **kwargs)
 
 
 class Effect511(BaseEffect):
@@ -1371,9 +1373,10 @@ class Effect511(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Energy Turret'),
-                                      'capacitorNeed', ship.getModifiedItemAttr('shipBonus2AF'), skill='Amarr Frigate')
+                                      'capacitorNeed', ship.getModifiedItemAttr('shipBonus2AF'),
+                                      skill='Amarr Frigate', **kwargs)
 
 
 class Effect512(BaseEffect):
@@ -1392,9 +1395,10 @@ class Effect512(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Hybrid Turret'),
-                                      'damageMultiplier', ship.getModifiedItemAttr('shipBonusGF'), skill='Gallente Frigate')
+                                      'damageMultiplier', ship.getModifiedItemAttr('shipBonusGF'),
+                                      skill='Gallente Frigate', **kwargs)
 
 
 class Effect514(BaseEffect):
@@ -1411,9 +1415,10 @@ class Effect514(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Energy Turret'),
-                                      'damageMultiplier', ship.getModifiedItemAttr('shipBonusAF'), skill='Amarr Frigate')
+                                      'damageMultiplier', ship.getModifiedItemAttr('shipBonusAF'),
+                                      skill='Amarr Frigate', **kwargs)
 
 
 class Effect516(BaseEffect):
@@ -1429,9 +1434,10 @@ class Effect516(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Energy Turret'),
-                                      'capacitorNeed', ship.getModifiedItemAttr('shipBonusAC'), skill='Amarr Cruiser')
+                                      'capacitorNeed', ship.getModifiedItemAttr('shipBonusAC'),
+                                      skill='Amarr Cruiser', **kwargs)
 
 
 class Effect521(BaseEffect):
@@ -1445,9 +1451,10 @@ class Effect521(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Hybrid Turret'),
-                                      'maxRange', ship.getModifiedItemAttr('shipBonusCC'), skill='Caldari Cruiser')
+                                      'maxRange', ship.getModifiedItemAttr('shipBonusCC'),
+                                      skill='Caldari Cruiser', **kwargs)
 
 
 class Effect527(BaseEffect):
@@ -1463,8 +1470,9 @@ class Effect527(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
-        fit.ship.boostItemAttr('maxVelocity', ship.getModifiedItemAttr('shipBonusMI'), skill='Minmatar Industrial')
+    def handler(fit, ship, context, **kwargs):
+        fit.ship.boostItemAttr('maxVelocity', ship.getModifiedItemAttr('shipBonusMI'),
+                               skill='Minmatar Industrial', **kwargs)
 
 
 class Effect529(BaseEffect):
@@ -1479,8 +1487,9 @@ class Effect529(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
-        fit.ship.boostItemAttr('capacity', ship.getModifiedItemAttr('shipBonusAI'), skill='Amarr Industrial')
+    def handler(fit, ship, context, **kwargs):
+        fit.ship.boostItemAttr('capacity', ship.getModifiedItemAttr('shipBonusAI'),
+                               skill='Amarr Industrial', **kwargs)
 
 
 class Effect536(BaseEffect):
@@ -1495,8 +1504,8 @@ class Effect536(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
-        fit.ship.multiplyItemAttr('cpuOutput', module.getModifiedItemAttr('cpuMultiplier'))
+    def handler(fit, module, context, **kwargs):
+        fit.ship.multiplyItemAttr('cpuOutput', module.getModifiedItemAttr('cpuMultiplier'), **kwargs)
 
 
 class Effect542(BaseEffect):
@@ -1511,9 +1520,9 @@ class Effect542(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Large Energy Turret'),
-                                      'capacitorNeed', ship.getModifiedItemAttr('shipBonusAB'), skill='Amarr Battleship')
+                                      'capacitorNeed', ship.getModifiedItemAttr('shipBonusAB'), skill='Amarr Battleship', **kwargs)
 
 
 class Effect549(BaseEffect):
@@ -1529,10 +1538,10 @@ class Effect549(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Large Projectile Turret'),
                                       'damageMultiplier', ship.getModifiedItemAttr('shipBonusMB'),
-                                      skill='Minmatar Battleship')
+                                      skill='Minmatar Battleship', **kwargs)
 
 
 class Effect550(BaseEffect):
@@ -1551,10 +1560,10 @@ class Effect550(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Large Hybrid Turret'),
                                       'damageMultiplier', ship.getModifiedItemAttr('shipBonusGB'),
-                                      skill='Gallente Battleship')
+                                      skill='Gallente Battleship', **kwargs)
 
 
 class Effect553(BaseEffect):
@@ -1568,9 +1577,10 @@ class Effect553(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Large Hybrid Turret'),
-                                      'trackingSpeed', ship.getModifiedItemAttr('shipBonusGB'), skill='Gallente Battleship')
+                                      'trackingSpeed', ship.getModifiedItemAttr('shipBonusGB'),
+                                      skill='Gallente Battleship', **kwargs)
 
 
 class Effect562(BaseEffect):
@@ -1591,9 +1601,10 @@ class Effect562(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Hybrid Turret'),
-                                      'damageMultiplier', ship.getModifiedItemAttr('shipBonusGC'), skill='Gallente Cruiser')
+                                      'damageMultiplier', ship.getModifiedItemAttr('shipBonusGC'),
+                                      skill='Gallente Cruiser', **kwargs)
 
 
 class Effect581(BaseEffect):
@@ -1608,10 +1619,10 @@ class Effect581(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, container, context):
+    def handler(fit, container, context, **kwargs):
         level = container.level if 'skill' in context else 1
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Gunnery'),
-                                      'cpu', container.getModifiedItemAttr('cpuNeedBonus') * level)
+                                      'cpu', container.getModifiedItemAttr('cpuNeedBonus') * level, **kwargs)
 
 
 class Effect582(BaseEffect):
@@ -1625,9 +1636,9 @@ class Effect582(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, skill, context):
+    def handler(fit, skill, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Gunnery'),
-                                      'speed', skill.getModifiedItemAttr('rofBonus') * skill.level)
+                                      'speed', skill.getModifiedItemAttr('rofBonus') * skill.level, **kwargs)
 
 
 class Effect584(BaseEffect):
@@ -1643,9 +1654,9 @@ class Effect584(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, implant, context):
+    def handler(fit, implant, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Gunnery'),
-                                      'damageMultiplier', implant.getModifiedItemAttr('damageMultiplierBonus'))
+                                      'damageMultiplier', implant.getModifiedItemAttr('damageMultiplierBonus'), **kwargs)
 
 
 class Effect587(BaseEffect):
@@ -1659,9 +1670,9 @@ class Effect587(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, skill, context):
+    def handler(fit, skill, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Energy Weapon',
-                                      'damageMultiplier', skill.getModifiedItemAttr('damageMultiplierBonus') * skill.level)
+                                      'damageMultiplier', skill.getModifiedItemAttr('damageMultiplierBonus') * skill.level, **kwargs)
 
 
 class Effect588(BaseEffect):
@@ -1675,9 +1686,9 @@ class Effect588(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, skill, context):
+    def handler(fit, skill, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Projectile Weapon',
-                                      'damageMultiplier', skill.getModifiedItemAttr('damageMultiplierBonus') * skill.level)
+                                      'damageMultiplier', skill.getModifiedItemAttr('damageMultiplierBonus') * skill.level, **kwargs)
 
 
 class Effect589(BaseEffect):
@@ -1691,9 +1702,9 @@ class Effect589(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, skill, context):
+    def handler(fit, skill, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Hybrid Weapon',
-                                      'damageMultiplier', skill.getModifiedItemAttr('damageMultiplierBonus') * skill.level)
+                                      'damageMultiplier', skill.getModifiedItemAttr('damageMultiplierBonus') * skill.level, **kwargs)
 
 
 class Effect590(BaseEffect):
@@ -1708,10 +1719,10 @@ class Effect590(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, container, context):
+    def handler(fit, container, context, **kwargs):
         level = container.level if 'skill' in context else 1
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Energy Pulse Weapons'),
-                                      'duration', container.getModifiedItemAttr('durationBonus') * level)
+                                      'duration', container.getModifiedItemAttr('durationBonus') * level, **kwargs)
 
 
 class Effect596(BaseEffect):
@@ -1725,8 +1736,8 @@ class Effect596(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
-        module.multiplyItemAttr('maxRange', module.getModifiedChargeAttr('weaponRangeMultiplier'))
+    def handler(fit, module, context, **kwargs):
+        module.multiplyItemAttr('maxRange', module.getModifiedChargeAttr('weaponRangeMultiplier'), **kwargs)
 
 
 class Effect598(BaseEffect):
@@ -1742,8 +1753,8 @@ class Effect598(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
-        module.multiplyItemAttr('speed', module.getModifiedChargeAttr('speedMultiplier') or 1)
+    def handler(fit, module, context, **kwargs):
+        module.multiplyItemAttr('speed', module.getModifiedChargeAttr('speedMultiplier') or 1, **kwargs)
 
 
 class Effect599(BaseEffect):
@@ -1762,8 +1773,8 @@ class Effect599(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
-        module.multiplyItemAttr('falloff', module.getModifiedChargeAttr('fallofMultiplier') or 1)
+    def handler(fit, module, context, **kwargs):
+        module.multiplyItemAttr('falloff', module.getModifiedChargeAttr('fallofMultiplier') or 1, **kwargs)
 
 
 class Effect600(BaseEffect):
@@ -1778,8 +1789,8 @@ class Effect600(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
-        module.multiplyItemAttr('trackingSpeed', module.getModifiedChargeAttr('trackingSpeedMultiplier'))
+    def handler(fit, module, context, **kwargs):
+        module.multiplyItemAttr('trackingSpeed', module.getModifiedChargeAttr('trackingSpeedMultiplier'), **kwargs)
 
 
 class Effect602(BaseEffect):
@@ -1797,9 +1808,9 @@ class Effect602(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Projectile Turret'),
-                                      'speed', ship.getModifiedItemAttr('shipBonusMC'), skill='Minmatar Cruiser')
+                                      'speed', ship.getModifiedItemAttr('shipBonusMC'), skill='Minmatar Cruiser', **kwargs)
 
 
 class Effect604(BaseEffect):
@@ -1817,9 +1828,9 @@ class Effect604(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Large Projectile Turret'),
-                                      'speed', ship.getModifiedItemAttr('shipBonusMB2'), skill='Minmatar Battleship')
+                                      'speed', ship.getModifiedItemAttr('shipBonusMB2'), skill='Minmatar Battleship', **kwargs)
 
 
 class Effect607(BaseEffect):
@@ -1834,13 +1845,13 @@ class Effect607(BaseEffect):
     type = 'active'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         # Set flag which is used to determine if ship is cloaked or not
         # This is used to apply cloak-only bonuses, like Black Ops' speed bonus
         # Doesn't apply to covops cloaks
         fit.extraAttributes['cloaked'] = True
         # Apply speed penalty
-        fit.ship.multiplyItemAttr('maxVelocity', module.getModifiedItemAttr('maxVelocityModifier'))
+        fit.ship.multiplyItemAttr('maxVelocity', module.getModifiedItemAttr('maxVelocityModifier'), **kwargs)
 
 
 class Effect623(BaseEffect):
@@ -1855,11 +1866,11 @@ class Effect623(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, container, context):
+    def handler(fit, container, context, **kwargs):
         level = container.level if 'skill' in context else 1
         fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Mining Drone Operation'),
                                      'miningAmount',
-                                     container.getModifiedItemAttr('miningAmountBonus') * level)
+                                     container.getModifiedItemAttr('miningAmountBonus') * level, **kwargs)
 
 
 class Effect627(BaseEffect):
@@ -1873,8 +1884,8 @@ class Effect627(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
-        fit.ship.increaseItemAttr('powerOutput', module.getModifiedItemAttr('powerIncrease'))
+    def handler(fit, module, context, **kwargs):
+        fit.ship.increaseItemAttr('powerOutput', module.getModifiedItemAttr('powerIncrease'), **kwargs)
 
 
 class Effect657(BaseEffect):
@@ -1890,10 +1901,10 @@ class Effect657(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         fit.ship.boostItemAttr('agility',
                                module.getModifiedItemAttr('agilityMultiplier'),
-                               stackingPenalties=True)
+                               stackingPenalties=True, **kwargs)
 
 
 class Effect660(BaseEffect):
@@ -1909,9 +1920,9 @@ class Effect660(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, skill, context):
+    def handler(fit, skill, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill(skill),
-                                        'emDamage', skill.getModifiedItemAttr('damageMultiplierBonus') * skill.level)
+                                        'emDamage', skill.getModifiedItemAttr('damageMultiplierBonus') * skill.level, **kwargs)
 
 
 class Effect661(BaseEffect):
@@ -1927,9 +1938,9 @@ class Effect661(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, skill, context):
+    def handler(fit, skill, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill(skill),
-                                        'explosiveDamage', skill.getModifiedItemAttr('damageMultiplierBonus') * skill.level)
+                                        'explosiveDamage', skill.getModifiedItemAttr('damageMultiplierBonus') * skill.level, **kwargs)
 
 
 class Effect662(BaseEffect):
@@ -1945,9 +1956,9 @@ class Effect662(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, skill, context):
+    def handler(fit, skill, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill(skill),
-                                        'thermalDamage', skill.getModifiedItemAttr('damageMultiplierBonus') * skill.level)
+                                        'thermalDamage', skill.getModifiedItemAttr('damageMultiplierBonus') * skill.level, **kwargs)
 
 
 class Effect668(BaseEffect):
@@ -1963,9 +1974,9 @@ class Effect668(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, skill, context):
+    def handler(fit, skill, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill(skill),
-                                        'kineticDamage', skill.getModifiedItemAttr('damageMultiplierBonus') * skill.level)
+                                        'kineticDamage', skill.getModifiedItemAttr('damageMultiplierBonus') * skill.level, **kwargs)
 
 
 class Effect670(BaseEffect):
@@ -1979,8 +1990,8 @@ class Effect670(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
-        fit.ship.increaseItemAttr('warpScrambleStatus', module.getModifiedItemAttr('warpScrambleStrength'))
+    def handler(fit, module, context, **kwargs):
+        fit.ship.increaseItemAttr('warpScrambleStatus', module.getModifiedItemAttr('warpScrambleStrength'), **kwargs)
 
 
 class Effect675(BaseEffect):
@@ -1994,9 +2005,9 @@ class Effect675(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, skill, context):
+    def handler(fit, skill, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Energy Pulse Weapons'),
-                                      'cpu', skill.getModifiedItemAttr('cpuNeedBonus') * skill.level)
+                                      'cpu', skill.getModifiedItemAttr('cpuNeedBonus') * skill.level, **kwargs)
 
 
 class Effect677(BaseEffect):
@@ -2011,10 +2022,10 @@ class Effect677(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, container, context):
+    def handler(fit, container, context, **kwargs):
         level = container.level if 'skill' in context else 1
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Missile Launcher Operation'),
-                                      'cpu', container.getModifiedItemAttr('cpuNeedBonus') * level)
+                                      'cpu', container.getModifiedItemAttr('cpuNeedBonus') * level, **kwargs)
 
 
 class Effect699(BaseEffect):
@@ -2031,11 +2042,11 @@ class Effect699(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, container, context):
+    def handler(fit, container, context, **kwargs):
         level = container.level if 'skill' in context else 1
         penalized = False if 'skill' in context or 'implant' in context or 'booster' in context else True
         fit.ship.boostItemAttr('scanResolution', container.getModifiedItemAttr('scanResolutionBonus') * level,
-                               stackingPenalties=penalized)
+                               stackingPenalties=penalized, **kwargs)
 
 
 class Effect706(BaseEffect):
@@ -2049,8 +2060,8 @@ class Effect706(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
-        fit.ship.increaseItemAttr('warpFactor', src.getModifiedItemAttr('eliteBonusCovertOps1'), skill='Covert Ops')
+    def handler(fit, src, context, **kwargs):
+        fit.ship.increaseItemAttr('warpFactor', src.getModifiedItemAttr('eliteBonusCovertOps1'), skill='Covert Ops', **kwargs)
 
 
 class Effect726(BaseEffect):
@@ -2066,14 +2077,14 @@ class Effect726(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         # TODO: investigate if we can live without such ifs or hardcoding
         # Viator doesn't have GI bonus
         if 'shipBonusGI' in fit.ship.item.attributes:
             bonusAttr = 'shipBonusGI'
         else:
             bonusAttr = 'shipBonusGI2'
-        fit.ship.boostItemAttr('capacity', ship.getModifiedItemAttr(bonusAttr), skill='Gallente Industrial')
+        fit.ship.boostItemAttr('capacity', ship.getModifiedItemAttr(bonusAttr), skill='Gallente Industrial', **kwargs)
 
 
 class Effect727(BaseEffect):
@@ -2088,8 +2099,8 @@ class Effect727(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
-        fit.ship.boostItemAttr('capacity', ship.getModifiedItemAttr('shipBonusCI'), skill='Caldari Industrial')
+    def handler(fit, ship, context, **kwargs):
+        fit.ship.boostItemAttr('capacity', ship.getModifiedItemAttr('shipBonusCI'), skill='Caldari Industrial', **kwargs)
 
 
 class Effect728(BaseEffect):
@@ -2104,8 +2115,8 @@ class Effect728(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
-        fit.ship.boostItemAttr('capacity', ship.getModifiedItemAttr('shipBonusMI'), skill='Minmatar Industrial')
+    def handler(fit, ship, context, **kwargs):
+        fit.ship.boostItemAttr('capacity', ship.getModifiedItemAttr('shipBonusMI'), skill='Minmatar Industrial', **kwargs)
 
 
 class Effect729(BaseEffect):
@@ -2123,14 +2134,14 @@ class Effect729(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         # TODO: investigate if we can live without such ifs or hardcoding
         # Viator doesn't have GI bonus
         if 'shipBonusGI' in fit.ship.item.attributes:
             bonusAttr = 'shipBonusGI'
         else:
             bonusAttr = 'shipBonusGI2'
-        fit.ship.boostItemAttr('maxVelocity', ship.getModifiedItemAttr(bonusAttr), skill='Gallente Industrial')
+        fit.ship.boostItemAttr('maxVelocity', ship.getModifiedItemAttr(bonusAttr), skill='Gallente Industrial', **kwargs)
 
 
 class Effect730(BaseEffect):
@@ -2145,8 +2156,8 @@ class Effect730(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
-        fit.ship.boostItemAttr('maxVelocity', ship.getModifiedItemAttr('shipBonusCI'), skill='Caldari Industrial')
+    def handler(fit, ship, context, **kwargs):
+        fit.ship.boostItemAttr('maxVelocity', ship.getModifiedItemAttr('shipBonusCI'), skill='Caldari Industrial', **kwargs)
 
 
 class Effect732(BaseEffect):
@@ -2161,8 +2172,8 @@ class Effect732(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
-        fit.ship.boostItemAttr('maxVelocity', ship.getModifiedItemAttr('shipBonusAI'), skill='Amarr Industrial')
+    def handler(fit, ship, context, **kwargs):
+        fit.ship.boostItemAttr('maxVelocity', ship.getModifiedItemAttr('shipBonusAI'), skill='Amarr Industrial', **kwargs)
 
 
 class Effect736(BaseEffect):
@@ -2177,8 +2188,8 @@ class Effect736(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
-        fit.ship.boostItemAttr('capacitorCapacity', ship.getModifiedItemAttr('shipBonusAB2'), skill='Amarr Battleship')
+    def handler(fit, ship, context, **kwargs):
+        fit.ship.boostItemAttr('capacitorCapacity', ship.getModifiedItemAttr('shipBonusAB2'), skill='Amarr Battleship', **kwargs)
 
 
 class Effect744(BaseEffect):
@@ -2193,10 +2204,10 @@ class Effect744(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, container, context):
+    def handler(fit, container, context, **kwargs):
         level = container.level if 'skill' in context else 1
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('CPU Management'),
-                                      'duration', container.getModifiedItemAttr('scanspeedBonus') * level)
+                                      'duration', container.getModifiedItemAttr('scanspeedBonus') * level, **kwargs)
 
 
 class Effect754(BaseEffect):
@@ -2210,9 +2221,9 @@ class Effect754(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Hybrid Turret'),
-                                      'damageMultiplier', ship.getModifiedItemAttr('shipBonusCF'), skill='Caldari Frigate')
+                                      'damageMultiplier', ship.getModifiedItemAttr('shipBonusCF'), skill='Caldari Frigate', **kwargs)
 
 
 class Effect757(BaseEffect):
@@ -2229,9 +2240,9 @@ class Effect757(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Energy Turret'), 'damageMultiplier',
-                                      src.getModifiedItemAttr('shipBonusAF'), skill='Amarr Frigate')
+                                      src.getModifiedItemAttr('shipBonusAF'), skill='Amarr Frigate', **kwargs)
 
 
 class Effect760(BaseEffect):
@@ -2247,9 +2258,9 @@ class Effect760(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Missile Launcher Operation'),
-                                      'speed', ship.getModifiedItemAttr('shipBonusCF2'), skill='Caldari Frigate')
+                                      'speed', ship.getModifiedItemAttr('shipBonusCF2'), skill='Caldari Frigate', **kwargs)
 
 
 class Effect763(BaseEffect):
@@ -2263,12 +2274,12 @@ class Effect763(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, container, context):
+    def handler(fit, container, context, **kwargs):
         for dmgType in ('em', 'kinetic', 'explosive', 'thermal'):
             fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
                                                '%sDamage' % dmgType,
                                                container.getModifiedItemAttr('missileDamageMultiplierBonus'),
-                                               stackingPenalties=True)
+                                               stackingPenalties=True, **kwargs)
 
 
 class Effect784(BaseEffect):
@@ -2285,12 +2296,12 @@ class Effect784(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, container, context):
+    def handler(fit, container, context, **kwargs):
         level = container.level if 'skill' in context else 1
         penalized = False if 'skill' in context or 'implant' in context or 'booster' in context else True
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
                                         'explosionDelay', container.getModifiedItemAttr('maxFlightTimeBonus') * level,
-                                        stackingPenalties=penalized)
+                                        stackingPenalties=penalized, **kwargs)
 
 
 class Effect804(BaseEffect):
@@ -2304,12 +2315,12 @@ class Effect804(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         # Dirty hack to work around cap charges setting cap booster
         # injection amount to zero
         rawAttr = module.item.getAttribute('capacitorNeed')
         if rawAttr is not None and rawAttr >= 0:
-            module.boostItemAttr('capacitorNeed', module.getModifiedChargeAttr('capNeedBonus') or 0)
+            module.boostItemAttr('capacitorNeed', module.getModifiedChargeAttr('capNeedBonus') or 0, **kwargs)
 
 
 class Effect836(BaseEffect):
@@ -2323,8 +2334,8 @@ class Effect836(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
-        fit.ship.boostItemAttr('capacity', module.getModifiedItemAttr('cargoCapacityBonus'))
+    def handler(fit, module, context, **kwargs):
+        fit.ship.boostItemAttr('capacity', module.getModifiedItemAttr('cargoCapacityBonus'), **kwargs)
 
 
 class Effect848(BaseEffect):
@@ -2338,10 +2349,10 @@ class Effect848(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, skill, context):
+    def handler(fit, skill, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Cloaking'),
                                       'cloakingTargetingDelay',
-                                      skill.getModifiedItemAttr('cloakingTargetingDelayBonus') * skill.level)
+                                      skill.getModifiedItemAttr('cloakingTargetingDelayBonus') * skill.level, **kwargs)
 
 
 class Effect854(BaseEffect):
@@ -2355,10 +2366,10 @@ class Effect854(BaseEffect):
     type = 'offline'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         fit.ship.multiplyItemAttr('scanResolution',
                                   module.getModifiedItemAttr('scanResolutionMultiplier'),
-                                  stackingPenalties=True, penaltyGroup='cloakingScanResolutionMultiplier')
+                                  stackingPenalties=True, penaltyGroup='cloakingScanResolutionMultiplier', **kwargs)
 
 
 class Effect856(BaseEffect):
@@ -2374,10 +2385,10 @@ class Effect856(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, container, context):
+    def handler(fit, container, context, **kwargs):
         penalized = False if 'skill' in context or 'implant' in context else True
         fit.ship.boostItemAttr('baseWarpSpeed', container.getModifiedItemAttr('WarpSBonus'),
-                               stackingPenalties=penalized)
+                               stackingPenalties=penalized, **kwargs)
 
 
 class Effect874(BaseEffect):
@@ -2391,9 +2402,9 @@ class Effect874(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Projectile Turret'),
-                                      'maxRange', ship.getModifiedItemAttr('shipBonusMF2'), skill='Minmatar Frigate')
+                                      'maxRange', ship.getModifiedItemAttr('shipBonusMF2'), skill='Minmatar Frigate', **kwargs)
 
 
 class Effect882(BaseEffect):
@@ -2408,9 +2419,9 @@ class Effect882(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Hybrid Turret'),
-                                      'maxRange', ship.getModifiedItemAttr('shipBonusCF2'), skill='Caldari Frigate')
+                                      'maxRange', ship.getModifiedItemAttr('shipBonusCF2'), skill='Caldari Frigate', **kwargs)
 
 
 class Effect887(BaseEffect):
@@ -2424,9 +2435,9 @@ class Effect887(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Large Energy Turret'),
-                                      'speed', ship.getModifiedItemAttr('shipBonusAB2'), skill='Amarr Battleship')
+                                      'speed', ship.getModifiedItemAttr('shipBonusAB2'), skill='Amarr Battleship', **kwargs)
 
 
 class Effect889(BaseEffect):
@@ -2440,10 +2451,10 @@ class Effect889(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill('Missile Launcher Operation'),
                                          'speed', module.getModifiedItemAttr('speedMultiplier'),
-                                         stackingPenalties=True)
+                                         stackingPenalties=True, **kwargs)
 
 
 class Effect891(BaseEffect):
@@ -2457,9 +2468,10 @@ class Effect891(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Cruise Missiles'),
-                                        'maxVelocity', ship.getModifiedItemAttr('shipBonusCB3'), skill='Caldari Battleship')
+                                        'maxVelocity', ship.getModifiedItemAttr('shipBonusCB3'),
+                                        skill='Caldari Battleship', **kwargs)
 
 
 class Effect892(BaseEffect):
@@ -2473,9 +2485,10 @@ class Effect892(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Torpedoes'),
-                                        'maxVelocity', ship.getModifiedItemAttr('shipBonusCB3'), skill='Caldari Battleship')
+                                        'maxVelocity', ship.getModifiedItemAttr('shipBonusCB3'),
+                                        skill='Caldari Battleship', **kwargs)
 
 
 class Effect896(BaseEffect):
@@ -2490,9 +2503,9 @@ class Effect896(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, container, context):
+    def handler(fit, container, context, **kwargs):
         fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == 'Cloaking Device',
-                                         'cpu', container.getModifiedItemAttr('cloakingCpuNeedBonus'))
+                                         'cpu', container.getModifiedItemAttr('cloakingCpuNeedBonus'), **kwargs)
 
 
 class Effect898(BaseEffect):
@@ -2508,9 +2521,10 @@ class Effect898(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
-                                        'kineticDamage', ship.getModifiedItemAttr('shipBonusCF'), skill='Caldari Frigate')
+                                        'kineticDamage', ship.getModifiedItemAttr('shipBonusCF'),
+                                        skill='Caldari Frigate', **kwargs)
 
 
 class Effect899(BaseEffect):
@@ -2526,9 +2540,10 @@ class Effect899(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
-                                        'kineticDamage', ship.getModifiedItemAttr('shipBonusCC'), skill='Caldari Cruiser')
+                                        'kineticDamage', ship.getModifiedItemAttr('shipBonusCC'),
+                                        skill='Caldari Cruiser', **kwargs)
 
 
 class Effect900(BaseEffect):
@@ -2542,9 +2557,10 @@ class Effect900(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Light Drone Operation'),
-                                     'thermalDamage', ship.getModifiedItemAttr('shipBonusGF2'), skill='Gallente Frigate')
+                                     'thermalDamage', ship.getModifiedItemAttr('shipBonusGF2'),
+                                     skill='Gallente Frigate', **kwargs)
 
 
 class Effect907(BaseEffect):
@@ -2559,9 +2575,10 @@ class Effect907(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Energy Turret'),
-                                      'speed', ship.getModifiedItemAttr('shipBonusAC2'), skill='Amarr Cruiser')
+                                      'speed', ship.getModifiedItemAttr('shipBonusAC2'),
+                                      skill='Amarr Cruiser', **kwargs)
 
 
 class Effect909(BaseEffect):
@@ -2575,8 +2592,9 @@ class Effect909(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
-        fit.ship.boostItemAttr('armorHP', ship.getModifiedItemAttr('shipBonusAC2'), skill='Amarr Cruiser')
+    def handler(fit, ship, context, **kwargs):
+        fit.ship.boostItemAttr('armorHP', ship.getModifiedItemAttr('shipBonusAC2'),
+                               skill='Amarr Cruiser', **kwargs)
 
 
 class Effect912(BaseEffect):
@@ -2590,9 +2608,10 @@ class Effect912(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Missile Launcher Operation'),
-                                      'speed', ship.getModifiedItemAttr('shipBonusCC2'), skill='Caldari Cruiser')
+                                      'speed', ship.getModifiedItemAttr('shipBonusCC2'),
+                                      skill='Caldari Cruiser', **kwargs)
 
 
 class Effect918(BaseEffect):
@@ -2606,8 +2625,9 @@ class Effect918(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
-        fit.extraAttributes.increase('maxActiveDrones', ship.getModifiedItemAttr('shipBonusGC2'), skill='Gallente Cruiser')
+    def handler(fit, ship, context, **kwargs):
+        fit.extraAttributes.increase('maxActiveDrones', ship.getModifiedItemAttr('shipBonusGC2'),
+                                     skill='Gallente Cruiser', **kwargs)
 
 
 class Effect919(BaseEffect):
@@ -2622,9 +2642,10 @@ class Effect919(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Hybrid Turret'),
-                                      'trackingSpeed', ship.getModifiedItemAttr('shipBonusGC2'), skill='Gallente Cruiser')
+                                      'trackingSpeed', ship.getModifiedItemAttr('shipBonusGC2'),
+                                      skill='Gallente Cruiser', **kwargs)
 
 
 class Effect958(BaseEffect):
@@ -2638,8 +2659,9 @@ class Effect958(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
-        fit.ship.boostItemAttr('armorEmDamageResonance', ship.getModifiedItemAttr('shipBonusAC2'), skill='Amarr Cruiser')
+    def handler(fit, ship, context, **kwargs):
+        fit.ship.boostItemAttr('armorEmDamageResonance', ship.getModifiedItemAttr('shipBonusAC2'),
+                               skill='Amarr Cruiser', **kwargs)
 
 
 class Effect959(BaseEffect):
@@ -2653,9 +2675,9 @@ class Effect959(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.ship.boostItemAttr('armorExplosiveDamageResonance', ship.getModifiedItemAttr('shipBonusAC2'),
-                               skill='Amarr Cruiser')
+                               skill='Amarr Cruiser', **kwargs)
 
 
 class Effect960(BaseEffect):
@@ -2669,9 +2691,9 @@ class Effect960(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.ship.boostItemAttr('armorKineticDamageResonance', ship.getModifiedItemAttr('shipBonusAC2'),
-                               skill='Amarr Cruiser')
+                               skill='Amarr Cruiser', **kwargs)
 
 
 class Effect961(BaseEffect):
@@ -2685,9 +2707,9 @@ class Effect961(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.ship.boostItemAttr('armorThermalDamageResonance', ship.getModifiedItemAttr('shipBonusAC2'),
-                               skill='Amarr Cruiser')
+                               skill='Amarr Cruiser', **kwargs)
 
 
 class Effect968(BaseEffect):
@@ -2703,10 +2725,10 @@ class Effect968(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Projectile Turret'),
                                       'damageMultiplier', ship.getModifiedItemAttr('shipBonusMC2'),
-                                      skill='Minmatar Cruiser')
+                                      skill='Minmatar Cruiser', **kwargs)
 
 
 class Effect980(BaseEffect):
@@ -2721,9 +2743,8 @@ class Effect980(BaseEffect):
     type = 'active'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.extraAttributes['cloaked'] = True
-        # TODO: Implement
 
 
 class Effect989(BaseEffect):
@@ -2739,9 +2760,10 @@ class Effect989(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Hybrid Turret'),
-                                      'maxRange', ship.getModifiedItemAttr('eliteBonusGunship1'), skill='Assault Frigates')
+                                      'maxRange', ship.getModifiedItemAttr('eliteBonusGunship1'),
+                                      skill='Assault Frigates', **kwargs)
 
 
 class Effect991(BaseEffect):
@@ -2755,9 +2777,10 @@ class Effect991(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Energy Turret'),
-                                      'maxRange', ship.getModifiedItemAttr('eliteBonusGunship1'), skill='Assault Frigates')
+                                      'maxRange', ship.getModifiedItemAttr('eliteBonusGunship1'),
+                                      skill='Assault Frigates', **kwargs)
 
 
 class Effect996(BaseEffect):
@@ -2771,10 +2794,10 @@ class Effect996(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Hybrid Turret'),
                                       'trackingSpeed', ship.getModifiedItemAttr('eliteBonusGunship2'),
-                                      skill='Assault Frigates')
+                                      skill='Assault Frigates', **kwargs)
 
 
 class Effect998(BaseEffect):
@@ -2788,9 +2811,10 @@ class Effect998(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Projectile Turret'),
-                                      'falloff', ship.getModifiedItemAttr('eliteBonusGunship2'), skill='Assault Frigates')
+                                      'falloff', ship.getModifiedItemAttr('eliteBonusGunship2'),
+                                      skill='Assault Frigates', **kwargs)
 
 
 class Effect999(BaseEffect):
@@ -2804,10 +2828,10 @@ class Effect999(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Operation'),
                                       'shieldBonus', ship.getModifiedItemAttr('eliteBonusGunship2'),
-                                      skill='Assault Frigates')
+                                      skill='Assault Frigates', **kwargs)
 
 
 class Effect1001(BaseEffect):
@@ -2821,8 +2845,9 @@ class Effect1001(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
-        fit.ship.boostItemAttr('rechargeRate', ship.getModifiedItemAttr('eliteBonusGunship2'), skill='Assault Frigates')
+    def handler(fit, ship, context, **kwargs):
+        fit.ship.boostItemAttr('rechargeRate', ship.getModifiedItemAttr('eliteBonusGunship2'),
+                               skill='Assault Frigates', **kwargs)
 
 
 class Effect1003(BaseEffect):
@@ -2836,9 +2861,9 @@ class Effect1003(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, skill, context):
+    def handler(fit, skill, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Pulse Laser Specialization'),
-                                      'damageMultiplier', skill.getModifiedItemAttr('damageMultiplierBonus') * skill.level)
+                                      'damageMultiplier', skill.getModifiedItemAttr('damageMultiplierBonus') * skill.level, **kwargs)
 
 
 class Effect1004(BaseEffect):
@@ -2852,9 +2877,9 @@ class Effect1004(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, skill, context):
+    def handler(fit, skill, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Beam Laser Specialization'),
-                                      'damageMultiplier', skill.getModifiedItemAttr('damageMultiplierBonus') * skill.level)
+                                      'damageMultiplier', skill.getModifiedItemAttr('damageMultiplierBonus') * skill.level, **kwargs)
 
 
 class Effect1005(BaseEffect):
@@ -2868,9 +2893,9 @@ class Effect1005(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, skill, context):
+    def handler(fit, skill, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Blaster Specialization'),
-                                      'damageMultiplier', skill.getModifiedItemAttr('damageMultiplierBonus') * skill.level)
+                                      'damageMultiplier', skill.getModifiedItemAttr('damageMultiplierBonus') * skill.level, **kwargs)
 
 
 class Effect1006(BaseEffect):
@@ -2884,9 +2909,9 @@ class Effect1006(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, skill, context):
+    def handler(fit, skill, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Railgun Specialization'),
-                                      'damageMultiplier', skill.getModifiedItemAttr('damageMultiplierBonus') * skill.level)
+                                      'damageMultiplier', skill.getModifiedItemAttr('damageMultiplierBonus') * skill.level, **kwargs)
 
 
 class Effect1007(BaseEffect):
@@ -2900,9 +2925,9 @@ class Effect1007(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, skill, context):
+    def handler(fit, skill, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Autocannon Specialization'),
-                                      'damageMultiplier', skill.getModifiedItemAttr('damageMultiplierBonus') * skill.level)
+                                      'damageMultiplier', skill.getModifiedItemAttr('damageMultiplierBonus') * skill.level, **kwargs)
 
 
 class Effect1008(BaseEffect):
@@ -2916,9 +2941,9 @@ class Effect1008(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, skill, context):
+    def handler(fit, skill, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Artillery Specialization'),
-                                      'damageMultiplier', skill.getModifiedItemAttr('damageMultiplierBonus') * skill.level)
+                                      'damageMultiplier', skill.getModifiedItemAttr('damageMultiplierBonus') * skill.level, **kwargs)
 
 
 class Effect1009(BaseEffect):
@@ -2932,9 +2957,9 @@ class Effect1009(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, skill, context):
+    def handler(fit, skill, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Pulse Laser Specialization'),
-                                      'damageMultiplier', skill.getModifiedItemAttr('damageMultiplierBonus') * skill.level)
+                                      'damageMultiplier', skill.getModifiedItemAttr('damageMultiplierBonus') * skill.level, **kwargs)
 
 
 class Effect1010(BaseEffect):
@@ -2948,9 +2973,9 @@ class Effect1010(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, skill, context):
+    def handler(fit, skill, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Beam Laser Specialization'),
-                                      'damageMultiplier', skill.getModifiedItemAttr('damageMultiplierBonus') * skill.level)
+                                      'damageMultiplier', skill.getModifiedItemAttr('damageMultiplierBonus') * skill.level, **kwargs)
 
 
 class Effect1011(BaseEffect):
@@ -2964,9 +2989,9 @@ class Effect1011(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, skill, context):
+    def handler(fit, skill, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Blaster Specialization'),
-                                      'damageMultiplier', skill.getModifiedItemAttr('damageMultiplierBonus') * skill.level)
+                                      'damageMultiplier', skill.getModifiedItemAttr('damageMultiplierBonus') * skill.level, **kwargs)
 
 
 class Effect1012(BaseEffect):
@@ -2980,9 +3005,9 @@ class Effect1012(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, skill, context):
+    def handler(fit, skill, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Railgun Specialization'),
-                                      'damageMultiplier', skill.getModifiedItemAttr('damageMultiplierBonus') * skill.level)
+                                      'damageMultiplier', skill.getModifiedItemAttr('damageMultiplierBonus') * skill.level, **kwargs)
 
 
 class Effect1013(BaseEffect):
@@ -2996,9 +3021,9 @@ class Effect1013(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, skill, context):
+    def handler(fit, skill, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Autocannon Specialization'),
-                                      'damageMultiplier', skill.getModifiedItemAttr('damageMultiplierBonus') * skill.level)
+                                      'damageMultiplier', skill.getModifiedItemAttr('damageMultiplierBonus') * skill.level, **kwargs)
 
 
 class Effect1014(BaseEffect):
@@ -3012,9 +3037,9 @@ class Effect1014(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, skill, context):
+    def handler(fit, skill, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Artillery Specialization'),
-                                      'damageMultiplier', skill.getModifiedItemAttr('damageMultiplierBonus') * skill.level)
+                                      'damageMultiplier', skill.getModifiedItemAttr('damageMultiplierBonus') * skill.level, **kwargs)
 
 
 class Effect1015(BaseEffect):
@@ -3028,9 +3053,9 @@ class Effect1015(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, skill, context):
+    def handler(fit, skill, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Large Pulse Laser Specialization'),
-                                      'damageMultiplier', skill.getModifiedItemAttr('damageMultiplierBonus') * skill.level)
+                                      'damageMultiplier', skill.getModifiedItemAttr('damageMultiplierBonus') * skill.level, **kwargs)
 
 
 class Effect1016(BaseEffect):
@@ -3044,9 +3069,9 @@ class Effect1016(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, skill, context):
+    def handler(fit, skill, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Large Beam Laser Specialization'),
-                                      'damageMultiplier', skill.getModifiedItemAttr('damageMultiplierBonus') * skill.level)
+                                      'damageMultiplier', skill.getModifiedItemAttr('damageMultiplierBonus') * skill.level, **kwargs)
 
 
 class Effect1017(BaseEffect):
@@ -3060,9 +3085,9 @@ class Effect1017(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, skill, context):
+    def handler(fit, skill, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Large Blaster Specialization'),
-                                      'damageMultiplier', skill.getModifiedItemAttr('damageMultiplierBonus') * skill.level)
+                                      'damageMultiplier', skill.getModifiedItemAttr('damageMultiplierBonus') * skill.level, **kwargs)
 
 
 class Effect1018(BaseEffect):
@@ -3076,9 +3101,9 @@ class Effect1018(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, skill, context):
+    def handler(fit, skill, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Large Railgun Specialization'),
-                                      'damageMultiplier', skill.getModifiedItemAttr('damageMultiplierBonus') * skill.level)
+                                      'damageMultiplier', skill.getModifiedItemAttr('damageMultiplierBonus') * skill.level, **kwargs)
 
 
 class Effect1019(BaseEffect):
@@ -3092,9 +3117,9 @@ class Effect1019(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, skill, context):
+    def handler(fit, skill, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Large Autocannon Specialization'),
-                                      'damageMultiplier', skill.getModifiedItemAttr('damageMultiplierBonus') * skill.level)
+                                      'damageMultiplier', skill.getModifiedItemAttr('damageMultiplierBonus') * skill.level, **kwargs)
 
 
 class Effect1020(BaseEffect):
@@ -3108,9 +3133,9 @@ class Effect1020(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, skill, context):
+    def handler(fit, skill, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Large Artillery Specialization'),
-                                      'damageMultiplier', skill.getModifiedItemAttr('damageMultiplierBonus') * skill.level)
+                                      'damageMultiplier', skill.getModifiedItemAttr('damageMultiplierBonus') * skill.level, **kwargs)
 
 
 class Effect1021(BaseEffect):
@@ -3124,10 +3149,10 @@ class Effect1021(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Hybrid Turret'),
                                       'damageMultiplier', ship.getModifiedItemAttr('eliteBonusGunship2'),
-                                      skill='Assault Frigates')
+                                      skill='Assault Frigates', **kwargs)
 
 
 class Effect1024(BaseEffect):
@@ -3142,9 +3167,10 @@ class Effect1024(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Missiles'),
-                                        'maxVelocity', ship.getModifiedItemAttr('shipBonusCC2'), skill='Caldari Cruiser')
+                                        'maxVelocity', ship.getModifiedItemAttr('shipBonusCC2'),
+                                        skill='Caldari Cruiser', **kwargs)
 
 
 class Effect1025(BaseEffect):
@@ -3159,9 +3185,10 @@ class Effect1025(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Light Missiles'),
-                                        'maxVelocity', ship.getModifiedItemAttr('shipBonusCC2'), skill='Caldari Cruiser')
+                                        'maxVelocity', ship.getModifiedItemAttr('shipBonusCC2'),
+                                        skill='Caldari Cruiser', **kwargs)
 
 
 class Effect1030(BaseEffect):
@@ -3177,10 +3204,10 @@ class Effect1030(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, container, context):
+    def handler(fit, container, context, **kwargs):
         level = container.level if 'skill' in context else 1
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Remote Armor Repair Systems'),
-                                      'capacitorNeed', container.getModifiedItemAttr('capNeedBonus') * level)
+                                      'capacitorNeed', container.getModifiedItemAttr('capNeedBonus') * level, **kwargs)
 
 
 class Effect1033(BaseEffect):
@@ -3194,9 +3221,9 @@ class Effect1033(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Remote Armor Repair Systems'), 'capacitorNeed',
-                                      src.getModifiedItemAttr('eliteBonusLogistics1'), skill='Logistics Cruisers')
+                                      src.getModifiedItemAttr('eliteBonusLogistics1'), skill='Logistics Cruisers', **kwargs)
 
 
 class Effect1034(BaseEffect):
@@ -3211,9 +3238,9 @@ class Effect1034(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Remote Armor Repair Systems'), 'capacitorNeed',
-                                      src.getModifiedItemAttr('eliteBonusLogistics2'), skill='Logistics Cruisers')
+                                      src.getModifiedItemAttr('eliteBonusLogistics2'), skill='Logistics Cruisers', **kwargs)
 
 
 class Effect1035(BaseEffect):
@@ -3227,9 +3254,9 @@ class Effect1035(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Emission Systems'), 'capacitorNeed',
-                                      src.getModifiedItemAttr('eliteBonusLogistics2'), skill='Logistics Cruisers')
+                                      src.getModifiedItemAttr('eliteBonusLogistics2'), skill='Logistics Cruisers', **kwargs)
 
 
 class Effect1036(BaseEffect):
@@ -3244,9 +3271,9 @@ class Effect1036(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Emission Systems'), 'capacitorNeed',
-                                      src.getModifiedItemAttr('eliteBonusLogistics1'), skill='Logistics Cruisers')
+                                      src.getModifiedItemAttr('eliteBonusLogistics1'), skill='Logistics Cruisers', **kwargs)
 
 
 class Effect1046(BaseEffect):
@@ -3260,9 +3287,9 @@ class Effect1046(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Remote Armor Repair Systems'), 'maxRange',
-                                      src.getModifiedItemAttr('shipBonusGC'), skill='Gallente Cruiser')
+                                      src.getModifiedItemAttr('shipBonusGC'), skill='Gallente Cruiser', **kwargs)
 
 
 class Effect1047(BaseEffect):
@@ -3276,9 +3303,9 @@ class Effect1047(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Remote Armor Repair Systems'), 'maxRange',
-                                      src.getModifiedItemAttr('shipBonusAC2'), skill='Amarr Cruiser')
+                                      src.getModifiedItemAttr('shipBonusAC2'), skill='Amarr Cruiser', **kwargs)
 
 
 class Effect1048(BaseEffect):
@@ -3293,9 +3320,9 @@ class Effect1048(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Emission Systems'), 'maxRange',
-                                      src.getModifiedItemAttr('shipBonusCC'), skill='Caldari Cruiser')
+                                      src.getModifiedItemAttr('shipBonusCC'), skill='Caldari Cruiser', **kwargs)
 
 
 class Effect1049(BaseEffect):
@@ -3309,9 +3336,9 @@ class Effect1049(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Emission Systems'), 'maxRange',
-                                      src.getModifiedItemAttr('shipBonusMC2'), skill='Minmatar Cruiser')
+                                      src.getModifiedItemAttr('shipBonusMC2'), skill='Minmatar Cruiser', **kwargs)
 
 
 class Effect1056(BaseEffect):
@@ -3325,10 +3352,10 @@ class Effect1056(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Hybrid Turret'),
                                       'maxRange', ship.getModifiedItemAttr('eliteBonusHeavyGunship1'),
-                                      skill='Heavy Assault Cruisers')
+                                      skill='Heavy Assault Cruisers', **kwargs)
 
 
 class Effect1057(BaseEffect):
@@ -3342,10 +3369,10 @@ class Effect1057(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Projectile Turret'),
                                       'maxRange', ship.getModifiedItemAttr('eliteBonusHeavyGunship1'),
-                                      skill='Heavy Assault Cruisers')
+                                      skill='Heavy Assault Cruisers', **kwargs)
 
 
 class Effect1058(BaseEffect):
@@ -3359,10 +3386,10 @@ class Effect1058(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Energy Turret'),
                                       'maxRange', ship.getModifiedItemAttr('eliteBonusHeavyGunship1'),
-                                      skill='Heavy Assault Cruisers')
+                                      skill='Heavy Assault Cruisers', **kwargs)
 
 
 class Effect1060(BaseEffect):
@@ -3376,10 +3403,10 @@ class Effect1060(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Projectile Turret'),
                                       'falloff', ship.getModifiedItemAttr('eliteBonusHeavyGunship1'),
-                                      skill='Heavy Assault Cruisers')
+                                      skill='Heavy Assault Cruisers', **kwargs)
 
 
 class Effect1061(BaseEffect):
@@ -3394,10 +3421,10 @@ class Effect1061(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Hybrid Turret'),
                                       'damageMultiplier', ship.getModifiedItemAttr('eliteBonusHeavyGunship2'),
-                                      skill='Heavy Assault Cruisers')
+                                      skill='Heavy Assault Cruisers', **kwargs)
 
 
 class Effect1062(BaseEffect):
@@ -3411,10 +3438,10 @@ class Effect1062(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Energy Turret'),
                                       'damageMultiplier', ship.getModifiedItemAttr('eliteBonusHeavyGunship2'),
-                                      skill='Heavy Assault Cruisers')
+                                      skill='Heavy Assault Cruisers', **kwargs)
 
 
 class Effect1063(BaseEffect):
@@ -3428,10 +3455,10 @@ class Effect1063(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Projectile Turret'),
                                       'trackingSpeed', ship.getModifiedItemAttr('eliteBonusHeavyGunship2'),
-                                      skill='Heavy Assault Cruisers')
+                                      skill='Heavy Assault Cruisers', **kwargs)
 
 
 class Effect1080(BaseEffect):
@@ -3445,10 +3472,10 @@ class Effect1080(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Hybrid Turret'),
                                       'falloff', ship.getModifiedItemAttr('eliteBonusHeavyGunship1'),
-                                      skill='Heavy Assault Cruisers')
+                                      skill='Heavy Assault Cruisers', **kwargs)
 
 
 class Effect1081(BaseEffect):
@@ -3462,10 +3489,10 @@ class Effect1081(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Missiles'),
                                         'explosionDelay', ship.getModifiedItemAttr('eliteBonusHeavyGunship1'),
-                                        skill='Heavy Assault Cruisers')
+                                        skill='Heavy Assault Cruisers', **kwargs)
 
 
 class Effect1082(BaseEffect):
@@ -3479,10 +3506,10 @@ class Effect1082(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Light Missiles'),
                                         'explosionDelay', ship.getModifiedItemAttr('eliteBonusHeavyGunship1'),
-                                        skill='Heavy Assault Cruisers')
+                                        skill='Heavy Assault Cruisers', **kwargs)
 
 
 class Effect1084(BaseEffect):
@@ -3496,9 +3523,9 @@ class Effect1084(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.extraAttributes.increase('droneControlRange', ship.getModifiedItemAttr('eliteBonusHeavyGunship1'),
-                                     skill='Heavy Assault Cruisers')
+                                     skill='Heavy Assault Cruisers', **kwargs)
 
 
 class Effect1087(BaseEffect):
@@ -3512,10 +3539,10 @@ class Effect1087(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Projectile Turret'),
                                       'damageMultiplier', ship.getModifiedItemAttr('eliteBonusHeavyGunship2'),
-                                      skill='Heavy Assault Cruisers')
+                                      skill='Heavy Assault Cruisers', **kwargs)
 
 
 class Effect1099(BaseEffect):
@@ -3531,9 +3558,10 @@ class Effect1099(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Projectile Turret'),
-                                      'trackingSpeed', ship.getModifiedItemAttr('shipBonusMF2'), skill='Minmatar Frigate')
+                                      'trackingSpeed', ship.getModifiedItemAttr('shipBonusMF2'),
+                                      skill='Minmatar Frigate', **kwargs)
 
 
 class Effect1176(BaseEffect):
@@ -3548,10 +3576,10 @@ class Effect1176(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, container, context):
+    def handler(fit, container, context, **kwargs):
         level = container.level if 'skill' in context else 1
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Propulsion Module',
-                                      'speedFactor', container.getModifiedItemAttr('speedFBonus') * level)
+                                      'speedFactor', container.getModifiedItemAttr('speedFBonus') * level, **kwargs)
 
 
 class Effect1179(BaseEffect):
@@ -3565,10 +3593,10 @@ class Effect1179(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Energy Turret'),
                                       'damageMultiplier', ship.getModifiedItemAttr('eliteBonusGunship2'),
-                                      skill='Assault Frigates')
+                                      skill='Assault Frigates', **kwargs)
 
 
 class Effect1181(BaseEffect):
@@ -3582,10 +3610,10 @@ class Effect1181(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Remote Capacitor Transmitter',
                                       'capacitorNeed', ship.getModifiedItemAttr('eliteBonusLogistics1'),
-                                      skill='Logistics Cruisers')
+                                      skill='Logistics Cruisers', **kwargs)
 
 
 class Effect1182(BaseEffect):
@@ -3599,9 +3627,10 @@ class Effect1182(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Remote Capacitor Transmitter',
-                                      'maxRange', ship.getModifiedItemAttr('shipBonusAC'), skill='Amarr Cruiser')
+                                      'maxRange', ship.getModifiedItemAttr('shipBonusAC'),
+                                      skill='Amarr Cruiser', **kwargs)
 
 
 class Effect1183(BaseEffect):
@@ -3616,10 +3645,10 @@ class Effect1183(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Remote Capacitor Transmitter',
                                       'capacitorNeed', ship.getModifiedItemAttr('eliteBonusLogistics2'),
-                                      skill='Logistics Cruisers')
+                                      skill='Logistics Cruisers', **kwargs)
 
 
 class Effect1184(BaseEffect):
@@ -3634,9 +3663,10 @@ class Effect1184(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Remote Capacitor Transmitter',
-                                      'maxRange', ship.getModifiedItemAttr('shipBonusCC2'), skill='Caldari Cruiser')
+                                      'maxRange', ship.getModifiedItemAttr('shipBonusCC2'),
+                                      skill='Caldari Cruiser', **kwargs)
 
 
 class Effect1185(BaseEffect):
@@ -3651,8 +3681,8 @@ class Effect1185(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, implant, context):
-        fit.ship.boostItemAttr('signatureRadius', implant.getModifiedItemAttr('signatureRadiusBonus'))
+    def handler(fit, implant, context, **kwargs):
+        fit.ship.boostItemAttr('signatureRadius', implant.getModifiedItemAttr('signatureRadiusBonus'), **kwargs)
 
 
 class Effect1190(BaseEffect):
@@ -3668,10 +3698,10 @@ class Effect1190(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, container, context):
+    def handler(fit, container, context, **kwargs):
         level = container.level if 'skill' in context else 1
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Ice Harvesting'),
-                                      'duration', container.getModifiedItemAttr('iceHarvestCycleBonus') * level)
+                                      'duration', container.getModifiedItemAttr('iceHarvestCycleBonus') * level, **kwargs)
 
 
 class Effect1200(BaseEffect):
@@ -3686,10 +3716,9 @@ class Effect1200(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         module.multiplyItemAttr('specialtyMiningAmount',
-                                module.getModifiedChargeAttr('specialisationAsteroidYieldMultiplier'))
-        # module.multiplyItemAttr('miningAmount', module.getModifiedChargeAttr('specialisationAsteroidYieldMultiplier'))
+                                module.getModifiedChargeAttr('specialisationAsteroidYieldMultiplier'), **kwargs)
 
 
 class Effect1212(BaseEffect):
@@ -3704,8 +3733,8 @@ class Effect1212(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
-        module.preAssignItemAttr('specialtyMiningAmount', module.getModifiedItemAttr('miningAmount'))
+    def handler(fit, module, context, **kwargs):
+        module.preAssignItemAttr('specialtyMiningAmount', module.getModifiedItemAttr('miningAmount'), **kwargs)
 
 
 class Effect1215(BaseEffect):
@@ -3721,9 +3750,10 @@ class Effect1215(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Energy Nosferatu',
-                                      'powerTransferAmount', ship.getModifiedItemAttr('shipBonusAF'), skill='Amarr Frigate')
+                                      'powerTransferAmount', ship.getModifiedItemAttr('shipBonusAF'),
+                                      skill='Amarr Frigate', **kwargs)
 
 
 class Effect1218(BaseEffect):
@@ -3739,9 +3769,9 @@ class Effect1218(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Hybrid Turret'),
-                                      'damageMultiplier', ship.getModifiedItemAttr('shipBonusRole7'))
+                                      'damageMultiplier', ship.getModifiedItemAttr('shipBonusRole7'), **kwargs)
 
 
 class Effect1219(BaseEffect):
@@ -3755,10 +3785,10 @@ class Effect1219(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Energy Nosferatu',
                                       'powerTransferAmount', ship.getModifiedItemAttr('shipBonusAB'),
-                                      skill='Amarr Battleship')
+                                      skill='Amarr Battleship', **kwargs)
 
 
 class Effect1220(BaseEffect):
@@ -3774,9 +3804,10 @@ class Effect1220(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Energy Nosferatu',
-                                      'powerTransferAmount', ship.getModifiedItemAttr('shipBonusAC'), skill='Amarr Cruiser')
+                                      'powerTransferAmount', ship.getModifiedItemAttr('shipBonusAC'),
+                                      skill='Amarr Cruiser', **kwargs)
 
 
 class Effect1221(BaseEffect):
@@ -3790,9 +3821,10 @@ class Effect1221(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Stasis Web',
-                                      'maxRange', ship.getModifiedItemAttr('shipBonusMB'), skill='Minmatar Battleship')
+                                      'maxRange', ship.getModifiedItemAttr('shipBonusMB'),
+                                      skill='Minmatar Battleship', **kwargs)
 
 
 class Effect1222(BaseEffect):
@@ -3806,9 +3838,10 @@ class Effect1222(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Stasis Web',
-                                      'maxRange', ship.getModifiedItemAttr('shipBonusMC2'), skill='Minmatar Cruiser')
+                                      'maxRange', ship.getModifiedItemAttr('shipBonusMC2'),
+                                      skill='Minmatar Cruiser', **kwargs)
 
 
 class Effect1228(BaseEffect):
@@ -3823,9 +3856,9 @@ class Effect1228(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Projectile Turret'),
-                                      'trackingSpeed', ship.getModifiedItemAttr('shipBonusGF'), skill='Gallente Frigate')
+                                      'trackingSpeed', ship.getModifiedItemAttr('shipBonusGF'), skill='Gallente Frigate', **kwargs)
 
 
 class Effect1230(BaseEffect):
@@ -3841,9 +3874,9 @@ class Effect1230(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
-                                        'maxVelocity', ship.getModifiedItemAttr('shipBonusRole7'))
+                                        'maxVelocity', ship.getModifiedItemAttr('shipBonusRole7'), **kwargs)
 
 
 class Effect1232(BaseEffect):
@@ -3858,9 +3891,9 @@ class Effect1232(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Projectile Turret'),
-                                      'speed', ship.getModifiedItemAttr('shipBonusRole7'))
+                                      'speed', ship.getModifiedItemAttr('shipBonusRole7'), **kwargs)
 
 
 class Effect1233(BaseEffect):
@@ -3875,9 +3908,9 @@ class Effect1233(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Hybrid Turret'),
-                                      'damageMultiplier', ship.getModifiedItemAttr('shipBonusRole7'))
+                                      'damageMultiplier', ship.getModifiedItemAttr('shipBonusRole7'), **kwargs)
 
 
 class Effect1234(BaseEffect):
@@ -3892,9 +3925,9 @@ class Effect1234(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Light Missiles'),
-                                        'maxVelocity', ship.getModifiedItemAttr('shipBonusRole7'))
+                                        'maxVelocity', ship.getModifiedItemAttr('shipBonusRole7'), **kwargs)
 
 
 class Effect1239(BaseEffect):
@@ -3908,9 +3941,9 @@ class Effect1239(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Large Projectile Turret'),
-                                      'speed', ship.getModifiedItemAttr('shipBonusRole7'))
+                                      'speed', ship.getModifiedItemAttr('shipBonusRole7'), **kwargs)
 
 
 class Effect1240(BaseEffect):
@@ -3924,9 +3957,9 @@ class Effect1240(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Large Hybrid Turret'),
-                                      'damageMultiplier', ship.getModifiedItemAttr('shipBonusRole7'))
+                                      'damageMultiplier', ship.getModifiedItemAttr('shipBonusRole7'), **kwargs)
 
 
 class Effect1255(BaseEffect):
@@ -3941,9 +3974,9 @@ class Effect1255(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, implant, context):
+    def handler(fit, implant, context, **kwargs):
         fit.appliedImplants.filteredItemMultiply(lambda mod: mod.item.group.name == 'Cyberimplant',
-                                                 'durationBonus', implant.getModifiedItemAttr('implantSetBloodraider'))
+                                                 'durationBonus', implant.getModifiedItemAttr('implantSetBloodraider'), **kwargs)
 
 
 class Effect1256(BaseEffect):
@@ -3957,9 +3990,9 @@ class Effect1256(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, implant, context):
+    def handler(fit, implant, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Capacitor Emission Systems'),
-                                      'duration', implant.getModifiedItemAttr('durationBonus'))
+                                      'duration', implant.getModifiedItemAttr('durationBonus'), **kwargs)
 
 
 class Effect1261(BaseEffect):
@@ -3974,9 +4007,9 @@ class Effect1261(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, implant, context):
+    def handler(fit, implant, context, **kwargs):
         fit.appliedImplants.filteredItemMultiply(lambda mod: mod.item.group.name == 'Cyberimplant',
-                                                 'velocityBonus', implant.getModifiedItemAttr('implantSetSerpentis'))
+                                                 'velocityBonus', implant.getModifiedItemAttr('implantSetSerpentis'), **kwargs)
 
 
 class Effect1264(BaseEffect):
@@ -3990,10 +4023,10 @@ class Effect1264(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Hybrid Turret'),
                                       'trackingSpeed', ship.getModifiedItemAttr('eliteBonusInterceptor2'),
-                                      skill='Interceptors')
+                                      skill='Interceptors', **kwargs)
 
 
 class Effect1268(BaseEffect):
@@ -4007,10 +4040,10 @@ class Effect1268(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Energy Turret'),
                                       'trackingSpeed', ship.getModifiedItemAttr('eliteBonusInterceptor2'),
-                                      skill='Interceptors')
+                                      skill='Interceptors', **kwargs)
 
 
 class Effect1281(BaseEffect):
@@ -4026,11 +4059,11 @@ class Effect1281(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, container, context):
+    def handler(fit, container, context, **kwargs):
         penalized = 'implant' not in context
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Repair Systems'),
                                       'armorDamageAmount', container.getModifiedItemAttr('repairBonus'),
-                                      stackingPenalties=penalized)
+                                      stackingPenalties=penalized, **kwargs)
 
 
 class Effect1318(BaseEffect):
@@ -4045,14 +4078,14 @@ class Effect1318(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, container, context):
+    def handler(fit, container, context, **kwargs):
         groups = ('ECM', 'Burst Jammer')
         level = container.level if 'skill' in context else 1
         for scanType in ('Gravimetric', 'Ladar', 'Magnetometric', 'Radar'):
             fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in groups,
                                           'scan{0}StrengthBonus'.format(scanType),
                                           container.getModifiedItemAttr('scanSkillEwStrengthBonus') * level,
-                                          stackingPenalties=False if 'skill' in context else True)
+                                          stackingPenalties=False if 'skill' in context else True, **kwargs)
 
 
 class Effect1360(BaseEffect):
@@ -4067,10 +4100,10 @@ class Effect1360(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, container, context):
+    def handler(fit, container, context, **kwargs):
         level = container.level if 'skill' in context else 1
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Sensor Linking'),
-                                      'capacitorNeed', container.getModifiedItemAttr('capNeedBonus') * level)
+                                      'capacitorNeed', container.getModifiedItemAttr('capNeedBonus') * level, **kwargs)
 
 
 class Effect1361(BaseEffect):
@@ -4085,10 +4118,10 @@ class Effect1361(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, container, context):
+    def handler(fit, container, context, **kwargs):
         level = container.level if 'skill' in context else 1
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Weapon Disruption'),
-                                      'capacitorNeed', container.getModifiedItemAttr('capNeedBonus') * level)
+                                      'capacitorNeed', container.getModifiedItemAttr('capNeedBonus') * level, **kwargs)
 
 
 class Effect1370(BaseEffect):
@@ -4103,10 +4136,10 @@ class Effect1370(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, container, context):
+    def handler(fit, container, context, **kwargs):
         level = container.level if 'skill' in context else 1
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Target Painting'),
-                                      'capacitorNeed', container.getModifiedItemAttr('capNeedBonus') * level)
+                                      'capacitorNeed', container.getModifiedItemAttr('capNeedBonus') * level, **kwargs)
 
 
 class Effect1372(BaseEffect):
@@ -4122,10 +4155,10 @@ class Effect1372(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, container, context):
+    def handler(fit, container, context, **kwargs):
         level = container.level if 'skill' in context else 1
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'ECM',
-                                      'capacitorNeed', container.getModifiedItemAttr('capNeedBonus') * level)
+                                      'capacitorNeed', container.getModifiedItemAttr('capNeedBonus') * level, **kwargs)
 
 
 class Effect1395(BaseEffect):
@@ -4139,9 +4172,9 @@ class Effect1395(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, container, context):
+    def handler(fit, container, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Operation'),
-                                      'shieldBonus', container.getModifiedItemAttr('shieldBoostMultiplier'))
+                                      'shieldBonus', container.getModifiedItemAttr('shieldBoostMultiplier'), **kwargs)
 
 
 class Effect1397(BaseEffect):
@@ -4156,9 +4189,9 @@ class Effect1397(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, implant, context):
+    def handler(fit, implant, context, **kwargs):
         fit.appliedImplants.filteredItemMultiply(lambda mod: mod.item.group.name == 'Cyberimplant',
-                                                 'shieldBoostMultiplier', implant.getModifiedItemAttr('implantSetGuristas'))
+                                                 'shieldBoostMultiplier', implant.getModifiedItemAttr('implantSetGuristas'), **kwargs)
 
 
 class Effect1409(BaseEffect):
@@ -4174,10 +4207,10 @@ class Effect1409(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, container, context):
+    def handler(fit, container, context, **kwargs):
         level = container.level if 'skill' in context else 1
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Astrometrics'),
-                                      'duration', container.getModifiedItemAttr('durationBonus') * level)
+                                      'duration', container.getModifiedItemAttr('durationBonus') * level, **kwargs)
 
 
 class Effect1410(BaseEffect):
@@ -4192,12 +4225,10 @@ class Effect1410(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, container, context):
-
+    def handler(fit, container, context, **kwargs):
         level = container.level if 'skill' in context else 1
-
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Propulsion Jamming'),
-                                      'capacitorNeed', container.getModifiedItemAttr('capNeedBonus') * level)
+                                      'capacitorNeed', container.getModifiedItemAttr('capNeedBonus') * level, **kwargs)
 
 
 class Effect1412(BaseEffect):
@@ -4211,9 +4242,9 @@ class Effect1412(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Large Hybrid Turret'),
-                                      'maxRange', ship.getModifiedItemAttr('shipBonusCB'), skill='Caldari Battleship')
+                                      'maxRange', ship.getModifiedItemAttr('shipBonusCB'), skill='Caldari Battleship', **kwargs)
 
 
 class Effect1434(BaseEffect):
@@ -4227,12 +4258,12 @@ class Effect1434(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         for sensorType in ('Gravimetric', 'Ladar', 'Magnetometric', 'Radar'):
             fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Electronic Warfare'),
                                           'scan{0}StrengthBonus'.format(sensorType),
                                           ship.getModifiedItemAttr('shipBonusCB'), stackingPenalties=True,
-                                          skill='Caldari Battleship')
+                                          skill='Caldari Battleship', **kwargs)
 
 
 class Effect1441(BaseEffect):
@@ -4246,9 +4277,10 @@ class Effect1441(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'ECM',
-                                      'maxRange', ship.getModifiedItemAttr('shipBonusCB3'), skill='Caldari Battleship')
+                                      'maxRange', ship.getModifiedItemAttr('shipBonusCB3'),
+                                      skill='Caldari Battleship', **kwargs)
 
 
 class Effect1442(BaseEffect):
@@ -4262,9 +4294,9 @@ class Effect1442(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'ECM',
-                                      'maxRange', ship.getModifiedItemAttr('shipBonusCC2'), skill='Caldari Cruiser')
+                                      'maxRange', ship.getModifiedItemAttr('shipBonusCC2'), skill='Caldari Cruiser', **kwargs)
 
 
 class Effect1443(BaseEffect):
@@ -4280,9 +4312,10 @@ class Effect1443(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'ECM',
-                                      'capacitorNeed', ship.getModifiedItemAttr('shipBonusCC'), skill='Caldari Cruiser')
+                                      'capacitorNeed', ship.getModifiedItemAttr('shipBonusCC'),
+                                      skill='Caldari Cruiser', **kwargs)
 
 
 class Effect1445(BaseEffect):
@@ -4297,11 +4330,11 @@ class Effect1445(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, container, context):
+    def handler(fit, container, context, **kwargs):
         level = container.level if 'skill' in context else 1
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Sensor Linking'),
                                       'maxRange', container.getModifiedItemAttr('rangeSkillBonus') * level,
-                                      stackingPenalties='skill' not in context)
+                                      stackingPenalties='skill' not in context, **kwargs)
 
 
 class Effect1446(BaseEffect):
@@ -4316,11 +4349,11 @@ class Effect1446(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, container, context):
+    def handler(fit, container, context, **kwargs):
         level = container.level if 'skill' in context else 1
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Target Painter',
                                       'maxRange', container.getModifiedItemAttr('rangeSkillBonus') * level,
-                                      stackingPenalties='skill' not in context)
+                                      stackingPenalties='skill' not in context, **kwargs)
 
 
 class Effect1448(BaseEffect):
@@ -4335,11 +4368,11 @@ class Effect1448(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, container, context):
+    def handler(fit, container, context, **kwargs):
         level = container.level if 'skill' in context else 1
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Weapon Disruptor',
                                       'maxRange', container.getModifiedItemAttr('rangeSkillBonus') * level,
-                                      stackingPenalties='skill' not in context)
+                                      stackingPenalties='skill' not in context, **kwargs)
 
 
 class Effect1449(BaseEffect):
@@ -4353,9 +4386,9 @@ class Effect1449(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, skill, context):
+    def handler(fit, skill, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Sensor Linking'),
-                                      'falloffEffectiveness', skill.getModifiedItemAttr('falloffBonus') * skill.level)
+                                      'falloffEffectiveness', skill.getModifiedItemAttr('falloffBonus') * skill.level, **kwargs)
 
 
 class Effect1450(BaseEffect):
@@ -4369,9 +4402,9 @@ class Effect1450(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, skill, context):
+    def handler(fit, skill, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Target Painter',
-                                      'falloffEffectiveness', skill.getModifiedItemAttr('falloffBonus') * skill.level)
+                                      'falloffEffectiveness', skill.getModifiedItemAttr('falloffBonus') * skill.level, **kwargs)
 
 
 class Effect1451(BaseEffect):
@@ -4385,9 +4418,9 @@ class Effect1451(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, skill, context):
+    def handler(fit, skill, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Weapon Disruptor',
-                                      'falloffEffectiveness', skill.getModifiedItemAttr('falloffBonus') * skill.level)
+                                      'falloffEffectiveness', skill.getModifiedItemAttr('falloffBonus') * skill.level, **kwargs)
 
 
 class Effect1452(BaseEffect):
@@ -4403,11 +4436,11 @@ class Effect1452(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, container, context):
+    def handler(fit, container, context, **kwargs):
         level = container.level if 'skill' in context else 1
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'ECM',
                                       'maxRange', container.getModifiedItemAttr('rangeSkillBonus') * level,
-                                      stackingPenalties='skill' not in context and 'implant' not in context)
+                                      stackingPenalties='skill' not in context and 'implant' not in context, **kwargs)
 
 
 class Effect1453(BaseEffect):
@@ -4421,9 +4454,9 @@ class Effect1453(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, skill, context):
+    def handler(fit, skill, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'ECM',
-                                      'falloffEffectiveness', skill.getModifiedItemAttr('falloffBonus') * skill.level)
+                                      'falloffEffectiveness', skill.getModifiedItemAttr('falloffBonus') * skill.level, **kwargs)
 
 
 class Effect1472(BaseEffect):
@@ -4439,12 +4472,12 @@ class Effect1472(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, container, context):
+    def handler(fit, container, context, **kwargs):
         level = container.level if 'skill' in context else 1
         penalize = False if 'skill' in context or 'implant' in context else True
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
                                         'aoeCloudSize', container.getModifiedItemAttr('aoeCloudSizeBonus') * level,
-                                        stackingPenalties=penalize)
+                                        stackingPenalties=penalize, **kwargs)
 
 
 class Effect1500(BaseEffect):
@@ -4459,10 +4492,10 @@ class Effect1500(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, container, context):
+    def handler(fit, container, context, **kwargs):
         level = container.level if 'skill' in context else 1
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Operation'),
-                                      'capacitorNeed', container.getModifiedItemAttr('shieldBoostCapacitorBonus') * level)
+                                      'capacitorNeed', container.getModifiedItemAttr('shieldBoostCapacitorBonus') * level, **kwargs)
 
 
 class Effect1550(BaseEffect):
@@ -4476,10 +4509,10 @@ class Effect1550(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, skill, context):
+    def handler(fit, skill, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Target Painter',
                                       'signatureRadiusBonus',
-                                      skill.getModifiedItemAttr('scanSkillTargetPaintStrengthBonus') * skill.level)
+                                      skill.getModifiedItemAttr('scanSkillTargetPaintStrengthBonus') * skill.level, **kwargs)
 
 
 class Effect1551(BaseEffect):
@@ -4494,10 +4527,10 @@ class Effect1551(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Target Painter',
                                       'signatureRadiusBonus', ship.getModifiedItemAttr('shipBonusMF2'),
-                                      skill='Minmatar Frigate')
+                                      skill='Minmatar Frigate', **kwargs)
 
 
 class Effect1577(BaseEffect):
@@ -4512,12 +4545,12 @@ class Effect1577(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, implant, context):
+    def handler(fit, implant, context, **kwargs):
         fit.appliedImplants.filteredItemMultiply(
             lambda implant: 'signatureRadiusBonus' in implant.itemModifiedAttributes and
                             'implantSetAngel' in implant.itemModifiedAttributes,
             'signatureRadiusBonus',
-            implant.getModifiedItemAttr('implantSetAngel'))
+            implant.getModifiedItemAttr('implantSetAngel'), **kwargs)
 
 
 class Effect1579(BaseEffect):
@@ -4533,9 +4566,9 @@ class Effect1579(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, implant, context):
+    def handler(fit, implant, context, **kwargs):
         fit.appliedImplants.filteredItemMultiply(lambda target: target.item.requiresSkill('Cybernetics'),
-                                                 'armorHpBonus', implant.getModifiedItemAttr('implantSetSansha') or 1)
+                                                 'armorHpBonus', implant.getModifiedItemAttr('implantSetSansha') or 1, **kwargs)
 
 
 class Effect1581(BaseEffect):
@@ -4549,8 +4582,8 @@ class Effect1581(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, skill, context):
-        fit.ship.boostItemAttr('jumpDriveRange', skill.getModifiedItemAttr('jumpDriveRangeBonus') * skill.level)
+    def handler(fit, skill, context, **kwargs):
+        fit.ship.boostItemAttr('jumpDriveRange', skill.getModifiedItemAttr('jumpDriveRangeBonus') * skill.level, **kwargs)
 
 
 class Effect1585(BaseEffect):
@@ -4564,9 +4597,9 @@ class Effect1585(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, skill, context):
+    def handler(fit, skill, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Capital Energy Turret'),
-                                      'damageMultiplier', skill.getModifiedItemAttr('damageMultiplierBonus') * skill.level)
+                                      'damageMultiplier', skill.getModifiedItemAttr('damageMultiplierBonus') * skill.level, **kwargs)
 
 
 class Effect1586(BaseEffect):
@@ -4580,9 +4613,9 @@ class Effect1586(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, skill, context):
+    def handler(fit, skill, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Capital Projectile Turret'),
-                                      'damageMultiplier', skill.getModifiedItemAttr('damageMultiplierBonus') * skill.level)
+                                      'damageMultiplier', skill.getModifiedItemAttr('damageMultiplierBonus') * skill.level, **kwargs)
 
 
 class Effect1587(BaseEffect):
@@ -4596,9 +4629,9 @@ class Effect1587(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, skill, context):
+    def handler(fit, skill, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Capital Hybrid Turret'),
-                                      'damageMultiplier', skill.getModifiedItemAttr('damageMultiplierBonus') * skill.level)
+                                      'damageMultiplier', skill.getModifiedItemAttr('damageMultiplierBonus') * skill.level, **kwargs)
 
 
 class Effect1588(BaseEffect):
@@ -4613,10 +4646,10 @@ class Effect1588(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, container, context):
+    def handler(fit, container, context, **kwargs):
         level = container.level if 'skill' in context else 1
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('XL Torpedoes'),
-                                        'kineticDamage', container.getModifiedItemAttr('damageMultiplierBonus') * level)
+                                        'kineticDamage', container.getModifiedItemAttr('damageMultiplierBonus') * level, **kwargs)
 
 
 class Effect1590(BaseEffect):
@@ -4632,12 +4665,12 @@ class Effect1590(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, container, context):
+    def handler(fit, container, context, **kwargs):
         level = container.level if 'skill' in context else 1
         penalize = False if 'skill' in context or 'implant' in context else True
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
                                         'aoeVelocity', container.getModifiedItemAttr('aoeVelocityBonus') * level,
-                                        stackingPenalties=penalize)
+                                        stackingPenalties=penalize, **kwargs)
 
 
 class Effect1592(BaseEffect):
@@ -4652,10 +4685,10 @@ class Effect1592(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, container, context):
+    def handler(fit, container, context, **kwargs):
         level = container.level if 'skill' in context else 1
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('XL Torpedoes'),
-                                        'emDamage', container.getModifiedItemAttr('damageMultiplierBonus') * level)
+                                        'emDamage', container.getModifiedItemAttr('damageMultiplierBonus') * level, **kwargs)
 
 
 class Effect1593(BaseEffect):
@@ -4670,10 +4703,10 @@ class Effect1593(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, container, context):
+    def handler(fit, container, context, **kwargs):
         level = container.level if 'skill' in context else 1
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('XL Torpedoes'),
-                                        'explosiveDamage', container.getModifiedItemAttr('damageMultiplierBonus') * level)
+                                        'explosiveDamage', container.getModifiedItemAttr('damageMultiplierBonus') * level, **kwargs)
 
 
 class Effect1594(BaseEffect):
@@ -4688,10 +4721,10 @@ class Effect1594(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, container, context):
+    def handler(fit, container, context, **kwargs):
         level = container.level if 'skill' in context else 1
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('XL Torpedoes'),
-                                        'thermalDamage', container.getModifiedItemAttr('damageMultiplierBonus') * level)
+                                        'thermalDamage', container.getModifiedItemAttr('damageMultiplierBonus') * level, **kwargs)
 
 
 class Effect1595(BaseEffect):
@@ -4706,10 +4739,10 @@ class Effect1595(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         mod = src.level if 'skill' in context else 1
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
-                                        'emDamage', src.getModifiedItemAttr('damageMultiplierBonus') * mod)
+                                        'emDamage', src.getModifiedItemAttr('damageMultiplierBonus') * mod, **kwargs)
 
 
 class Effect1596(BaseEffect):
@@ -4724,10 +4757,10 @@ class Effect1596(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         mod = src.level if 'skill' in context else 1
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
-                                        'explosiveDamage', src.getModifiedItemAttr('damageMultiplierBonus') * mod)
+                                        'explosiveDamage', src.getModifiedItemAttr('damageMultiplierBonus') * mod, **kwargs)
 
 
 class Effect1597(BaseEffect):
@@ -4742,10 +4775,10 @@ class Effect1597(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         mod = src.level if 'skill' in context else 1
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
-                                        'kineticDamage', src.getModifiedItemAttr('damageMultiplierBonus') * mod)
+                                        'kineticDamage', src.getModifiedItemAttr('damageMultiplierBonus') * mod, **kwargs)
 
 
 class Effect1615(BaseEffect):
@@ -4759,10 +4792,10 @@ class Effect1615(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         skillName = 'Advanced Spaceship Command'
         skill = fit.character.getSkill(skillName)
-        fit.ship.boostItemAttr('agility', skill.getModifiedItemAttr('agilityBonus'), skill=skillName)
+        fit.ship.boostItemAttr('agility', skill.getModifiedItemAttr('agilityBonus'), skill=skillName, **kwargs)
 
 
 class Effect1616(BaseEffect):
@@ -4776,9 +4809,9 @@ class Effect1616(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, skill, context):
+    def handler(fit, skill, context, **kwargs):
         if fit.ship.item.requiresSkill('Capital Ships'):
-            fit.ship.boostItemAttr('agility', skill.getModifiedItemAttr('agilityBonus') * skill.level)
+            fit.ship.boostItemAttr('agility', skill.getModifiedItemAttr('agilityBonus') * skill.level, **kwargs)
 
 
 class Effect1617(BaseEffect):
@@ -4792,8 +4825,9 @@ class Effect1617(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
-        fit.ship.multiplyItemAttr('agility', src.getModifiedItemAttr('advancedCapitalAgility'), stackingPenalties=True)
+    def handler(fit, src, context, **kwargs):
+        fit.ship.multiplyItemAttr('agility', src.getModifiedItemAttr('advancedCapitalAgility'),
+                                  stackingPenalties=True, **kwargs)
 
 
 class Effect1634(BaseEffect):
@@ -4808,10 +4842,10 @@ class Effect1634(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, container, context):
+    def handler(fit, container, context, **kwargs):
         level = container.level if 'skill' in context else 1
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Capital Shield Operation'),
-                                      'capacitorNeed', container.getModifiedItemAttr('shieldBoostCapacitorBonus') * level)
+                                      'capacitorNeed', container.getModifiedItemAttr('shieldBoostCapacitorBonus') * level, **kwargs)
 
 
 class Effect1635(BaseEffect):
@@ -4826,11 +4860,11 @@ class Effect1635(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, container, context):
+    def handler(fit, container, context, **kwargs):
         level = container.level if 'skill' in context else 1
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Capital Repair Systems'),
                                       'duration', container.getModifiedItemAttr('durationSkillBonus') * level,
-                                      stackingPenalties='skill' not in context)
+                                      stackingPenalties='skill' not in context, **kwargs)
 
 
 class Effect1638(BaseEffect):
@@ -4844,10 +4878,10 @@ class Effect1638(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, skill, context):
+    def handler(fit, skill, context, **kwargs):
         fit.modules.filteredItemBoost(
             lambda mod: mod.item.requiresSkill('Gunnery') or mod.item.requiresSkill('Missile Launcher Operation'),
-            'power', skill.getModifiedItemAttr('powerNeedBonus') * skill.level)
+            'power', skill.getModifiedItemAttr('powerNeedBonus') * skill.level, **kwargs)
 
 
 class Effect1643(BaseEffect):
@@ -4863,17 +4897,17 @@ class Effect1643(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill('Armored Command'), 'warfareBuff2Multiplier',
-                                        src.getModifiedItemAttr('mindlinkBonus'))
+                                        src.getModifiedItemAttr('mindlinkBonus'), **kwargs)
         fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill('Armored Command'), 'warfareBuff1Multiplier',
-                                        src.getModifiedItemAttr('mindlinkBonus'))
+                                        src.getModifiedItemAttr('mindlinkBonus'), **kwargs)
         fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill('Armored Command'), 'warfareBuff4Multiplier',
-                                        src.getModifiedItemAttr('mindlinkBonus'))
+                                        src.getModifiedItemAttr('mindlinkBonus'), **kwargs)
         fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill('Armored Command'), 'warfareBuff3Multiplier',
-                                        src.getModifiedItemAttr('mindlinkBonus'))
+                                        src.getModifiedItemAttr('mindlinkBonus'), **kwargs)
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Armored Command'), 'buffDuration',
-                                      src.getModifiedItemAttr('mindlinkBonus'))
+                                      src.getModifiedItemAttr('mindlinkBonus'), **kwargs)
 
 
 class Effect1644(BaseEffect):
@@ -4889,17 +4923,17 @@ class Effect1644(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill('Skirmish Command'), 'warfareBuff3Multiplier',
-                                        src.getModifiedItemAttr('mindlinkBonus'))
+                                        src.getModifiedItemAttr('mindlinkBonus'), **kwargs)
         fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill('Skirmish Command'), 'warfareBuff4Multiplier',
-                                        src.getModifiedItemAttr('mindlinkBonus'))
+                                        src.getModifiedItemAttr('mindlinkBonus'), **kwargs)
         fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill('Skirmish Command'), 'warfareBuff2Multiplier',
-                                        src.getModifiedItemAttr('mindlinkBonus'))
+                                        src.getModifiedItemAttr('mindlinkBonus'), **kwargs)
         fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill('Skirmish Command'), 'warfareBuff1Multiplier',
-                                        src.getModifiedItemAttr('mindlinkBonus'))
+                                        src.getModifiedItemAttr('mindlinkBonus'), **kwargs)
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Skirmish Command'), 'buffDuration',
-                                      src.getModifiedItemAttr('mindlinkBonus'))
+                                      src.getModifiedItemAttr('mindlinkBonus'), **kwargs)
 
 
 class Effect1645(BaseEffect):
@@ -4913,17 +4947,17 @@ class Effect1645(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill('Shield Command'), 'warfareBuff4Multiplier',
-                                        src.getModifiedItemAttr('mindlinkBonus'))
+                                        src.getModifiedItemAttr('mindlinkBonus'), **kwargs)
         fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill('Shield Command'), 'warfareBuff3Multiplier',
-                                        src.getModifiedItemAttr('mindlinkBonus'))
+                                        src.getModifiedItemAttr('mindlinkBonus'), **kwargs)
         fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill('Shield Command'), 'warfareBuff2Multiplier',
-                                        src.getModifiedItemAttr('mindlinkBonus'))
+                                        src.getModifiedItemAttr('mindlinkBonus'), **kwargs)
         fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill('Shield Command'), 'warfareBuff1Multiplier',
-                                        src.getModifiedItemAttr('mindlinkBonus'))
+                                        src.getModifiedItemAttr('mindlinkBonus'), **kwargs)
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Command'), 'buffDuration',
-                                      src.getModifiedItemAttr('mindlinkBonus'))
+                                      src.getModifiedItemAttr('mindlinkBonus'), **kwargs)
 
 
 class Effect1646(BaseEffect):
@@ -4939,17 +4973,17 @@ class Effect1646(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill('Information Command'), 'warfareBuff4Multiplier',
-                                        src.getModifiedItemAttr('mindlinkBonus'))
+                                        src.getModifiedItemAttr('mindlinkBonus'), **kwargs)
         fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill('Information Command'), 'warfareBuff3Multiplier',
-                                        src.getModifiedItemAttr('mindlinkBonus'))
+                                        src.getModifiedItemAttr('mindlinkBonus'), **kwargs)
         fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill('Information Command'), 'warfareBuff1Multiplier',
-                                        src.getModifiedItemAttr('mindlinkBonus'))
+                                        src.getModifiedItemAttr('mindlinkBonus'), **kwargs)
         fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill('Information Command'), 'warfareBuff2Multiplier',
-                                        src.getModifiedItemAttr('mindlinkBonus'))
+                                        src.getModifiedItemAttr('mindlinkBonus'), **kwargs)
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Information Command'), 'buffDuration',
-                                      src.getModifiedItemAttr('mindlinkBonus'))
+                                      src.getModifiedItemAttr('mindlinkBonus'), **kwargs)
 
 
 class Effect1650(BaseEffect):
@@ -4963,10 +4997,10 @@ class Effect1650(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, skill, context):
+    def handler(fit, skill, context, **kwargs):
         amount = -skill.getModifiedItemAttr('consumptionQuantityBonus')
         fit.modules.filteredItemIncrease(lambda mod: mod.item.requiresSkill(skill),
-                                         'consumptionQuantity', amount * skill.level)
+                                         'consumptionQuantity', amount * skill.level, **kwargs)
 
 
 class Effect1657(BaseEffect):
@@ -4981,10 +5015,10 @@ class Effect1657(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         mod = src.level if 'skill' in context else 1
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
-                                        'thermalDamage', src.getModifiedItemAttr('damageMultiplierBonus') * mod)
+                                        'thermalDamage', src.getModifiedItemAttr('damageMultiplierBonus') * mod, **kwargs)
 
 
 class Effect1668(BaseEffect):
@@ -4998,8 +5032,8 @@ class Effect1668(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
-        fit.ship.boostItemAttr('capacity', ship.getModifiedItemAttr('freighterBonusA2'), skill='Amarr Freighter')
+    def handler(fit, ship, context, **kwargs):
+        fit.ship.boostItemAttr('capacity', ship.getModifiedItemAttr('freighterBonusA2'), skill='Amarr Freighter', **kwargs)
 
 
 class Effect1669(BaseEffect):
@@ -5013,8 +5047,8 @@ class Effect1669(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
-        fit.ship.boostItemAttr('capacity', ship.getModifiedItemAttr('freighterBonusC2'), skill='Caldari Freighter')
+    def handler(fit, ship, context, **kwargs):
+        fit.ship.boostItemAttr('capacity', ship.getModifiedItemAttr('freighterBonusC2'), skill='Caldari Freighter', **kwargs)
 
 
 class Effect1670(BaseEffect):
@@ -5028,8 +5062,8 @@ class Effect1670(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
-        fit.ship.boostItemAttr('capacity', ship.getModifiedItemAttr('freighterBonusG2'), skill='Gallente Freighter')
+    def handler(fit, ship, context, **kwargs):
+        fit.ship.boostItemAttr('capacity', ship.getModifiedItemAttr('freighterBonusG2'), skill='Gallente Freighter', **kwargs)
 
 
 class Effect1671(BaseEffect):
@@ -5043,8 +5077,8 @@ class Effect1671(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
-        fit.ship.boostItemAttr('capacity', ship.getModifiedItemAttr('freighterBonusM2'), skill='Minmatar Freighter')
+    def handler(fit, ship, context, **kwargs):
+        fit.ship.boostItemAttr('capacity', ship.getModifiedItemAttr('freighterBonusM2'), skill='Minmatar Freighter', **kwargs)
 
 
 class Effect1672(BaseEffect):
@@ -5058,8 +5092,8 @@ class Effect1672(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
-        fit.ship.boostItemAttr('maxVelocity', ship.getModifiedItemAttr('freighterBonusA1'), skill='Amarr Freighter')
+    def handler(fit, ship, context, **kwargs):
+        fit.ship.boostItemAttr('maxVelocity', ship.getModifiedItemAttr('freighterBonusA1'), skill='Amarr Freighter', **kwargs)
 
 
 class Effect1673(BaseEffect):
@@ -5073,8 +5107,8 @@ class Effect1673(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
-        fit.ship.boostItemAttr('maxVelocity', ship.getModifiedItemAttr('freighterBonusC1'), skill='Caldari Freighter')
+    def handler(fit, ship, context, **kwargs):
+        fit.ship.boostItemAttr('maxVelocity', ship.getModifiedItemAttr('freighterBonusC1'), skill='Caldari Freighter', **kwargs)
 
 
 class Effect1674(BaseEffect):
@@ -5088,8 +5122,8 @@ class Effect1674(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
-        fit.ship.boostItemAttr('maxVelocity', ship.getModifiedItemAttr('freighterBonusG1'), skill='Gallente Freighter')
+    def handler(fit, ship, context, **kwargs):
+        fit.ship.boostItemAttr('maxVelocity', ship.getModifiedItemAttr('freighterBonusG1'), skill='Gallente Freighter', **kwargs)
 
 
 class Effect1675(BaseEffect):
@@ -5103,8 +5137,8 @@ class Effect1675(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
-        fit.ship.boostItemAttr('maxVelocity', ship.getModifiedItemAttr('freighterBonusM1'), skill='Minmatar Freighter')
+    def handler(fit, ship, context, **kwargs):
+        fit.ship.boostItemAttr('maxVelocity', ship.getModifiedItemAttr('freighterBonusM1'), skill='Minmatar Freighter', **kwargs)
 
 
 class Effect1720(BaseEffect):
@@ -5119,11 +5153,11 @@ class Effect1720(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         fit.modules.filteredItemBoost(
             lambda mod: mod.item.requiresSkill('Shield Operation') or mod.item.requiresSkill('Capital Shield Operation'),
             'shieldBonus', module.getModifiedItemAttr('shieldBoostMultiplier'),
-            stackingPenalties=True)
+            stackingPenalties=True, **kwargs)
 
 
 class Effect1722(BaseEffect):
@@ -5137,9 +5171,9 @@ class Effect1722(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, skill, context):
+    def handler(fit, skill, context, **kwargs):
         fit.ship.boostItemAttr('jumpDriveCapacitorNeed',
-                               skill.getModifiedItemAttr('jumpDriveCapacitorNeedBonus') * skill.level)
+                               skill.getModifiedItemAttr('jumpDriveCapacitorNeedBonus') * skill.level, **kwargs)
 
 
 class Effect1730(BaseEffect):
@@ -5153,9 +5187,9 @@ class Effect1730(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, skill, context):
+    def handler(fit, skill, context, **kwargs):
         fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill(skill),
-                                     'damageMultiplier', skill.getModifiedItemAttr('damageMultiplierBonus') * skill.level)
+                                     'damageMultiplier', skill.getModifiedItemAttr('damageMultiplierBonus') * skill.level, **kwargs)
 
 
 class Effect1738(BaseEffect):
@@ -5184,10 +5218,10 @@ class Effect1763(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, container, context):
+    def handler(fit, container, context, **kwargs):
         level = container.level if 'skill' in context else 1
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Missile Launcher Operation'),
-                                      'speed', container.getModifiedItemAttr('rofBonus') * level)
+                                      'speed', container.getModifiedItemAttr('rofBonus') * level, **kwargs)
 
 
 class Effect1764(BaseEffect):
@@ -5203,12 +5237,12 @@ class Effect1764(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, container, context):
+    def handler(fit, container, context, **kwargs):
         level = container.level if 'skill' in context else 1
         penalized = False if 'skill' in context or 'implant' in context else True
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
                                         'maxVelocity', container.getModifiedItemAttr('speedFactor') * level,
-                                        stackingPenalties=penalized)
+                                        stackingPenalties=penalized, **kwargs)
 
 
 class Effect1773(BaseEffect):
@@ -5223,9 +5257,9 @@ class Effect1773(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Hybrid Turret'),
-                                      'falloff', ship.getModifiedItemAttr('shipBonusGF2'), skill='Gallente Frigate')
+                                      'falloff', ship.getModifiedItemAttr('shipBonusGF2'), skill='Gallente Frigate', **kwargs)
 
 
 class Effect1804(BaseEffect):
@@ -5241,8 +5275,8 @@ class Effect1804(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
-        fit.ship.boostItemAttr('armorEmDamageResonance', ship.getModifiedItemAttr('shipBonusAF'), skill='Amarr Frigate')
+    def handler(fit, ship, context, **kwargs):
+        fit.ship.boostItemAttr('armorEmDamageResonance', ship.getModifiedItemAttr('shipBonusAF'), skill='Amarr Frigate', **kwargs)
 
 
 class Effect1805(BaseEffect):
@@ -5258,9 +5292,9 @@ class Effect1805(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.ship.boostItemAttr('armorThermalDamageResonance', ship.getModifiedItemAttr('shipBonusAF'),
-                               skill='Amarr Frigate')
+                               skill='Amarr Frigate', **kwargs)
 
 
 class Effect1806(BaseEffect):
@@ -5276,9 +5310,9 @@ class Effect1806(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.ship.boostItemAttr('armorKineticDamageResonance', ship.getModifiedItemAttr('shipBonusAF'),
-                               skill='Amarr Frigate')
+                               skill='Amarr Frigate', **kwargs)
 
 
 class Effect1807(BaseEffect):
@@ -5294,9 +5328,9 @@ class Effect1807(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.ship.boostItemAttr('armorExplosiveDamageResonance', ship.getModifiedItemAttr('shipBonusAF'),
-                               skill='Amarr Frigate')
+                               skill='Amarr Frigate', **kwargs)
 
 
 class Effect1812(BaseEffect):
@@ -5310,8 +5344,9 @@ class Effect1812(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
-        fit.ship.boostItemAttr('shieldEmDamageResonance', ship.getModifiedItemAttr('shipBonusCC2'), skill='Caldari Cruiser')
+    def handler(fit, ship, context, **kwargs):
+        fit.ship.boostItemAttr('shieldEmDamageResonance', ship.getModifiedItemAttr('shipBonusCC2'),
+                               skill='Caldari Cruiser', **kwargs)
 
 
 class Effect1813(BaseEffect):
@@ -5325,9 +5360,9 @@ class Effect1813(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.ship.boostItemAttr('shieldThermalDamageResonance', ship.getModifiedItemAttr('shipBonusCC2'),
-                               skill='Caldari Cruiser')
+                               skill='Caldari Cruiser', **kwargs)
 
 
 class Effect1814(BaseEffect):
@@ -5341,9 +5376,9 @@ class Effect1814(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.ship.boostItemAttr('shieldKineticDamageResonance', ship.getModifiedItemAttr('shipBonusCC2'),
-                               skill='Caldari Cruiser')
+                               skill='Caldari Cruiser', **kwargs)
 
 
 class Effect1815(BaseEffect):
@@ -5357,9 +5392,9 @@ class Effect1815(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.ship.boostItemAttr('shieldExplosiveDamageResonance', ship.getModifiedItemAttr('shipBonusCC2'),
-                               skill='Caldari Cruiser')
+                               skill='Caldari Cruiser', **kwargs)
 
 
 class Effect1816(BaseEffect):
@@ -5375,8 +5410,9 @@ class Effect1816(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
-        fit.ship.boostItemAttr('shieldEmDamageResonance', ship.getModifiedItemAttr('shipBonusCF'), skill='Caldari Frigate')
+    def handler(fit, ship, context, **kwargs):
+        fit.ship.boostItemAttr('shieldEmDamageResonance', ship.getModifiedItemAttr('shipBonusCF'),
+                               skill='Caldari Frigate', **kwargs)
 
 
 class Effect1817(BaseEffect):
@@ -5392,9 +5428,9 @@ class Effect1817(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.ship.boostItemAttr('shieldThermalDamageResonance', ship.getModifiedItemAttr('shipBonusCF'),
-                               skill='Caldari Frigate')
+                               skill='Caldari Frigate', **kwargs)
 
 
 class Effect1819(BaseEffect):
@@ -5410,9 +5446,9 @@ class Effect1819(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.ship.boostItemAttr('shieldKineticDamageResonance', ship.getModifiedItemAttr('shipBonusCF'),
-                               skill='Caldari Frigate')
+                               skill='Caldari Frigate', **kwargs)
 
 
 class Effect1820(BaseEffect):
@@ -5428,9 +5464,9 @@ class Effect1820(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.ship.boostItemAttr('shieldExplosiveDamageResonance', ship.getModifiedItemAttr('shipBonusCF'),
-                               skill='Caldari Frigate')
+                               skill='Caldari Frigate', **kwargs)
 
 
 class Effect1848(BaseEffect):
@@ -5445,17 +5481,17 @@ class Effect1848(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill('Mining Foreman'), 'warfareBuff4Multiplier',
-                                        src.getModifiedItemAttr('mindlinkBonus'))
+                                        src.getModifiedItemAttr('mindlinkBonus'), **kwargs)
         fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill('Mining Foreman'), 'warfareBuff2Multiplier',
-                                        src.getModifiedItemAttr('mindlinkBonus'))
+                                        src.getModifiedItemAttr('mindlinkBonus'), **kwargs)
         fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill('Mining Foreman'), 'warfareBuff1Multiplier',
-                                        src.getModifiedItemAttr('mindlinkBonus'))
+                                        src.getModifiedItemAttr('mindlinkBonus'), **kwargs)
         fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill('Mining Foreman'), 'warfareBuff3Multiplier',
-                                        src.getModifiedItemAttr('mindlinkBonus'))
+                                        src.getModifiedItemAttr('mindlinkBonus'), **kwargs)
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Mining Foreman'), 'buffDuration',
-                                      src.getModifiedItemAttr('mindlinkBonus'))
+                                      src.getModifiedItemAttr('mindlinkBonus'), **kwargs)
 
 
 class Effect1851(BaseEffect):
@@ -5471,9 +5507,9 @@ class Effect1851(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, skill, context):
+    def handler(fit, skill, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill(skill),
-                                      'speed', skill.getModifiedItemAttr('rofBonus') * skill.level)
+                                      'speed', skill.getModifiedItemAttr('rofBonus') * skill.level, **kwargs)
 
 
 class Effect1862(BaseEffect):
@@ -5487,9 +5523,10 @@ class Effect1862(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
-                                        'emDamage', ship.getModifiedItemAttr('shipBonusCF2'), skill='Caldari Frigate')
+                                        'emDamage', ship.getModifiedItemAttr('shipBonusCF2'),
+                                        skill='Caldari Frigate', **kwargs)
 
 
 class Effect1863(BaseEffect):
@@ -5503,9 +5540,10 @@ class Effect1863(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
-                                        'thermalDamage', ship.getModifiedItemAttr('shipBonusCF2'), skill='Caldari Frigate')
+                                        'thermalDamage', ship.getModifiedItemAttr('shipBonusCF2'),
+                                        skill='Caldari Frigate', **kwargs)
 
 
 class Effect1864(BaseEffect):
@@ -5519,10 +5557,10 @@ class Effect1864(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
                                         'explosiveDamage', ship.getModifiedItemAttr('shipBonusCF2'),
-                                        skill='Caldari Frigate')
+                                        skill='Caldari Frigate', **kwargs)
 
 
 class Effect1882(BaseEffect):
@@ -5537,9 +5575,9 @@ class Effect1882(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Mining'),
-                                      'miningAmount', module.getModifiedItemAttr('miningAmountBonus'))
+                                      'miningAmount', module.getModifiedItemAttr('miningAmountBonus'), **kwargs)
 
 
 class Effect1885(BaseEffect):
@@ -5554,9 +5592,10 @@ class Effect1885(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Missile Launcher Cruise',
-                                      'speed', ship.getModifiedItemAttr('shipBonus2CB'), skill='Caldari Battleship')
+                                      'speed', ship.getModifiedItemAttr('shipBonus2CB'),
+                                      skill='Caldari Battleship', **kwargs)
 
 
 class Effect1886(BaseEffect):
@@ -5571,9 +5610,10 @@ class Effect1886(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Missile Launcher Torpedo',
-                                      'speed', ship.getModifiedItemAttr('shipBonus2CB'), skill='Caldari Battleship')
+                                      'speed', ship.getModifiedItemAttr('shipBonus2CB'),
+                                      skill='Caldari Battleship', **kwargs)
 
 
 class Effect1896(BaseEffect):
@@ -5587,9 +5627,10 @@ class Effect1896(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Ice Harvesting'),
-                                      'duration', ship.getModifiedItemAttr('eliteBonusBarge2'), skill='Exhumers')
+                                      'duration', ship.getModifiedItemAttr('eliteBonusBarge2'),
+                                      skill='Exhumers', **kwargs)
 
 
 class Effect1910(BaseEffect):
@@ -5604,10 +5645,10 @@ class Effect1910(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Energy Nosferatu',
                                       'powerTransferAmount', ship.getModifiedItemAttr('eliteBonusReconShip2'),
-                                      skill='Recon Ships')
+                                      skill='Recon Ships', **kwargs)
 
 
 class Effect1911(BaseEffect):
@@ -5623,10 +5664,10 @@ class Effect1911(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'ECM',
                                       'scanGravimetricStrengthBonus', ship.getModifiedItemAttr('eliteBonusReconShip2'),
-                                      skill='Recon Ships')
+                                      skill='Recon Ships', **kwargs)
 
 
 class Effect1912(BaseEffect):
@@ -5642,10 +5683,10 @@ class Effect1912(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'ECM',
                                       'scanMagnetometricStrengthBonus', ship.getModifiedItemAttr('eliteBonusReconShip2'),
-                                      skill='Recon Ships')
+                                      skill='Recon Ships', **kwargs)
 
 
 class Effect1913(BaseEffect):
@@ -5661,10 +5702,10 @@ class Effect1913(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'ECM',
                                       'scanRadarStrengthBonus', ship.getModifiedItemAttr('eliteBonusReconShip2'),
-                                      skill='Recon Ships')
+                                      skill='Recon Ships', **kwargs)
 
 
 class Effect1914(BaseEffect):
@@ -5680,10 +5721,10 @@ class Effect1914(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'ECM',
                                       'scanLadarStrengthBonus', ship.getModifiedItemAttr('eliteBonusReconShip2'),
-                                      skill='Recon Ships')
+                                      skill='Recon Ships', **kwargs)
 
 
 class Effect1921(BaseEffect):
@@ -5700,9 +5741,10 @@ class Effect1921(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Stasis Web',
-                                      'maxRange', ship.getModifiedItemAttr('eliteBonusReconShip2'), skill='Recon Ships')
+                                      'maxRange', ship.getModifiedItemAttr('eliteBonusReconShip2'),
+                                      skill='Recon Ships', **kwargs)
 
 
 class Effect1922(BaseEffect):
@@ -5718,9 +5760,10 @@ class Effect1922(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Warp Scrambler',
-                                      'maxRange', ship.getModifiedItemAttr('eliteBonusReconShip2'), skill='Recon Ships')
+                                      'maxRange', ship.getModifiedItemAttr('eliteBonusReconShip2'),
+                                      skill='Recon Ships', **kwargs)
 
 
 class Effect1959(BaseEffect):
@@ -5734,8 +5777,8 @@ class Effect1959(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
-        fit.ship.increaseItemAttr('mass', module.getModifiedItemAttr('massAddition'))
+    def handler(fit, module, context, **kwargs):
+        fit.ship.increaseItemAttr('mass', module.getModifiedItemAttr('massAddition'), **kwargs)
 
 
 class Effect1964(BaseEffect):
@@ -5749,9 +5792,9 @@ class Effect1964(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Emission Systems'), 'capacitorNeed',
-                                      src.getModifiedItemAttr('shipBonusCC'), skill='Caldari Cruiser')
+                                      src.getModifiedItemAttr('shipBonusCC'), skill='Caldari Cruiser', **kwargs)
 
 
 class Effect1969(BaseEffect):
@@ -5765,9 +5808,9 @@ class Effect1969(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Remote Armor Repair Systems'), 'capacitorNeed',
-                                      src.getModifiedItemAttr('shipBonusGC'), skill='Gallente Cruiser')
+                                      src.getModifiedItemAttr('shipBonusGC'), skill='Gallente Cruiser', **kwargs)
 
 
 class Effect1996(BaseEffect):
@@ -5782,9 +5825,10 @@ class Effect1996(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'ECM',
-                                      'capacitorNeed', ship.getModifiedItemAttr('shipBonusCF2'), skill='Caldari Frigate')
+                                      'capacitorNeed', ship.getModifiedItemAttr('shipBonusCF2'),
+                                      skill='Caldari Frigate', **kwargs)
 
 
 class Effect2000(BaseEffect):
@@ -5798,9 +5842,9 @@ class Effect2000(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         amount = module.getModifiedItemAttr('droneRangeBonus')
-        fit.extraAttributes.increase('droneControlRange', amount)
+        fit.extraAttributes.increase('droneControlRange', amount, **kwargs)
 
 
 class Effect2008(BaseEffect):
@@ -5814,9 +5858,9 @@ class Effect2008(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Cynosural Field Generator',
-                                      'duration', ship.getModifiedItemAttr('durationBonus'))
+                                      'duration', ship.getModifiedItemAttr('durationBonus'), **kwargs)
 
 
 class Effect2013(BaseEffect):
@@ -5832,10 +5876,12 @@ class Effect2013(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, container, context):
+    def handler(fit, container, context, **kwargs):
         level = container.level if 'skill' in context else 1
+        penalties = False if 'implant' in context else True
         fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Drones'),
-                                     'maxVelocity', container.getModifiedItemAttr('droneMaxVelocityBonus') * level, stackingPenalties=True)
+                                     'maxVelocity', container.getModifiedItemAttr('droneMaxVelocityBonus') * level,
+                                     stackingPenalties=penalties, **kwargs)
 
 
 class Effect2014(BaseEffect):
@@ -5849,13 +5895,13 @@ class Effect2014(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, container, context):
+    def handler(fit, container, context, **kwargs):
         level = container.level if 'skill' in context else 1
-        stacking = False if 'skill' in context else True
+        penalized = False if 'skill' in context else True
         fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Drones'),
                                      'maxRange',
                                      container.getModifiedItemAttr('rangeSkillBonus') * level,
-                                     stackingPenalties=stacking)
+                                     stackingPenalties=penalized, **kwargs)
 
 
 class Effect2015(BaseEffect):
@@ -5869,9 +5915,9 @@ class Effect2015(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Drones'),
-                                     'shieldCapacity', module.getModifiedItemAttr('hullHpBonus'))
+                                     'shieldCapacity', module.getModifiedItemAttr('hullHpBonus'), **kwargs)
 
 
 class Effect2016(BaseEffect):
@@ -5885,9 +5931,9 @@ class Effect2016(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Drones'),
-                                     'armorHP', module.getModifiedItemAttr('hullHpBonus'))
+                                     'armorHP', module.getModifiedItemAttr('hullHpBonus'), **kwargs)
 
 
 class Effect2017(BaseEffect):
@@ -5901,10 +5947,10 @@ class Effect2017(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, container, context):
+    def handler(fit, container, context, **kwargs):
         level = container.level if 'skill' in context else 1
         fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Drones'),
-                                     'hp', container.getModifiedItemAttr('hullHpBonus') * level)
+                                     'hp', container.getModifiedItemAttr('hullHpBonus') * level, **kwargs)
 
 
 class Effect2019(BaseEffect):
@@ -5919,10 +5965,10 @@ class Effect2019(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, container, context):
+    def handler(fit, container, context, **kwargs):
         level = container.level if 'skill' in context else 1
         fit.drones.filteredItemBoost(lambda drone: drone.item.group.name == 'Logistic Drone',
-                                     'shieldBonus', container.getModifiedItemAttr('damageHP') * level)
+                                     'shieldBonus', container.getModifiedItemAttr('damageHP') * level, **kwargs)
 
 
 class Effect2020(BaseEffect):
@@ -5937,11 +5983,12 @@ class Effect2020(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, container, context):
+    def handler(fit, container, context, **kwargs):
         level = container.level if 'skill' in context else 1
+        penalized = False if 'skill' in context else True
         fit.drones.filteredItemBoost(lambda drone: drone.item.group.name == 'Logistic Drone',
                                      'armorDamageAmount', container.getModifiedItemAttr('damageHP') * level,
-                                     stackingPenalties=True)
+                                     stackingPenalties=penalized, **kwargs)
 
 
 class Effect2029(BaseEffect):
@@ -5956,8 +6003,8 @@ class Effect2029(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
-        fit.ship.increaseItemAttr('signatureRadius', module.getModifiedItemAttr('signatureRadiusAdd'))
+    def handler(fit, module, context, **kwargs):
+        fit.ship.increaseItemAttr('signatureRadius', module.getModifiedItemAttr('signatureRadiusAdd'), **kwargs)
 
 
 class Effect2041(BaseEffect):
@@ -5972,11 +6019,11 @@ class Effect2041(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         for type in ('kinetic', 'thermal', 'explosive', 'em'):
             fit.ship.boostItemAttr('armor%sDamageResonance' % type.capitalize(),
                                    module.getModifiedItemAttr('%sDamageResistanceBonus' % type),
-                                   stackingPenalties=True)
+                                   stackingPenalties=True, **kwargs)
 
 
 class Effect2052(BaseEffect):
@@ -5990,11 +6037,11 @@ class Effect2052(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         for type in ('kinetic', 'thermal', 'explosive', 'em'):
             fit.ship.boostItemAttr('shield%sDamageResonance' % type.capitalize(),
                                    module.getModifiedItemAttr('%sDamageResistanceBonus' % type),
-                                   stackingPenalties=True)
+                                   stackingPenalties=True, **kwargs)
 
 
 class Effect2053(BaseEffect):
@@ -6008,9 +6055,9 @@ class Effect2053(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, skill, context):
+    def handler(fit, skill, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Shield Resistance Amplifier',
-                                      'emDamageResistanceBonus', skill.getModifiedItemAttr('hardeningBonus') * skill.level)
+                                      'emDamageResistanceBonus', skill.getModifiedItemAttr('hardeningBonus') * skill.level, **kwargs)
 
 
 class Effect2054(BaseEffect):
@@ -6024,10 +6071,10 @@ class Effect2054(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, skill, context):
+    def handler(fit, skill, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Shield Resistance Amplifier',
                                       'explosiveDamageResistanceBonus',
-                                      skill.getModifiedItemAttr('hardeningBonus') * skill.level)
+                                      skill.getModifiedItemAttr('hardeningBonus') * skill.level, **kwargs)
 
 
 class Effect2055(BaseEffect):
@@ -6041,10 +6088,10 @@ class Effect2055(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, skill, context):
+    def handler(fit, skill, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Shield Resistance Amplifier',
                                       'kineticDamageResistanceBonus',
-                                      skill.getModifiedItemAttr('hardeningBonus') * skill.level)
+                                      skill.getModifiedItemAttr('hardeningBonus') * skill.level, **kwargs)
 
 
 class Effect2056(BaseEffect):
@@ -6058,10 +6105,10 @@ class Effect2056(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, skill, context):
+    def handler(fit, skill, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Shield Resistance Amplifier',
                                       'thermalDamageResistanceBonus',
-                                      skill.getModifiedItemAttr('hardeningBonus') * skill.level)
+                                      skill.getModifiedItemAttr('hardeningBonus') * skill.level, **kwargs)
 
 
 class Effect2105(BaseEffect):
@@ -6075,9 +6122,9 @@ class Effect2105(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, skill, context):
+    def handler(fit, skill, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Armor Coating',
-                                      'emDamageResistanceBonus', skill.getModifiedItemAttr('hardeningBonus') * skill.level)
+                                      'emDamageResistanceBonus', skill.getModifiedItemAttr('hardeningBonus') * skill.level, **kwargs)
 
 
 class Effect2106(BaseEffect):
@@ -6091,10 +6138,10 @@ class Effect2106(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, skill, context):
+    def handler(fit, skill, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Armor Coating',
                                       'explosiveDamageResistanceBonus',
-                                      skill.getModifiedItemAttr('hardeningBonus') * skill.level)
+                                      skill.getModifiedItemAttr('hardeningBonus') * skill.level, **kwargs)
 
 
 class Effect2107(BaseEffect):
@@ -6108,10 +6155,10 @@ class Effect2107(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, skill, context):
+    def handler(fit, skill, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Armor Coating',
                                       'kineticDamageResistanceBonus',
-                                      skill.getModifiedItemAttr('hardeningBonus') * skill.level)
+                                      skill.getModifiedItemAttr('hardeningBonus') * skill.level, **kwargs)
 
 
 class Effect2108(BaseEffect):
@@ -6125,10 +6172,10 @@ class Effect2108(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, skill, context):
+    def handler(fit, skill, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Armor Coating',
                                       'thermalDamageResistanceBonus',
-                                      skill.getModifiedItemAttr('hardeningBonus') * skill.level)
+                                      skill.getModifiedItemAttr('hardeningBonus') * skill.level, **kwargs)
 
 
 class Effect2109(BaseEffect):
@@ -6142,9 +6189,9 @@ class Effect2109(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, skill, context):
+    def handler(fit, skill, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Armor Plating Energized',
-                                      'emDamageResistanceBonus', skill.getModifiedItemAttr('hardeningBonus') * skill.level)
+                                      'emDamageResistanceBonus', skill.getModifiedItemAttr('hardeningBonus') * skill.level, **kwargs)
 
 
 class Effect2110(BaseEffect):
@@ -6158,10 +6205,10 @@ class Effect2110(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, skill, context):
+    def handler(fit, skill, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Armor Plating Energized',
                                       'explosiveDamageResistanceBonus',
-                                      skill.getModifiedItemAttr('hardeningBonus') * skill.level)
+                                      skill.getModifiedItemAttr('hardeningBonus') * skill.level, **kwargs)
 
 
 class Effect2111(BaseEffect):
@@ -6175,10 +6222,10 @@ class Effect2111(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, skill, context):
+    def handler(fit, skill, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Armor Plating Energized',
                                       'kineticDamageResistanceBonus',
-                                      skill.getModifiedItemAttr('hardeningBonus') * skill.level)
+                                      skill.getModifiedItemAttr('hardeningBonus') * skill.level, **kwargs)
 
 
 class Effect2112(BaseEffect):
@@ -6192,10 +6239,10 @@ class Effect2112(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, skill, context):
+    def handler(fit, skill, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Armor Plating Energized',
                                       'thermalDamageResistanceBonus',
-                                      skill.getModifiedItemAttr('hardeningBonus') * skill.level)
+                                      skill.getModifiedItemAttr('hardeningBonus') * skill.level, **kwargs)
 
 
 class Effect2130(BaseEffect):
@@ -6210,9 +6257,9 @@ class Effect2130(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Hybrid Turret'),
-                                      'maxRange', ship.getModifiedItemAttr('maxRangeBonus'))
+                                      'maxRange', ship.getModifiedItemAttr('maxRangeBonus'), **kwargs)
 
 
 class Effect2131(BaseEffect):
@@ -6228,9 +6275,9 @@ class Effect2131(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Energy Turret'),
-                                      'maxRange', ship.getModifiedItemAttr('maxRangeBonus'))
+                                      'maxRange', ship.getModifiedItemAttr('maxRangeBonus'), **kwargs)
 
 
 class Effect2132(BaseEffect):
@@ -6244,9 +6291,9 @@ class Effect2132(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Projectile Turret'),
-                                      'maxRange', ship.getModifiedItemAttr('maxRangeBonus'))
+                                      'maxRange', ship.getModifiedItemAttr('maxRangeBonus'), **kwargs)
 
 
 class Effect2133(BaseEffect):
@@ -6261,9 +6308,9 @@ class Effect2133(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Remote Capacitor Transmitter',
-                                      'maxRange', ship.getModifiedItemAttr('maxRangeBonus2'))
+                                      'maxRange', ship.getModifiedItemAttr('maxRangeBonus2'), **kwargs)
 
 
 class Effect2134(BaseEffect):
@@ -6280,11 +6327,11 @@ class Effect2134(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Remote Shield Booster', 'maxRange',
-                                      ship.getModifiedItemAttr('maxRangeBonus'))
+                                      ship.getModifiedItemAttr('maxRangeBonus'), **kwargs)
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Ancillary Remote Shield Booster', 'maxRange',
-                                      ship.getModifiedItemAttr('maxRangeBonus'))
+                                      ship.getModifiedItemAttr('maxRangeBonus'), **kwargs)
 
 
 class Effect2135(BaseEffect):
@@ -6302,11 +6349,11 @@ class Effect2135(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Remote Armor Repairer', 'maxRange',
-                                      src.getModifiedItemAttr('maxRangeBonus'))
+                                      src.getModifiedItemAttr('maxRangeBonus'), **kwargs)
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Ancillary Remote Armor Repairer', 'maxRange',
-                                      src.getModifiedItemAttr('maxRangeBonus'))
+                                      src.getModifiedItemAttr('maxRangeBonus'), **kwargs)
 
 
 class Effect2143(BaseEffect):
@@ -6320,10 +6367,10 @@ class Effect2143(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Target Painter',
                                       'signatureRadiusBonus', ship.getModifiedItemAttr('shipBonusMC2'),
-                                      skill='Minmatar Cruiser')
+                                      skill='Minmatar Cruiser', **kwargs)
 
 
 class Effect2155(BaseEffect):
@@ -6337,10 +6384,10 @@ class Effect2155(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Projectile Turret'),
                                       'damageMultiplier', ship.getModifiedItemAttr('eliteBonusCommandShips1'),
-                                      skill='Command Ships')
+                                      skill='Command Ships', **kwargs)
 
 
 class Effect2156(BaseEffect):
@@ -6354,9 +6401,10 @@ class Effect2156(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Projectile Turret'),
-                                      'falloff', ship.getModifiedItemAttr('eliteBonusCommandShips2'), skill='Command Ships')
+                                      'falloff', ship.getModifiedItemAttr('eliteBonusCommandShips2'),
+                                      skill='Command Ships', **kwargs)
 
 
 class Effect2157(BaseEffect):
@@ -6370,10 +6418,10 @@ class Effect2157(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Energy Turret'),
                                       'damageMultiplier', ship.getModifiedItemAttr('eliteBonusCommandShips1'),
-                                      skill='Command Ships')
+                                      skill='Command Ships', **kwargs)
 
 
 class Effect2158(BaseEffect):
@@ -6387,9 +6435,10 @@ class Effect2158(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Energy Turret'),
-                                      'speed', ship.getModifiedItemAttr('eliteBonusCommandShips2'), skill='Command Ships')
+                                      'speed', ship.getModifiedItemAttr('eliteBonusCommandShips2'),
+                                      skill='Command Ships', **kwargs)
 
 
 class Effect2160(BaseEffect):
@@ -6403,9 +6452,10 @@ class Effect2160(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Hybrid Turret'),
-                                      'falloff', ship.getModifiedItemAttr('eliteBonusCommandShips2'), skill='Command Ships')
+                                      'falloff', ship.getModifiedItemAttr('eliteBonusCommandShips2'),
+                                      skill='Command Ships', **kwargs)
 
 
 class Effect2161(BaseEffect):
@@ -6419,10 +6469,10 @@ class Effect2161(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Hybrid Turret'),
                                       'maxRange', ship.getModifiedItemAttr('eliteBonusCommandShips1'),
-                                      skill='Command Ships')
+                                      skill='Command Ships', **kwargs)
 
 
 class Effect2179(BaseEffect):
@@ -6438,10 +6488,11 @@ class Effect2179(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         for type in ('shieldCapacity', 'armorHP', 'hp'):
             fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Drones'),
-                                         type, ship.getModifiedItemAttr('shipBonusGC2'), skill='Gallente Cruiser')
+                                         type, ship.getModifiedItemAttr('shipBonusGC2'),
+                                         skill='Gallente Cruiser', **kwargs)
 
 
 class Effect2181(BaseEffect):
@@ -6455,10 +6506,11 @@ class Effect2181(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         for type in ('shieldCapacity', 'armorHP', 'hp'):
             fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Drones'),
-                                         type, ship.getModifiedItemAttr('shipBonusAC2'), skill='Amarr Cruiser')
+                                         type, ship.getModifiedItemAttr('shipBonusAC2'),
+                                         skill='Amarr Cruiser', **kwargs)
 
 
 class Effect2186(BaseEffect):
@@ -6473,10 +6525,11 @@ class Effect2186(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         for type in ('shieldCapacity', 'armorHP', 'hp'):
             fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Drones'),
-                                         type, ship.getModifiedItemAttr('shipBonusGB2'), skill='Gallente Battleship')
+                                         type, ship.getModifiedItemAttr('shipBonusGB2'),
+                                         skill='Gallente Battleship', **kwargs)
 
 
 class Effect2187(BaseEffect):
@@ -6491,10 +6544,10 @@ class Effect2187(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Drones'),
                                      'damageMultiplier', ship.getModifiedItemAttr('shipBonusGB2'),
-                                     skill='Gallente Battleship')
+                                     skill='Gallente Battleship', **kwargs)
 
 
 class Effect2188(BaseEffect):
@@ -6510,9 +6563,10 @@ class Effect2188(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Drones'),
-                                     'damageMultiplier', ship.getModifiedItemAttr('shipBonusGC2'), skill='Gallente Cruiser')
+                                     'damageMultiplier', ship.getModifiedItemAttr('shipBonusGC2'),
+                                     skill='Gallente Cruiser', **kwargs)
 
 
 class Effect2189(BaseEffect):
@@ -6526,9 +6580,10 @@ class Effect2189(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Drones'),
-                                     'damageMultiplier', ship.getModifiedItemAttr('shipBonusAC2'), skill='Amarr Cruiser')
+                                     'damageMultiplier', ship.getModifiedItemAttr('shipBonusAC2'),
+                                     skill='Amarr Cruiser', **kwargs)
 
 
 class Effect2200(BaseEffect):
@@ -6542,10 +6597,10 @@ class Effect2200(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredChargeBoost(
             lambda mod: mod.charge.requiresSkill('Light Missiles') or mod.charge.requiresSkill('Rockets'),
-            'kineticDamage', ship.getModifiedItemAttr('eliteBonusInterdictors1'), skill='Interdictors')
+            'kineticDamage', ship.getModifiedItemAttr('eliteBonusInterdictors1'), skill='Interdictors', **kwargs)
 
 
 class Effect2201(BaseEffect):
@@ -6559,9 +6614,10 @@ class Effect2201(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Projectile Turret'),
-                                      'falloff', ship.getModifiedItemAttr('eliteBonusInterdictors1'), skill='Interdictors')
+                                      'falloff', ship.getModifiedItemAttr('eliteBonusInterdictors1'),
+                                      skill='Interdictors', **kwargs)
 
 
 class Effect2215(BaseEffect):
@@ -6578,9 +6634,9 @@ class Effect2215(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Projectile Turret'),
-                                      'damageMultiplier', ship.getModifiedItemAttr('shipBonusRole7'))
+                                      'damageMultiplier', ship.getModifiedItemAttr('shipBonusRole7'), **kwargs)
 
 
 class Effect2232(BaseEffect):
@@ -6594,11 +6650,11 @@ class Effect2232(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         for type in ('Gravimetric', 'Magnetometric', 'Radar', 'Ladar'):
             fit.ship.boostItemAttr('scan%sStrength' % type,
                                    module.getModifiedItemAttr('scan%sStrengthPercent' % type),
-                                   stackingPenalties=True)
+                                   stackingPenalties=True, **kwargs)
 
 
 class Effect2249(BaseEffect):
@@ -6612,9 +6668,10 @@ class Effect2249(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Drones'),
-                                     'miningAmount', ship.getModifiedItemAttr('shipBonusAC2'), skill='Amarr Cruiser')
+                                     'miningAmount', ship.getModifiedItemAttr('shipBonusAC2'),
+                                     skill='Amarr Cruiser', **kwargs)
 
 
 class Effect2250(BaseEffect):
@@ -6629,9 +6686,10 @@ class Effect2250(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Mining Drone Operation'),
-                                     'miningAmount', ship.getModifiedItemAttr('shipBonusGC2'), skill='Gallente Cruiser')
+                                     'miningAmount', ship.getModifiedItemAttr('shipBonusGC2'),
+                                     skill='Gallente Cruiser', **kwargs)
 
 
 class Effect2251(BaseEffect):
@@ -6647,11 +6705,11 @@ class Effect2251(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemIncrease(lambda mod: mod.item.requiresSkill('Leadership'), 'maxGroupActive',
-                                         src.getModifiedItemAttr('maxGangModules'))
+                                         src.getModifiedItemAttr('maxGangModules'), **kwargs)
         fit.modules.filteredItemIncrease(lambda mod: mod.item.requiresSkill('Leadership'), 'maxGroupOnline',
-                                         src.getModifiedItemAttr('maxGangModules'))
+                                         src.getModifiedItemAttr('maxGangModules'), **kwargs)
 
 
 class Effect2252(BaseEffect):
@@ -6674,10 +6732,10 @@ class Effect2252(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, container, context):
+    def handler(fit, container, context, **kwargs):
         fit.modules.filteredItemForce(lambda mod: mod.item.requiresSkill('Cloaking'),
                                       'moduleReactivationDelay',
-                                      container.getModifiedItemAttr('covertOpsAndReconOpsCloakModuleDelay'))
+                                      container.getModifiedItemAttr('covertOpsAndReconOpsCloakModuleDelay'), **kwargs)
 
 
 class Effect2253(BaseEffect):
@@ -6697,10 +6755,10 @@ class Effect2253(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemForce(lambda mod: mod.item.group.name == 'Cloaking Device',
                                       'cloakingTargetingDelay',
-                                      ship.getModifiedItemAttr('covertOpsStealthBomberTargettingDelay'))
+                                      ship.getModifiedItemAttr('covertOpsStealthBomberTargettingDelay'), **kwargs)
 
 
 class Effect2255(BaseEffect):
@@ -6726,12 +6784,12 @@ class Effect2298(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, implant, context):
+    def handler(fit, implant, context, **kwargs):
         for type in ('Gravimetric', 'Magnetometric', 'Radar', 'Ladar'):
             sensorType = 'scan{0}Strength'.format(type)
             sensorBoost = 'scan{0}StrengthPercent'.format(type)
             if sensorBoost in implant.item.attributes:
-                fit.ship.boostItemAttr(sensorType, implant.getModifiedItemAttr(sensorBoost))
+                fit.ship.boostItemAttr(sensorType, implant.getModifiedItemAttr(sensorBoost), **kwargs)
 
 
 class Effect2302(BaseEffect):
@@ -6745,14 +6803,14 @@ class Effect2302(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         for layer, attrPrefix in (('shield', 'shield'), ('armor', 'armor'), ('hull', '')):
             for damageType in ('Kinetic', 'Thermal', 'Explosive', 'Em'):
                 bonus = '%s%sDamageResonance' % (attrPrefix, damageType)
                 bonus = '%s%s' % (bonus[0].lower(), bonus[1:])
                 booster = '%s%sDamageResonance' % (layer, damageType)
                 fit.ship.multiplyItemAttr(bonus, module.getModifiedItemAttr(booster),
-                                          stackingPenalties=True, penaltyGroup='preMul')
+                                          stackingPenalties=True, penaltyGroup='preMul', **kwargs)
 
 
 class Effect2305(BaseEffect):
@@ -6767,10 +6825,10 @@ class Effect2305(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Energy Neutralizer',
                                       'energyNeutralizerAmount', ship.getModifiedItemAttr('eliteBonusReconShip2'),
-                                      skill='Recon Ships')
+                                      skill='Recon Ships', **kwargs)
 
 
 class Effect2354(BaseEffect):
@@ -6785,10 +6843,10 @@ class Effect2354(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, container, context):
+    def handler(fit, container, context, **kwargs):
         level = container.level if 'skill' in context else 1
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Capital Remote Armor Repair Systems'),
-                                      'capacitorNeed', container.getModifiedItemAttr('capNeedBonus') * level)
+                                      'capacitorNeed', container.getModifiedItemAttr('capNeedBonus') * level, **kwargs)
 
 
 class Effect2355(BaseEffect):
@@ -6802,10 +6860,10 @@ class Effect2355(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, container, context):
+    def handler(fit, container, context, **kwargs):
         level = container.level if 'skill' in context else 1
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Capital Shield Emission Systems'),
-                                      'capacitorNeed', container.getModifiedItemAttr('capNeedBonus') * level)
+                                      'capacitorNeed', container.getModifiedItemAttr('capNeedBonus') * level, **kwargs)
 
 
 class Effect2356(BaseEffect):
@@ -6819,9 +6877,9 @@ class Effect2356(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, skill, context):
+    def handler(fit, skill, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Capital Capacitor Emission Systems'),
-                                      'capacitorNeed', skill.getModifiedItemAttr('capNeedBonus') * skill.level)
+                                      'capacitorNeed', skill.getModifiedItemAttr('capNeedBonus') * skill.level, **kwargs)
 
 
 class Effect2402(BaseEffect):
@@ -6835,13 +6893,13 @@ class Effect2402(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, skill, context):
+    def handler(fit, skill, context, **kwargs):
         damageTypes = ('em', 'explosive', 'kinetic', 'thermal')
         for dmgType in damageTypes:
             dmgAttr = '{0}Damage'.format(dmgType)
             fit.modules.filteredItemBoost(
                 lambda mod: mod.item.group.name == 'Super Weapon' and dmgAttr in mod.itemModifiedAttributes,
-                dmgAttr, skill.getModifiedItemAttr('damageMultiplierBonus') * skill.level)
+                dmgAttr, skill.getModifiedItemAttr('damageMultiplierBonus') * skill.level, **kwargs)
 
 
 class Effect2422(BaseEffect):
@@ -6857,8 +6915,8 @@ class Effect2422(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, implant, context):
-        fit.ship.boostItemAttr('maxVelocity', implant.getModifiedItemAttr('implantBonusVelocity'))
+    def handler(fit, implant, context, **kwargs):
+        fit.ship.boostItemAttr('maxVelocity', implant.getModifiedItemAttr('implantBonusVelocity'), **kwargs)
 
 
 class Effect2432(BaseEffect):
@@ -6877,9 +6935,9 @@ class Effect2432(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, container, context):
+    def handler(fit, container, context, **kwargs):
         level = container.level if 'skill' in context else 1
-        fit.ship.boostItemAttr('capacitorCapacity', container.getModifiedItemAttr('capacitorCapacityBonus') * level)
+        fit.ship.boostItemAttr('capacitorCapacity', container.getModifiedItemAttr('capacitorCapacityBonus') * level, **kwargs)
 
 
 class Effect2444(BaseEffect):
@@ -6894,9 +6952,9 @@ class Effect2444(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Mining'),
-                                      'cpu', module.getModifiedItemAttr('cpuPenaltyPercent'))
+                                      'cpu', module.getModifiedItemAttr('cpuPenaltyPercent'), **kwargs)
 
 
 class Effect2445(BaseEffect):
@@ -6910,9 +6968,9 @@ class Effect2445(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Ice Harvesting'),
-                                      'cpu', module.getModifiedItemAttr('cpuPenaltyPercent'))
+                                      'cpu', module.getModifiedItemAttr('cpuPenaltyPercent'), **kwargs)
 
 
 class Effect2456(BaseEffect):
@@ -6927,11 +6985,11 @@ class Effect2456(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, container, context):
+    def handler(fit, container, context, **kwargs):
         level = container.level if 'skill' in context else 1
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Mining Upgrades'),
                                       'cpuPenaltyPercent',
-                                      container.getModifiedItemAttr('miningUpgradeCPUReductionBonus') * level)
+                                      container.getModifiedItemAttr('miningUpgradeCPUReductionBonus') * level, **kwargs)
 
 
 class Effect2465(BaseEffect):
@@ -6946,10 +7004,10 @@ class Effect2465(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         for type in ('Em', 'Explosive', 'Kinetic', 'Thermal'):
             fit.ship.boostItemAttr('armor{0}DamageResonance'.format(type), ship.getModifiedItemAttr('shipBonusAB'),
-                                   skill='Amarr Battleship')
+                                   skill='Amarr Battleship', **kwargs)
 
 
 class Effect2479(BaseEffect):
@@ -6964,9 +7022,9 @@ class Effect2479(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Ice Harvesting'),
-                                      'duration', module.getModifiedItemAttr('iceHarvestCycleBonus'))
+                                      'duration', module.getModifiedItemAttr('iceHarvestCycleBonus'), **kwargs)
 
 
 class Effect2485(BaseEffect):
@@ -6983,8 +7041,8 @@ class Effect2485(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, implant, context):
-        fit.ship.boostItemAttr('armorHP', implant.getModifiedItemAttr('armorHpBonus2'))
+    def handler(fit, implant, context, **kwargs):
+        fit.ship.boostItemAttr('armorHP', implant.getModifiedItemAttr('armorHpBonus2'), **kwargs)
 
 
 class Effect2488(BaseEffect):
@@ -6998,8 +7056,8 @@ class Effect2488(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, implant, context):
-        fit.ship.boostItemAttr('maxVelocity', implant.getModifiedItemAttr('velocityBonus2'))
+    def handler(fit, implant, context, **kwargs):
+        fit.ship.boostItemAttr('maxVelocity', implant.getModifiedItemAttr('velocityBonus2'), **kwargs)
 
 
 class Effect2489(BaseEffect):
@@ -7013,10 +7071,10 @@ class Effect2489(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Remote Tracking Computer',
                                       'falloffEffectiveness', ship.getModifiedItemAttr('shipBonusMC'),
-                                      skill='Minmatar Cruiser')
+                                      skill='Minmatar Cruiser', **kwargs)
 
 
 class Effect2490(BaseEffect):
@@ -7030,10 +7088,10 @@ class Effect2490(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Remote Tracking Computer',
                                       'falloffEffectiveness', ship.getModifiedItemAttr('shipBonusGC2'),
-                                      skill='Gallente Cruiser')
+                                      skill='Gallente Cruiser', **kwargs)
 
 
 class Effect2491(BaseEffect):
@@ -7048,11 +7106,11 @@ class Effect2491(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, container, context):
+    def handler(fit, container, context, **kwargs):
         level = container.level if 'skill' in context else 1
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Burst Jammer',
                                       'ecmBurstRange', container.getModifiedItemAttr('rangeSkillBonus') * level,
-                                      stackingPenalties=False if 'skill' in context else True)
+                                      stackingPenalties=False if 'skill' in context else True, **kwargs)
 
 
 class Effect2492(BaseEffect):
@@ -7068,10 +7126,10 @@ class Effect2492(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, container, context):
+    def handler(fit, container, context, **kwargs):
         level = container.level if 'skill' in context else 1
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Burst Jammer',
-                                      'capacitorNeed', container.getModifiedItemAttr('capNeedBonus') * level)
+                                      'capacitorNeed', container.getModifiedItemAttr('capNeedBonus') * level, **kwargs)
 
 
 class Effect2503(BaseEffect):
@@ -7086,10 +7144,10 @@ class Effect2503(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Large Hybrid Turret'),
                                       'trackingSpeed', ship.getModifiedItemAttr('shipBonusGB2'),
-                                      skill='Gallente Battleship')
+                                      skill='Gallente Battleship', **kwargs)
 
 
 class Effect2504(BaseEffect):
@@ -7106,9 +7164,10 @@ class Effect2504(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Hybrid Turret'),
-                                      'trackingSpeed', ship.getModifiedItemAttr('shipBonusGF2'), skill='Gallente Frigate')
+                                      'trackingSpeed', ship.getModifiedItemAttr('shipBonusGF2'),
+                                      skill='Gallente Frigate', **kwargs)
 
 
 class Effect2561(BaseEffect):
@@ -7122,10 +7181,10 @@ class Effect2561(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
                                         'maxVelocity', ship.getModifiedItemAttr('eliteBonusGunship1'),
-                                        skill='Assault Frigates')
+                                        skill='Assault Frigates', **kwargs)
 
 
 class Effect2589(BaseEffect):
@@ -7140,12 +7199,12 @@ class Effect2589(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, container, context):
+    def handler(fit, container, context, **kwargs):
         level = container.level if 'skill' in context else 1
         for i in range(5):
             attr = 'boosterEffectChance{0}'.format(i + 1)
             fit.boosters.filteredItemBoost(lambda booster: attr in booster.itemModifiedAttributes,
-                                           attr, container.getModifiedItemAttr('boosterChanceBonus') * level)
+                                           attr, container.getModifiedItemAttr('boosterChanceBonus') * level, **kwargs)
 
 
 class Effect2602(BaseEffect):
@@ -7161,9 +7220,9 @@ class Effect2602(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.ship.boostItemAttr('shieldEmDamageResonance', ship.getModifiedItemAttr('shipBonus2CB'),
-                               skill='Caldari Battleship')
+                               skill='Caldari Battleship', **kwargs)
 
 
 class Effect2603(BaseEffect):
@@ -7179,9 +7238,9 @@ class Effect2603(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.ship.boostItemAttr('shieldExplosiveDamageResonance', ship.getModifiedItemAttr('shipBonus2CB'),
-                               skill='Caldari Battleship')
+                               skill='Caldari Battleship', **kwargs)
 
 
 class Effect2604(BaseEffect):
@@ -7197,9 +7256,9 @@ class Effect2604(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.ship.boostItemAttr('shieldKineticDamageResonance', ship.getModifiedItemAttr('shipBonus2CB'),
-                               skill='Caldari Battleship')
+                               skill='Caldari Battleship', **kwargs)
 
 
 class Effect2605(BaseEffect):
@@ -7215,9 +7274,9 @@ class Effect2605(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.ship.boostItemAttr('shieldThermalDamageResonance', ship.getModifiedItemAttr('shipBonus2CB'),
-                               skill='Caldari Battleship')
+                               skill='Caldari Battleship', **kwargs)
 
 
 class Effect2611(BaseEffect):
@@ -7231,10 +7290,10 @@ class Effect2611(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Projectile Turret'),
                                       'damageMultiplier', ship.getModifiedItemAttr('eliteBonusGunship1'),
-                                      skill='Assault Frigates')
+                                      skill='Assault Frigates', **kwargs)
 
 
 class Effect2644(BaseEffect):
@@ -7248,8 +7307,9 @@ class Effect2644(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
-        fit.ship.boostItemAttr('signatureRadius', module.getModifiedItemAttr('signatureRadiusBonus'), stackingPenalties=True)
+    def handler(fit, module, context, **kwargs):
+        fit.ship.boostItemAttr('signatureRadius', module.getModifiedItemAttr('signatureRadiusBonus'),
+                               stackingPenalties=True, **kwargs)
 
 
 class Effect2645(BaseEffect):
@@ -7264,9 +7324,9 @@ class Effect2645(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         fit.ship.multiplyItemAttr('scanResolution', module.getModifiedItemAttr('scanResolutionMultiplier'),
-                                  stackingPenalties=True)
+                                  stackingPenalties=True, **kwargs)
 
 
 class Effect2646(BaseEffect):
@@ -7280,9 +7340,9 @@ class Effect2646(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         fit.ship.boostItemAttr('maxTargetRange', module.getModifiedItemAttr('maxTargetRangeBonus'),
-                               stackingPenalties=True)
+                               stackingPenalties=True, **kwargs)
 
 
 class Effect2647(BaseEffect):
@@ -7296,10 +7356,10 @@ class Effect2647(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Missile Launcher Heavy',
                                       'speed', ship.getModifiedItemAttr('eliteBonusHeavyGunship2'),
-                                      skill='Heavy Assault Cruisers')
+                                      skill='Heavy Assault Cruisers', **kwargs)
 
 
 class Effect2648(BaseEffect):
@@ -7313,10 +7373,10 @@ class Effect2648(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Missile Launcher Heavy Assault',
                                       'speed', ship.getModifiedItemAttr('eliteBonusHeavyGunship2'),
-                                      skill='Heavy Assault Cruisers')
+                                      skill='Heavy Assault Cruisers', **kwargs)
 
 
 class Effect2649(BaseEffect):
@@ -7330,10 +7390,10 @@ class Effect2649(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Missile Launcher Rapid Light',
                                       'speed', ship.getModifiedItemAttr('eliteBonusHeavyGunship2'),
-                                      skill='Heavy Assault Cruisers')
+                                      skill='Heavy Assault Cruisers', **kwargs)
 
 
 class Effect2670(BaseEffect):
@@ -7347,18 +7407,17 @@ class Effect2670(BaseEffect):
     type = 'active'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         fit.ship.boostItemAttr('maxTargetRange', module.getModifiedItemAttr('maxTargetRangeBonus'),
-                               stackingPenalties=True)
+                               stackingPenalties=True, **kwargs)
         fit.ship.boostItemAttr('scanResolution', module.getModifiedItemAttr('scanResolutionBonus'),
-                               stackingPenalties=True)
+                               stackingPenalties=True, **kwargs)
 
         for scanType in ('Gravimetric', 'Magnetometric', 'Radar', 'Ladar'):
             fit.ship.boostItemAttr(
                 'scan{}Strength'.format(scanType),
                 module.getModifiedItemAttr('scan{}StrengthPercent'.format(scanType)),
-                stackingPenalties=True
-            )
+                stackingPenalties=True, **kwargs)
 
 
 class Effect2688(BaseEffect):
@@ -7372,9 +7431,9 @@ class Effect2688(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Energy Weapon',
-                                      'capacitorNeed', module.getModifiedItemAttr('capNeedBonus'))
+                                      'capacitorNeed', module.getModifiedItemAttr('capNeedBonus'), **kwargs)
 
 
 class Effect2689(BaseEffect):
@@ -7388,9 +7447,9 @@ class Effect2689(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Hybrid Weapon',
-                                      'capacitorNeed', module.getModifiedItemAttr('capNeedBonus'))
+                                      'capacitorNeed', module.getModifiedItemAttr('capNeedBonus'), **kwargs)
 
 
 class Effect2690(BaseEffect):
@@ -7404,9 +7463,9 @@ class Effect2690(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Energy Weapon',
-                                      'cpu', module.getModifiedItemAttr('cpuNeedBonus'))
+                                      'cpu', module.getModifiedItemAttr('cpuNeedBonus'), **kwargs)
 
 
 class Effect2691(BaseEffect):
@@ -7420,9 +7479,9 @@ class Effect2691(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Hybrid Weapon',
-                                      'cpu', module.getModifiedItemAttr('cpuNeedBonus'))
+                                      'cpu', module.getModifiedItemAttr('cpuNeedBonus'), **kwargs)
 
 
 class Effect2693(BaseEffect):
@@ -7436,10 +7495,10 @@ class Effect2693(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Energy Weapon',
                                       'falloff', module.getModifiedItemAttr('falloffBonus'),
-                                      stackingPenalties=True)
+                                      stackingPenalties=True, **kwargs)
 
 
 class Effect2694(BaseEffect):
@@ -7453,10 +7512,10 @@ class Effect2694(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Hybrid Weapon',
                                       'falloff', module.getModifiedItemAttr('falloffBonus'),
-                                      stackingPenalties=True)
+                                      stackingPenalties=True, **kwargs)
 
 
 class Effect2695(BaseEffect):
@@ -7470,10 +7529,10 @@ class Effect2695(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Projectile Weapon',
                                       'falloff', module.getModifiedItemAttr('falloffBonus'),
-                                      stackingPenalties=True)
+                                      stackingPenalties=True, **kwargs)
 
 
 class Effect2696(BaseEffect):
@@ -7487,10 +7546,10 @@ class Effect2696(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Energy Weapon',
                                       'maxRange', module.getModifiedItemAttr('maxRangeBonus'),
-                                      stackingPenalties=True)
+                                      stackingPenalties=True, **kwargs)
 
 
 class Effect2697(BaseEffect):
@@ -7504,10 +7563,10 @@ class Effect2697(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Hybrid Weapon',
                                       'maxRange', module.getModifiedItemAttr('maxRangeBonus'),
-                                      stackingPenalties=True)
+                                      stackingPenalties=True, **kwargs)
 
 
 class Effect2698(BaseEffect):
@@ -7521,10 +7580,10 @@ class Effect2698(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Projectile Weapon',
                                       'maxRange', module.getModifiedItemAttr('maxRangeBonus'),
-                                      stackingPenalties=True)
+                                      stackingPenalties=True, **kwargs)
 
 
 class Effect2706(BaseEffect):
@@ -7538,9 +7597,9 @@ class Effect2706(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Energy Weapon',
-                                      'power', module.getModifiedItemAttr('drawback'))
+                                      'power', module.getModifiedItemAttr('drawback'), **kwargs)
 
 
 class Effect2707(BaseEffect):
@@ -7554,9 +7613,9 @@ class Effect2707(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Hybrid Weapon',
-                                      'power', module.getModifiedItemAttr('drawback'))
+                                      'power', module.getModifiedItemAttr('drawback'), **kwargs)
 
 
 class Effect2708(BaseEffect):
@@ -7570,9 +7629,9 @@ class Effect2708(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Projectile Weapon',
-                                      'power', module.getModifiedItemAttr('drawback'))
+                                      'power', module.getModifiedItemAttr('drawback'), **kwargs)
 
 
 class Effect2712(BaseEffect):
@@ -7586,8 +7645,8 @@ class Effect2712(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
-        fit.ship.boostItemAttr('armorHP', module.getModifiedItemAttr('drawback'))
+    def handler(fit, module, context, **kwargs):
+        fit.ship.boostItemAttr('armorHP', module.getModifiedItemAttr('drawback'), **kwargs)
 
 
 class Effect2713(BaseEffect):
@@ -7601,8 +7660,8 @@ class Effect2713(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
-        fit.ship.boostItemAttr('cpuOutput', module.getModifiedItemAttr('drawback'))
+    def handler(fit, module, context, **kwargs):
+        fit.ship.boostItemAttr('cpuOutput', module.getModifiedItemAttr('drawback'), **kwargs)
 
 
 class Effect2714(BaseEffect):
@@ -7616,9 +7675,9 @@ class Effect2714(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Missile Launcher Operation'),
-                                      'cpu', module.getModifiedItemAttr('drawback'))
+                                      'cpu', module.getModifiedItemAttr('drawback'), **kwargs)
 
 
 class Effect2716(BaseEffect):
@@ -7633,8 +7692,9 @@ class Effect2716(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
-        fit.ship.boostItemAttr('signatureRadius', module.getModifiedItemAttr('drawback'), stackingPenalties=True)
+    def handler(fit, module, context, **kwargs):
+        fit.ship.boostItemAttr('signatureRadius', module.getModifiedItemAttr('drawback'),
+                               stackingPenalties=True, **kwargs)
 
 
 class Effect2717(BaseEffect):
@@ -7649,9 +7709,9 @@ class Effect2717(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         fit.ship.boostItemAttr('maxVelocity', module.getModifiedItemAttr('drawback'),
-                               stackingPenalties=True)
+                               stackingPenalties=True, **kwargs)
 
 
 class Effect2718(BaseEffect):
@@ -7667,8 +7727,8 @@ class Effect2718(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
-        fit.ship.boostItemAttr('shieldCapacity', module.getModifiedItemAttr('drawback'))
+    def handler(fit, module, context, **kwargs):
+        fit.ship.boostItemAttr('shieldCapacity', module.getModifiedItemAttr('drawback'), **kwargs)
 
 
 class Effect2726(BaseEffect):
@@ -7693,9 +7753,9 @@ class Effect2727(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, skill, context):
+    def handler(fit, skill, context, **kwargs):
         fit.modules.filteredItemIncrease(lambda mod: mod.item.group.name == 'Gas Cloud Harvester',
-                                         'maxGroupActive', skill.level)
+                                         'maxGroupActive', skill.level, **kwargs)
 
 
 class Effect2734(BaseEffect):
@@ -7709,11 +7769,12 @@ class Effect2734(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         for type in ('Gravimetric', 'Ladar', 'Radar', 'Magnetometric'):
             fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'ECM',
                                           'scan{0}StrengthBonus'.format(type),
-                                          ship.getModifiedItemAttr('shipBonusCF'), skill='Caldari Frigate')
+                                          ship.getModifiedItemAttr('shipBonusCF'),
+                                          skill='Caldari Frigate', **kwargs)
 
 
 class Effect2735(BaseEffect):
@@ -7729,8 +7790,8 @@ class Effect2735(BaseEffect):
     type = 'boosterSideEffect'
 
     @classmethod
-    def handler(cls, fit, booster, context):
-        fit.ship.boostItemAttr('armorHP', booster.getModifiedItemAttr(cls.attr))
+    def handler(cls, fit, booster, context, **kwargs):
+        fit.ship.boostItemAttr('armorHP', booster.getModifiedItemAttr(cls.attr), **kwargs)
 
 
 class Effect2736(BaseEffect):
@@ -7748,9 +7809,9 @@ class Effect2736(BaseEffect):
     type = 'boosterSideEffect'
 
     @classmethod
-    def handler(cls, fit, booster, context):
+    def handler(cls, fit, booster, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Armor Repair Unit',
-                                      'armorDamageAmount', booster.getModifiedItemAttr(cls.attr))
+                                      'armorDamageAmount', booster.getModifiedItemAttr(cls.attr), **kwargs)
 
 
 class Effect2737(BaseEffect):
@@ -7766,8 +7827,8 @@ class Effect2737(BaseEffect):
     type = 'boosterSideEffect'
 
     @classmethod
-    def handler(cls, fit, booster, context):
-        fit.ship.boostItemAttr('shieldCapacity', booster.getModifiedItemAttr(cls.attr))
+    def handler(cls, fit, booster, context, **kwargs):
+        fit.ship.boostItemAttr('shieldCapacity', booster.getModifiedItemAttr(cls.attr), **kwargs)
 
 
 class Effect2739(BaseEffect):
@@ -7785,9 +7846,9 @@ class Effect2739(BaseEffect):
     type = 'boosterSideEffect'
 
     @classmethod
-    def handler(cls, fit, booster, context):
+    def handler(cls, fit, booster, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Gunnery'),
-                                      'maxRange', booster.getModifiedItemAttr(cls.attr))
+                                      'maxRange', booster.getModifiedItemAttr(cls.attr), **kwargs)
 
 
 class Effect2741(BaseEffect):
@@ -7804,9 +7865,9 @@ class Effect2741(BaseEffect):
     type = 'boosterSideEffect'
 
     @classmethod
-    def handler(cls, fit, booster, context):
+    def handler(cls, fit, booster, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Gunnery'),
-                                      'falloff', booster.getModifiedItemAttr(cls.attr))
+                                      'falloff', booster.getModifiedItemAttr(cls.attr), **kwargs)
 
 
 class Effect2745(BaseEffect):
@@ -7823,8 +7884,8 @@ class Effect2745(BaseEffect):
     type = 'boosterSideEffect'
 
     @classmethod
-    def handler(cls, fit, booster, context):
-        fit.ship.boostItemAttr('capacitorCapacity', booster.getModifiedItemAttr(cls.attr))
+    def handler(cls, fit, booster, context, **kwargs):
+        fit.ship.boostItemAttr('capacitorCapacity', booster.getModifiedItemAttr(cls.attr), **kwargs)
 
 
 class Effect2746(BaseEffect):
@@ -7841,8 +7902,8 @@ class Effect2746(BaseEffect):
     type = 'boosterSideEffect'
 
     @classmethod
-    def handler(cls, fit, booster, context):
-        fit.ship.boostItemAttr('maxVelocity', booster.getModifiedItemAttr(cls.attr))
+    def handler(cls, fit, booster, context, **kwargs):
+        fit.ship.boostItemAttr('maxVelocity', booster.getModifiedItemAttr(cls.attr), **kwargs)
 
 
 class Effect2747(BaseEffect):
@@ -7859,9 +7920,9 @@ class Effect2747(BaseEffect):
     type = 'boosterSideEffect'
 
     @classmethod
-    def handler(cls, fit, booster, context):
+    def handler(cls, fit, booster, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Gunnery'),
-                                      'trackingSpeed', booster.getModifiedItemAttr(cls.attr))
+                                      'trackingSpeed', booster.getModifiedItemAttr(cls.attr), **kwargs)
 
 
 class Effect2748(BaseEffect):
@@ -7878,9 +7939,9 @@ class Effect2748(BaseEffect):
     type = 'boosterSideEffect'
 
     @classmethod
-    def handler(cls, fit, booster, context):
+    def handler(cls, fit, booster, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
-                                        'maxVelocity', booster.getModifiedItemAttr(cls.attr))
+                                        'maxVelocity', booster.getModifiedItemAttr(cls.attr), **kwargs)
 
 
 class Effect2749(BaseEffect):
@@ -7896,9 +7957,9 @@ class Effect2749(BaseEffect):
     type = 'boosterSideEffect'
 
     @classmethod
-    def handler(cls, fit, booster, context):
+    def handler(cls, fit, booster, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
-                                        'aoeVelocity', booster.getModifiedItemAttr(cls.attr))
+                                        'aoeVelocity', booster.getModifiedItemAttr(cls.attr), **kwargs)
 
 
 class Effect2756(BaseEffect):
@@ -7912,11 +7973,11 @@ class Effect2756(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         for type in ('Gravimetric', 'Magnetometric', 'Ladar', 'Radar'):
             fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'ECM',
                                           'scan{0}StrengthBonus'.format(type), ship.getModifiedItemAttr('shipBonusCC'),
-                                          skill='Caldari Cruiser')
+                                          skill='Caldari Cruiser', **kwargs)
 
 
 class Effect2757(BaseEffect):
@@ -7944,12 +8005,12 @@ class Effect2760(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, container, context):
+    def handler(fit, container, context, **kwargs):
         level = container.level if 'skill' in context else 1
         attrs = ('boosterArmorHPPenalty', 'boosterArmorRepairAmountPenalty')
         for attr in attrs:
             fit.boosters.filteredItemBoost(lambda booster: True, attr,
-                                           container.getModifiedItemAttr('boosterAttributeModifier') * level)
+                                           container.getModifiedItemAttr('boosterAttributeModifier') * level, **kwargs)
 
 
 class Effect2763(BaseEffect):
@@ -7965,14 +8026,14 @@ class Effect2763(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, container, context):
+    def handler(fit, container, context, **kwargs):
         level = container.level if 'skill' in context else 1
         attrs = ('boosterShieldBoostAmountPenalty', 'boosterShieldCapacityPenalty', 'shieldBoostMultiplier')
         for attr in attrs:
             # shieldBoostMultiplier can be positive (Blue Pill) and negative value (other boosters)
             # We're interested in decreasing only side-effects
             fit.boosters.filteredItemBoost(lambda booster: booster.getModifiedItemAttr(attr) < 0,
-                                           attr, container.getModifiedItemAttr('boosterAttributeModifier') * level)
+                                           attr, container.getModifiedItemAttr('boosterAttributeModifier') * level, **kwargs)
 
 
 class Effect2766(BaseEffect):
@@ -7988,12 +8049,12 @@ class Effect2766(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, container, context):
+    def handler(fit, container, context, **kwargs):
         level = container.level if 'skill' in context else 1
         attrs = ('boosterCapacitorCapacityPenalty', 'boosterMaxVelocityPenalty')
         for attr in attrs:
             fit.boosters.filteredItemBoost(lambda booster: True, attr,
-                                           container.getModifiedItemAttr('boosterAttributeModifier') * level)
+                                           container.getModifiedItemAttr('boosterAttributeModifier') * level, **kwargs)
 
 
 class Effect2776(BaseEffect):
@@ -8009,12 +8070,12 @@ class Effect2776(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, container, context):
+    def handler(fit, container, context, **kwargs):
         level = container.level if 'skill' in context else 1
         attrs = ('boosterAOEVelocityPenalty', 'boosterMissileAOECloudPenalty', 'boosterMissileVelocityPenalty')
         for attr in attrs:
             fit.boosters.filteredItemBoost(lambda booster: True, attr,
-                                           container.getModifiedItemAttr('boosterAttributeModifier') * level)
+                                           container.getModifiedItemAttr('boosterAttributeModifier') * level, **kwargs)
 
 
 class Effect2778(BaseEffect):
@@ -8030,12 +8091,12 @@ class Effect2778(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, container, context):
+    def handler(fit, container, context, **kwargs):
         level = container.level if 'skill' in context else 1
         attrs = ('boosterTurretFalloffPenalty', 'boosterTurretOptimalRangePenalty', 'boosterTurretTrackingPenalty')
         for attr in attrs:
             fit.boosters.filteredItemBoost(lambda booster: True, attr,
-                                           container.getModifiedItemAttr('boosterAttributeModifier') * level)
+                                           container.getModifiedItemAttr('boosterAttributeModifier') * level, **kwargs)
 
 
 class Effect2791(BaseEffect):
@@ -8052,9 +8113,9 @@ class Effect2791(BaseEffect):
     type = 'boosterSideEffect'
 
     @classmethod
-    def handler(cls, fit, booster, context):
+    def handler(cls, fit, booster, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
-                                        'aoeCloudSize', booster.getModifiedItemAttr(cls.attr))
+                                        'aoeCloudSize', booster.getModifiedItemAttr(cls.attr), **kwargs)
 
 
 class Effect2792(BaseEffect):
@@ -8068,11 +8129,11 @@ class Effect2792(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         for type in ('kinetic', 'thermal', 'explosive', 'em'):
             fit.ship.boostItemAttr('armor' + type.capitalize() + 'DamageResonance',
                                    module.getModifiedItemAttr(type + 'DamageResistanceBonus') or 0,
-                                   stackingPenalties=True)
+                                   stackingPenalties=True, **kwargs)
 
 
 class Effect2794(BaseEffect):
@@ -8087,10 +8148,10 @@ class Effect2794(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, container, context):
+    def handler(fit, container, context, **kwargs):
         fit.modules.filteredItemIncrease(lambda mod: mod.item.requiresSkill('Salvaging'),
                                          'accessDifficultyBonus', container.getModifiedItemAttr('accessDifficultyBonus'),
-                                         position='post')
+                                         position='post', **kwargs)
 
 
 class Effect2795(BaseEffect):
@@ -8104,11 +8165,11 @@ class Effect2795(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         for type in ('kinetic', 'thermal', 'explosive', 'em'):
             fit.ship.boostItemAttr('shield' + type.capitalize() + 'DamageResonance',
                                    module.getModifiedItemAttr(type + 'DamageResistanceBonus') or 0,
-                                   stackingPenalties=True)
+                                   stackingPenalties=True, **kwargs)
 
 
 class Effect2796(BaseEffect):
@@ -8122,8 +8183,9 @@ class Effect2796(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
-        fit.ship.boostItemAttr('mass', module.getModifiedItemAttr('massBonusPercentage'), stackingPenalties=True)
+    def handler(fit, module, context, **kwargs):
+        fit.ship.boostItemAttr('mass', module.getModifiedItemAttr('massBonusPercentage'),
+                               stackingPenalties=True, **kwargs)
 
 
 class Effect2797(BaseEffect):
@@ -8137,10 +8199,10 @@ class Effect2797(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == 'Projectile Weapon',
                                          'speed', module.getModifiedItemAttr('speedMultiplier'),
-                                         stackingPenalties=True)
+                                         stackingPenalties=True, **kwargs)
 
 
 class Effect2798(BaseEffect):
@@ -8154,10 +8216,10 @@ class Effect2798(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == 'Projectile Weapon',
                                          'damageMultiplier', module.getModifiedItemAttr('damageMultiplier'),
-                                         stackingPenalties=True)
+                                         stackingPenalties=True, **kwargs)
 
 
 class Effect2799(BaseEffect):
@@ -8171,10 +8233,10 @@ class Effect2799(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill('Missile Launcher Operation'),
                                          'speed', module.getModifiedItemAttr('speedMultiplier'),
-                                         stackingPenalties=True)
+                                         stackingPenalties=True, **kwargs)
 
 
 class Effect2801(BaseEffect):
@@ -8188,10 +8250,10 @@ class Effect2801(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == 'Energy Weapon',
                                          'speed', module.getModifiedItemAttr('speedMultiplier'),
-                                         stackingPenalties=True)
+                                         stackingPenalties=True, **kwargs)
 
 
 class Effect2802(BaseEffect):
@@ -8205,10 +8267,10 @@ class Effect2802(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == 'Hybrid Weapon',
                                          'damageMultiplier', module.getModifiedItemAttr('damageMultiplier'),
-                                         stackingPenalties=True)
+                                         stackingPenalties=True, **kwargs)
 
 
 class Effect2803(BaseEffect):
@@ -8222,10 +8284,10 @@ class Effect2803(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == 'Energy Weapon',
                                          'damageMultiplier', module.getModifiedItemAttr('damageMultiplier'),
-                                         stackingPenalties=True)
+                                         stackingPenalties=True, **kwargs)
 
 
 class Effect2804(BaseEffect):
@@ -8239,10 +8301,10 @@ class Effect2804(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == 'Hybrid Weapon',
                                          'speed', module.getModifiedItemAttr('speedMultiplier'),
-                                         stackingPenalties=True)
+                                         stackingPenalties=True, **kwargs)
 
 
 class Effect2805(BaseEffect):
@@ -8257,10 +8319,10 @@ class Effect2805(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Large Energy Turret'),
                                       'damageMultiplier', ship.getModifiedItemAttr('shipBonusAB2'),
-                                      skill='Amarr Battleship')
+                                      skill='Amarr Battleship', **kwargs)
 
 
 class Effect2809(BaseEffect):
@@ -8275,9 +8337,10 @@ class Effect2809(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Assault Missiles'),
-                                        'maxVelocity', ship.getModifiedItemAttr('shipBonusCC2'), skill='Caldari Cruiser')
+                                        'maxVelocity', ship.getModifiedItemAttr('shipBonusCC2'),
+                                        skill='Caldari Cruiser', **kwargs)
 
 
 class Effect2810(BaseEffect):
@@ -8291,10 +8354,10 @@ class Effect2810(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Assault Missiles'),
                                         'explosionDelay', ship.getModifiedItemAttr('eliteBonusHeavyGunship1'),
-                                        skill='Heavy Assault Cruisers')
+                                        skill='Heavy Assault Cruisers', **kwargs)
 
 
 class Effect2812(BaseEffect):
@@ -8308,9 +8371,10 @@ class Effect2812(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Burst Jammer',
-                                      'ecmBurstRange', ship.getModifiedItemAttr('shipBonusCB3'), skill='Caldari Battleship')
+                                      'ecmBurstRange', ship.getModifiedItemAttr('shipBonusCB3'),
+                                      skill='Caldari Battleship', **kwargs)
 
 
 class Effect2837(BaseEffect):
@@ -8324,8 +8388,8 @@ class Effect2837(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
-        fit.ship.increaseItemAttr('armorHP', module.getModifiedItemAttr('armorHPBonusAdd'))
+    def handler(fit, module, context, **kwargs):
+        fit.ship.increaseItemAttr('armorHP', module.getModifiedItemAttr('armorHPBonusAdd'), **kwargs)
 
 
 class Effect2847(BaseEffect):
@@ -8343,10 +8407,10 @@ class Effect2847(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, container, context):
+    def handler(fit, container, context, **kwargs):
         level = container.level if 'skill' in context else 1
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Gunnery'),
-                                      'trackingSpeed', container.getModifiedItemAttr('trackingSpeedBonus') * level)
+                                      'trackingSpeed', container.getModifiedItemAttr('trackingSpeedBonus') * level, **kwargs)
 
 
 class Effect2848(BaseEffect):
@@ -8362,10 +8426,11 @@ class Effect2848(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, container, context):
+    def handler(fit, container, context, **kwargs):
         fit.modules.filteredItemIncrease(lambda module: module.item.requiresSkill('Archaeology'),
                                          'accessDifficultyBonus',
-                                         container.getModifiedItemAttr('accessDifficultyBonusModifier'), position='post')
+                                         container.getModifiedItemAttr('accessDifficultyBonusModifier'),
+                                         position='post', **kwargs)
 
 
 class Effect2849(BaseEffect):
@@ -8382,10 +8447,11 @@ class Effect2849(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, container, context):
+    def handler(fit, container, context, **kwargs):
         fit.modules.filteredItemIncrease(lambda c: c.item.requiresSkill('Hacking'),
                                          'accessDifficultyBonus',
-                                         container.getModifiedItemAttr('accessDifficultyBonusModifier'), position='post')
+                                         container.getModifiedItemAttr('accessDifficultyBonusModifier'),
+                                         position='post', **kwargs)
 
 
 class Effect2850(BaseEffect):
@@ -8399,9 +8465,9 @@ class Effect2850(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Propulsion Module',
-                                      'duration', module.getModifiedItemAttr('durationBonus'))
+                                      'duration', module.getModifiedItemAttr('durationBonus'), **kwargs)
 
 
 class Effect2851(BaseEffect):
@@ -8415,12 +8481,12 @@ class Effect2851(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, container, context):
+    def handler(fit, container, context, **kwargs):
         for dmgType in ('em', 'kinetic', 'explosive', 'thermal'):
             fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
                                                '%sDamage' % dmgType,
                                                container.getModifiedItemAttr('missileDamageMultiplierBonus'),
-                                               stackingPenalties=True)
+                                               stackingPenalties=True, **kwargs)
 
 
 class Effect2853(BaseEffect):
@@ -8434,9 +8500,9 @@ class Effect2853(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         fit.modules.filteredItemBoost(lambda module: module.item.requiresSkill('Cloaking'),
-                                      'cloakingTargetingDelay', module.getModifiedItemAttr('cloakingTargetingDelayBonus'))
+                                      'cloakingTargetingDelay', module.getModifiedItemAttr('cloakingTargetingDelayBonus'), **kwargs)
 
 
 class Effect2857(BaseEffect):
@@ -8450,8 +8516,8 @@ class Effect2857(BaseEffect):
     type = 'active'
 
     @staticmethod
-    def handler(fit, module, context):
-        fit.ship.boostItemAttr('maxVelocity', module.getModifiedItemAttr('speedFactor'))
+    def handler(fit, module, context, **kwargs):
+        fit.ship.boostItemAttr('maxVelocity', module.getModifiedItemAttr('speedFactor'), **kwargs)
 
 
 class Effect2865(BaseEffect):
@@ -8467,9 +8533,9 @@ class Effect2865(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         fit.ship.boostItemAttr('maxVelocity', module.getModifiedItemAttr('implantBonusVelocity'),
-                               stackingPenalties=True)
+                               stackingPenalties=True, **kwargs)
 
 
 class Effect2866(BaseEffect):
@@ -8484,10 +8550,10 @@ class Effect2866(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, container, context):
+    def handler(fit, container, context, **kwargs):
         level = container.level if 'skill' in context else 1
         fit.boosters.filteredItemBoost(lambda bst: True, 'boosterDuration',
-                                       container.getModifiedItemAttr('durationBonus') * level)
+                                       container.getModifiedItemAttr('durationBonus') * level, **kwargs)
 
 
 class Effect2867(BaseEffect):
@@ -8501,10 +8567,10 @@ class Effect2867(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Sentry Drone Interfacing'),
                                      'damageMultiplier', module.getModifiedItemAttr('damageMultiplierBonus'),
-                                     stackingPenalties=True)
+                                     stackingPenalties=True, **kwargs)
 
 
 class Effect2868(BaseEffect):
@@ -8518,10 +8584,10 @@ class Effect2868(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, implant, context):
+    def handler(fit, implant, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Capital Repair Systems'),
                                       'armorDamageAmount', implant.getModifiedItemAttr('repairBonus'),
-                                      stackingPenalties=True)
+                                      stackingPenalties=True, **kwargs)
 
 
 class Effect2872(BaseEffect):
@@ -8535,9 +8601,9 @@ class Effect2872(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, container, context):
+    def handler(fit, container, context, **kwargs):
         fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill('Defender Missiles'),
-                                           'maxVelocity', container.getModifiedItemAttr('missileVelocityBonus'))
+                                           'maxVelocity', container.getModifiedItemAttr('missileVelocityBonus'), **kwargs)
 
 
 class Effect2881(BaseEffect):
@@ -8551,9 +8617,9 @@ class Effect2881(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, implant, context):
+    def handler(fit, implant, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Cruise Missiles'),
-                                        'emDamage', implant.getModifiedItemAttr('damageMultiplierBonus'))
+                                        'emDamage', implant.getModifiedItemAttr('damageMultiplierBonus'), **kwargs)
 
 
 class Effect2882(BaseEffect):
@@ -8567,9 +8633,9 @@ class Effect2882(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, container, context):
+    def handler(fit, container, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Cruise Missiles'),
-                                        'explosiveDamage', container.getModifiedItemAttr('damageMultiplierBonus'))
+                                        'explosiveDamage', container.getModifiedItemAttr('damageMultiplierBonus'), **kwargs)
 
 
 class Effect2883(BaseEffect):
@@ -8583,9 +8649,9 @@ class Effect2883(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, container, context):
+    def handler(fit, container, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Cruise Missiles'),
-                                        'kineticDamage', container.getModifiedItemAttr('damageMultiplierBonus'))
+                                        'kineticDamage', container.getModifiedItemAttr('damageMultiplierBonus'), **kwargs)
 
 
 class Effect2884(BaseEffect):
@@ -8599,9 +8665,9 @@ class Effect2884(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, container, context):
+    def handler(fit, container, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Cruise Missiles'),
-                                        'thermalDamage', container.getModifiedItemAttr('damageMultiplierBonus'))
+                                        'thermalDamage', container.getModifiedItemAttr('damageMultiplierBonus'), **kwargs)
 
 
 class Effect2885(BaseEffect):
@@ -8615,9 +8681,9 @@ class Effect2885(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, implant, context):
+    def handler(fit, implant, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Gas Cloud Harvesting'),
-                                      'duration', implant.getModifiedItemAttr('durationBonus'))
+                                      'duration', implant.getModifiedItemAttr('durationBonus'), **kwargs)
 
 
 class Effect2887(BaseEffect):
@@ -8631,9 +8697,9 @@ class Effect2887(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, implant, context):
+    def handler(fit, implant, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Rockets'),
-                                        'emDamage', implant.getModifiedItemAttr('damageMultiplierBonus'))
+                                        'emDamage', implant.getModifiedItemAttr('damageMultiplierBonus'), **kwargs)
 
 
 class Effect2888(BaseEffect):
@@ -8647,9 +8713,9 @@ class Effect2888(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, container, context):
+    def handler(fit, container, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Rockets'),
-                                        'explosiveDamage', container.getModifiedItemAttr('damageMultiplierBonus'))
+                                        'explosiveDamage', container.getModifiedItemAttr('damageMultiplierBonus'), **kwargs)
 
 
 class Effect2889(BaseEffect):
@@ -8663,9 +8729,9 @@ class Effect2889(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, container, context):
+    def handler(fit, container, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Rockets'),
-                                        'kineticDamage', container.getModifiedItemAttr('damageMultiplierBonus'))
+                                        'kineticDamage', container.getModifiedItemAttr('damageMultiplierBonus'), **kwargs)
 
 
 class Effect2890(BaseEffect):
@@ -8679,9 +8745,9 @@ class Effect2890(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, container, context):
+    def handler(fit, container, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Rockets'),
-                                        'thermalDamage', container.getModifiedItemAttr('damageMultiplierBonus'))
+                                        'thermalDamage', container.getModifiedItemAttr('damageMultiplierBonus'), **kwargs)
 
 
 class Effect2891(BaseEffect):
@@ -8695,9 +8761,9 @@ class Effect2891(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, implant, context):
+    def handler(fit, implant, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Light Missiles'),
-                                        'emDamage', implant.getModifiedItemAttr('damageMultiplierBonus'))
+                                        'emDamage', implant.getModifiedItemAttr('damageMultiplierBonus'), **kwargs)
 
 
 class Effect2892(BaseEffect):
@@ -8711,9 +8777,9 @@ class Effect2892(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, container, context):
+    def handler(fit, container, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Light Missiles'),
-                                        'explosiveDamage', container.getModifiedItemAttr('damageMultiplierBonus'))
+                                        'explosiveDamage', container.getModifiedItemAttr('damageMultiplierBonus'), **kwargs)
 
 
 class Effect2893(BaseEffect):
@@ -8727,9 +8793,9 @@ class Effect2893(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, container, context):
+    def handler(fit, container, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Light Missiles'),
-                                        'kineticDamage', container.getModifiedItemAttr('damageMultiplierBonus'))
+                                        'kineticDamage', container.getModifiedItemAttr('damageMultiplierBonus'), **kwargs)
 
 
 class Effect2894(BaseEffect):
@@ -8743,9 +8809,9 @@ class Effect2894(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, container, context):
+    def handler(fit, container, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Light Missiles'),
-                                        'thermalDamage', container.getModifiedItemAttr('damageMultiplierBonus'))
+                                        'thermalDamage', container.getModifiedItemAttr('damageMultiplierBonus'), **kwargs)
 
 
 class Effect2899(BaseEffect):
@@ -8759,9 +8825,9 @@ class Effect2899(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, implant, context):
+    def handler(fit, implant, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Missiles'),
-                                        'emDamage', implant.getModifiedItemAttr('damageMultiplierBonus'))
+                                        'emDamage', implant.getModifiedItemAttr('damageMultiplierBonus'), **kwargs)
 
 
 class Effect2900(BaseEffect):
@@ -8775,9 +8841,9 @@ class Effect2900(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, container, context):
+    def handler(fit, container, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Missiles'),
-                                        'explosiveDamage', container.getModifiedItemAttr('damageMultiplierBonus'))
+                                        'explosiveDamage', container.getModifiedItemAttr('damageMultiplierBonus'), **kwargs)
 
 
 class Effect2901(BaseEffect):
@@ -8791,9 +8857,9 @@ class Effect2901(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, container, context):
+    def handler(fit, container, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Missiles'),
-                                        'kineticDamage', container.getModifiedItemAttr('damageMultiplierBonus'))
+                                        'kineticDamage', container.getModifiedItemAttr('damageMultiplierBonus'), **kwargs)
 
 
 class Effect2902(BaseEffect):
@@ -8807,9 +8873,9 @@ class Effect2902(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, container, context):
+    def handler(fit, container, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Missiles'),
-                                        'thermalDamage', container.getModifiedItemAttr('damageMultiplierBonus'))
+                                        'thermalDamage', container.getModifiedItemAttr('damageMultiplierBonus'), **kwargs)
 
 
 class Effect2903(BaseEffect):
@@ -8823,9 +8889,9 @@ class Effect2903(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, implant, context):
+    def handler(fit, implant, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Assault Missiles'),
-                                        'emDamage', implant.getModifiedItemAttr('damageMultiplierBonus'))
+                                        'emDamage', implant.getModifiedItemAttr('damageMultiplierBonus'), **kwargs)
 
 
 class Effect2904(BaseEffect):
@@ -8839,9 +8905,9 @@ class Effect2904(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, container, context):
+    def handler(fit, container, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Assault Missiles'),
-                                        'explosiveDamage', container.getModifiedItemAttr('damageMultiplierBonus'))
+                                        'explosiveDamage', container.getModifiedItemAttr('damageMultiplierBonus'), **kwargs)
 
 
 class Effect2905(BaseEffect):
@@ -8855,9 +8921,9 @@ class Effect2905(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, container, context):
+    def handler(fit, container, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Assault Missiles'),
-                                        'kineticDamage', container.getModifiedItemAttr('damageMultiplierBonus'))
+                                        'kineticDamage', container.getModifiedItemAttr('damageMultiplierBonus'), **kwargs)
 
 
 class Effect2906(BaseEffect):
@@ -8871,9 +8937,9 @@ class Effect2906(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, container, context):
+    def handler(fit, container, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Assault Missiles'),
-                                        'thermalDamage', container.getModifiedItemAttr('damageMultiplierBonus'))
+                                        'thermalDamage', container.getModifiedItemAttr('damageMultiplierBonus'), **kwargs)
 
 
 class Effect2907(BaseEffect):
@@ -8887,9 +8953,9 @@ class Effect2907(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, implant, context):
+    def handler(fit, implant, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Torpedoes'),
-                                        'emDamage', implant.getModifiedItemAttr('damageMultiplierBonus'))
+                                        'emDamage', implant.getModifiedItemAttr('damageMultiplierBonus'), **kwargs)
 
 
 class Effect2908(BaseEffect):
@@ -8903,9 +8969,9 @@ class Effect2908(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, container, context):
+    def handler(fit, container, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Torpedoes'),
-                                        'explosiveDamage', container.getModifiedItemAttr('damageMultiplierBonus'))
+                                        'explosiveDamage', container.getModifiedItemAttr('damageMultiplierBonus'), **kwargs)
 
 
 class Effect2909(BaseEffect):
@@ -8919,9 +8985,9 @@ class Effect2909(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, container, context):
+    def handler(fit, container, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Torpedoes'),
-                                        'kineticDamage', container.getModifiedItemAttr('damageMultiplierBonus'))
+                                        'kineticDamage', container.getModifiedItemAttr('damageMultiplierBonus'), **kwargs)
 
 
 class Effect2910(BaseEffect):
@@ -8935,9 +9001,9 @@ class Effect2910(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, container, context):
+    def handler(fit, container, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Torpedoes'),
-                                        'thermalDamage', container.getModifiedItemAttr('damageMultiplierBonus'))
+                                        'thermalDamage', container.getModifiedItemAttr('damageMultiplierBonus'), **kwargs)
 
 
 class Effect2911(BaseEffect):
@@ -8951,9 +9017,9 @@ class Effect2911(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, implant, context):
+    def handler(fit, implant, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Data Miners',
-                                      'duration', implant.getModifiedItemAttr('durationBonus'))
+                                      'duration', implant.getModifiedItemAttr('durationBonus'), **kwargs)
 
 
 class Effect2967(BaseEffect):
@@ -8967,10 +9033,10 @@ class Effect2967(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, skill, context):
+    def handler(fit, skill, context, **kwargs):
         amount = -skill.getModifiedItemAttr('consumptionQuantityBonus')
         fit.modules.filteredItemIncrease(lambda mod: mod.item.requiresSkill(skill),
-                                         'consumptionQuantity', amount * skill.level)
+                                         'consumptionQuantity', amount * skill.level, **kwargs)
 
 
 class Effect2979(BaseEffect):
@@ -8984,9 +9050,9 @@ class Effect2979(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, skill, context):
+    def handler(fit, skill, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Remote Hull Repair Systems'),
-                                      'capacitorNeed', skill.getModifiedItemAttr('capNeedBonus') * skill.level)
+                                      'capacitorNeed', skill.getModifiedItemAttr('capNeedBonus') * skill.level, **kwargs)
 
 
 class Effect2980(BaseEffect):
@@ -9000,9 +9066,9 @@ class Effect2980(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, skill, context):
+    def handler(fit, skill, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Capital Remote Hull Repair Systems'),
-                                      'capacitorNeed', skill.getModifiedItemAttr('capNeedBonus') * skill.level)
+                                      'capacitorNeed', skill.getModifiedItemAttr('capNeedBonus') * skill.level, **kwargs)
 
 
 class Effect2982(BaseEffect):
@@ -9016,32 +9082,32 @@ class Effect2982(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, skill, context):
+    def handler(fit, skill, context, **kwargs):
         # We need to make sure that the attribute exists, otherwise we add attributes that don't belong.  See #927
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Burst Projector Operation') and
                                                   mod.item.getAttribute('duration'),
                                       'duration',
-                                      skill.getModifiedItemAttr('projECMDurationBonus') * skill.level)
+                                      skill.getModifiedItemAttr('projECMDurationBonus') * skill.level, **kwargs)
 
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Burst Projector Operation') and
                                                   mod.item.getAttribute('durationECMJammerBurstProjector'),
                                       'durationECMJammerBurstProjector',
-                                      skill.getModifiedItemAttr('projECMDurationBonus') * skill.level)
+                                      skill.getModifiedItemAttr('projECMDurationBonus') * skill.level, **kwargs)
 
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Burst Projector Operation') and
                                                   mod.item.getAttribute('durationTargetIlluminationBurstProjector'),
                                       'durationTargetIlluminationBurstProjector',
-                                      skill.getModifiedItemAttr('projECMDurationBonus') * skill.level)
+                                      skill.getModifiedItemAttr('projECMDurationBonus') * skill.level, **kwargs)
 
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Burst Projector Operation') and
                                                   mod.item.getAttribute('durationSensorDampeningBurstProjector'),
                                       'durationSensorDampeningBurstProjector',
-                                      skill.getModifiedItemAttr('projECMDurationBonus') * skill.level)
+                                      skill.getModifiedItemAttr('projECMDurationBonus') * skill.level, **kwargs)
 
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Burst Projector Operation') and
                                                   mod.item.getAttribute('durationWeaponDisruptionBurstProjector'),
                                       'durationWeaponDisruptionBurstProjector',
-                                      skill.getModifiedItemAttr('projECMDurationBonus') * skill.level)
+                                      skill.getModifiedItemAttr('projECMDurationBonus') * skill.level, **kwargs)
 
 
 class Effect3001(BaseEffect):
@@ -9057,8 +9123,8 @@ class Effect3001(BaseEffect):
     type = 'overheat'
 
     @staticmethod
-    def handler(fit, module, context):
-        module.boostItemAttr('speed', module.getModifiedItemAttr('overloadRofBonus'))
+    def handler(fit, module, context, **kwargs):
+        module.boostItemAttr('speed', module.getModifiedItemAttr('overloadRofBonus'), **kwargs)
 
 
 class Effect3002(BaseEffect):
@@ -9084,8 +9150,8 @@ class Effect3002(BaseEffect):
     type = 'overheat'
 
     @staticmethod
-    def handler(fit, module, context):
-        module.boostItemAttr('duration', module.getModifiedItemAttr('overloadSelfDurationBonus') or 0)
+    def handler(fit, module, context, **kwargs):
+        module.boostItemAttr('duration', module.getModifiedItemAttr('overloadSelfDurationBonus') or 0, **kwargs)
 
 
 class Effect3024(BaseEffect):
@@ -9100,10 +9166,10 @@ class Effect3024(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Bomb Deployment'),
                                         'explosiveDamage', ship.getModifiedItemAttr('eliteBonusCovertOps1'),
-                                        skill='Covert Ops')
+                                        skill='Covert Ops', **kwargs)
 
 
 class Effect3025(BaseEffect):
@@ -9120,8 +9186,8 @@ class Effect3025(BaseEffect):
     type = 'overheat'
 
     @staticmethod
-    def handler(fit, module, context):
-        module.boostItemAttr('damageMultiplier', module.getModifiedItemAttr('overloadDamageModifier'))
+    def handler(fit, module, context, **kwargs):
+        module.boostItemAttr('damageMultiplier', module.getModifiedItemAttr('overloadDamageModifier'), **kwargs)
 
 
 class Effect3026(BaseEffect):
@@ -9135,10 +9201,10 @@ class Effect3026(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Bomb Deployment'),
                                         'kineticDamage', ship.getModifiedItemAttr('eliteBonusCovertOps1'),
-                                        skill='Covert Ops')
+                                        skill='Covert Ops', **kwargs)
 
 
 class Effect3027(BaseEffect):
@@ -9153,10 +9219,10 @@ class Effect3027(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Bomb Deployment'),
                                         'thermalDamage', ship.getModifiedItemAttr('eliteBonusCovertOps1'),
-                                        skill='Covert Ops')
+                                        skill='Covert Ops', **kwargs)
 
 
 class Effect3028(BaseEffect):
@@ -9170,9 +9236,10 @@ class Effect3028(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Bomb Deployment'),
-                                        'emDamage', ship.getModifiedItemAttr('eliteBonusCovertOps1'), skill='Covert Ops')
+                                        'emDamage', ship.getModifiedItemAttr('eliteBonusCovertOps1'),
+                                        skill='Covert Ops', **kwargs)
 
 
 class Effect3029(BaseEffect):
@@ -9188,8 +9255,8 @@ class Effect3029(BaseEffect):
     type = 'overheat'
 
     @staticmethod
-    def handler(fit, module, context):
-        module.boostItemAttr('emDamageResistanceBonus', module.getModifiedItemAttr('overloadHardeningBonus'))
+    def handler(fit, module, context, **kwargs):
+        module.boostItemAttr('emDamageResistanceBonus', module.getModifiedItemAttr('overloadHardeningBonus'), **kwargs)
 
 
 class Effect3030(BaseEffect):
@@ -9205,8 +9272,8 @@ class Effect3030(BaseEffect):
     type = 'overheat'
 
     @staticmethod
-    def handler(fit, module, context):
-        module.boostItemAttr('thermalDamageResistanceBonus', module.getModifiedItemAttr('overloadHardeningBonus'))
+    def handler(fit, module, context, **kwargs):
+        module.boostItemAttr('thermalDamageResistanceBonus', module.getModifiedItemAttr('overloadHardeningBonus'), **kwargs)
 
 
 class Effect3031(BaseEffect):
@@ -9222,8 +9289,8 @@ class Effect3031(BaseEffect):
     type = 'overheat'
 
     @staticmethod
-    def handler(fit, module, context):
-        module.boostItemAttr('explosiveDamageResistanceBonus', module.getModifiedItemAttr('overloadHardeningBonus'))
+    def handler(fit, module, context, **kwargs):
+        module.boostItemAttr('explosiveDamageResistanceBonus', module.getModifiedItemAttr('overloadHardeningBonus'), **kwargs)
 
 
 class Effect3032(BaseEffect):
@@ -9239,8 +9306,8 @@ class Effect3032(BaseEffect):
     type = 'overheat'
 
     @staticmethod
-    def handler(fit, module, context):
-        module.boostItemAttr('kineticDamageResistanceBonus', module.getModifiedItemAttr('overloadHardeningBonus'))
+    def handler(fit, module, context, **kwargs):
+        module.boostItemAttr('kineticDamageResistanceBonus', module.getModifiedItemAttr('overloadHardeningBonus'), **kwargs)
 
 
 class Effect3035(BaseEffect):
@@ -9255,10 +9322,10 @@ class Effect3035(BaseEffect):
     type = 'overheat'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         for type in ('kinetic', 'thermal', 'explosive', 'em'):
             module.boostItemAttr('%sDamageResistanceBonus' % type,
-                                 module.getModifiedItemAttr('overloadHardeningBonus'))
+                                 module.getModifiedItemAttr('overloadHardeningBonus'), **kwargs)
 
 
 class Effect3036(BaseEffect):
@@ -9272,9 +9339,9 @@ class Effect3036(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, skill, context):
+    def handler(fit, skill, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Missile Launcher Bomb',
-                                      'moduleReactivationDelay', skill.getModifiedItemAttr('reactivationDelayBonus') * skill.level)
+                                      'moduleReactivationDelay', skill.getModifiedItemAttr('reactivationDelayBonus') * skill.level, **kwargs)
 
 
 class Effect3046(BaseEffect):
@@ -9288,8 +9355,8 @@ class Effect3046(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
-        fit.ship.multiplyItemAttr('maxVelocity', module.getModifiedItemAttr('maxVelocityModifier'), stackingPenalties=True)
+    def handler(fit, module, context, **kwargs):
+        fit.ship.multiplyItemAttr('maxVelocity', module.getModifiedItemAttr('maxVelocityModifier'), stackingPenalties=True, **kwargs)
 
 
 class Effect3047(BaseEffect):
@@ -9303,8 +9370,8 @@ class Effect3047(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
-        fit.ship.multiplyItemAttr('hp', module.getModifiedItemAttr('structureHPMultiplier'))
+    def handler(fit, module, context, **kwargs):
+        fit.ship.multiplyItemAttr('hp', module.getModifiedItemAttr('structureHPMultiplier'), **kwargs)
 
 
 class Effect3061(BaseEffect):
@@ -9318,9 +9385,9 @@ class Effect3061(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Operation'),
-                                      'heatDamage', module.getModifiedItemAttr('heatDamageBonus'))
+                                      'heatDamage', module.getModifiedItemAttr('heatDamageBonus'), **kwargs)
 
 
 class Effect3169(BaseEffect):
@@ -9334,9 +9401,9 @@ class Effect3169(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Emission Systems'), 'cpu',
-                                      src.getModifiedItemAttr('shieldTransportCpuNeedBonus'))
+                                      src.getModifiedItemAttr('shieldTransportCpuNeedBonus'), **kwargs)
 
 
 class Effect3172(BaseEffect):
@@ -9352,11 +9419,11 @@ class Effect3172(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         # This is actually level-less bonus, anyway you have to train cruisers 5
         # and will get 100% (20%/lvl as stated by description)
         fit.drones.filteredItemBoost(lambda drone: drone.item.group.name == 'Logistic Drone',
-                                     'armorDamageAmount', ship.getModifiedItemAttr('droneArmorDamageAmountBonus'))
+                                     'armorDamageAmount', ship.getModifiedItemAttr('droneArmorDamageAmountBonus'), **kwargs)
 
 
 class Effect3173(BaseEffect):
@@ -9372,11 +9439,11 @@ class Effect3173(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         # This is actually level-less bonus, anyway you have to train cruisers 5
         # and will get 100% (20%/lvl as stated by description)
         fit.drones.filteredItemBoost(lambda drone: drone.item.group.name == 'Logistic Drone',
-                                     'shieldBonus', ship.getModifiedItemAttr('droneShieldBonusBonus'))
+                                     'shieldBonus', ship.getModifiedItemAttr('droneShieldBonusBonus'), **kwargs)
 
 
 class Effect3174(BaseEffect):
@@ -9392,9 +9459,9 @@ class Effect3174(BaseEffect):
     type = 'overheat'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         module.boostItemAttr('maxRange', module.getModifiedItemAttr('overloadRangeBonus'),
-                             stackingPenalties=True)
+                             stackingPenalties=True, **kwargs)
 
 
 class Effect3175(BaseEffect):
@@ -9408,9 +9475,9 @@ class Effect3175(BaseEffect):
     type = 'overheat'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         module.boostItemAttr('speedFactor', module.getModifiedItemAttr('overloadSpeedFactorBonus'),
-                             stackingPenalties=True)
+                             stackingPenalties=True, **kwargs)
 
 
 class Effect3182(BaseEffect):
@@ -9425,12 +9492,12 @@ class Effect3182(BaseEffect):
     type = 'overheat'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         if 'projected' not in context:
             for scanType in ('Gravimetric', 'Magnetometric', 'Radar', 'Ladar'):
                 module.boostItemAttr('scan{0}StrengthBonus'.format(scanType),
                                      module.getModifiedItemAttr('overloadECMStrengthBonus'),
-                                     stackingPenalties=True)
+                                     stackingPenalties=True, **kwargs)
 
 
 class Effect3196(BaseEffect):
@@ -9444,9 +9511,9 @@ class Effect3196(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, skill, context):
+    def handler(fit, skill, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: 'heatDamage' in mod.item.attributes, 'heatDamage',
-                                      skill.getModifiedItemAttr('thermodynamicsHeatDamage') * skill.level)
+                                      skill.getModifiedItemAttr('thermodynamicsHeatDamage') * skill.level, **kwargs)
 
 
 class Effect3200(BaseEffect):
@@ -9461,10 +9528,10 @@ class Effect3200(BaseEffect):
     type = 'overheat'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         module.boostItemAttr('duration', module.getModifiedItemAttr('overloadSelfDurationBonus'))
         module.boostItemAttr('armorDamageAmount', module.getModifiedItemAttr('overloadArmorDamageAmount'),
-                             stackingPenalties=True)
+                             stackingPenalties=True, **kwargs)
 
 
 class Effect3201(BaseEffect):
@@ -9479,9 +9546,9 @@ class Effect3201(BaseEffect):
     type = 'overheat'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         module.boostItemAttr('duration', module.getModifiedItemAttr('overloadSelfDurationBonus'))
-        module.boostItemAttr('shieldBonus', module.getModifiedItemAttr('overloadShieldBonus'), stackingPenalties=True)
+        module.boostItemAttr('shieldBonus', module.getModifiedItemAttr('overloadShieldBonus'), stackingPenalties=True, **kwargs)
 
 
 class Effect3212(BaseEffect):
@@ -9495,10 +9562,10 @@ class Effect3212(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, container, context):
+    def handler(fit, container, context, **kwargs):
         level = container.level if 'skill' in context else 1
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('FoF Missiles'),
-                                        'aoeCloudSize', container.getModifiedItemAttr('aoeCloudSizeBonus') * level)
+                                        'aoeCloudSize', container.getModifiedItemAttr('aoeCloudSizeBonus') * level, **kwargs)
 
 
 class Effect3234(BaseEffect):
@@ -9513,9 +9580,10 @@ class Effect3234(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Rockets'),
-                                        'explosiveDamage', ship.getModifiedItemAttr('shipBonusAF'), skill='Amarr Frigate')
+                                        'explosiveDamage', ship.getModifiedItemAttr('shipBonusAF'),
+                                        skill='Amarr Frigate', **kwargs)
 
 
 class Effect3235(BaseEffect):
@@ -9530,9 +9598,10 @@ class Effect3235(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Rockets'),
-                                        'kineticDamage', ship.getModifiedItemAttr('shipBonusAF'), skill='Amarr Frigate')
+                                        'kineticDamage', ship.getModifiedItemAttr('shipBonusAF'),
+                                        skill='Amarr Frigate', **kwargs)
 
 
 class Effect3236(BaseEffect):
@@ -9547,9 +9616,10 @@ class Effect3236(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Rockets'),
-                                        'thermalDamage', ship.getModifiedItemAttr('shipBonusAF'), skill='Amarr Frigate')
+                                        'thermalDamage', ship.getModifiedItemAttr('shipBonusAF'),
+                                        skill='Amarr Frigate', **kwargs)
 
 
 class Effect3237(BaseEffect):
@@ -9564,9 +9634,10 @@ class Effect3237(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Rockets'),
-                                        'emDamage', ship.getModifiedItemAttr('shipBonusAF'), skill='Amarr Frigate')
+                                        'emDamage', ship.getModifiedItemAttr('shipBonusAF'),
+                                        skill='Amarr Frigate', **kwargs)
 
 
 class Effect3241(BaseEffect):
@@ -9580,9 +9651,9 @@ class Effect3241(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.ship.boostItemAttr('armorEmDamageResonance', ship.getModifiedItemAttr('eliteBonusGunship1'),
-                               skill='Assault Frigates')
+                               skill='Assault Frigates', **kwargs)
 
 
 class Effect3242(BaseEffect):
@@ -9596,9 +9667,9 @@ class Effect3242(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.ship.boostItemAttr('armorThermalDamageResonance', ship.getModifiedItemAttr('eliteBonusGunship1'),
-                               skill='Assault Frigates')
+                               skill='Assault Frigates', **kwargs)
 
 
 class Effect3243(BaseEffect):
@@ -9612,9 +9683,9 @@ class Effect3243(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.ship.boostItemAttr('armorKineticDamageResonance', ship.getModifiedItemAttr('eliteBonusGunship1'),
-                               skill='Assault Frigates')
+                               skill='Assault Frigates', **kwargs)
 
 
 class Effect3244(BaseEffect):
@@ -9628,9 +9699,9 @@ class Effect3244(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.ship.boostItemAttr('armorExplosiveDamageResonance', ship.getModifiedItemAttr('eliteBonusGunship1'),
-                               skill='Assault Frigates')
+                               skill='Assault Frigates', **kwargs)
 
 
 class Effect3249(BaseEffect):
@@ -9644,8 +9715,9 @@ class Effect3249(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
-        fit.ship.boostItemAttr('rechargeRate', ship.getModifiedItemAttr('shipBonus2AF'), skill='Amarr Frigate')
+    def handler(fit, ship, context, **kwargs):
+        fit.ship.boostItemAttr('rechargeRate', ship.getModifiedItemAttr('shipBonus2AF'),
+                               skill='Amarr Frigate', **kwargs)
 
 
 class Effect3264(BaseEffect):
@@ -9659,10 +9731,10 @@ class Effect3264(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, skill, context):
+    def handler(fit, skill, context, **kwargs):
         amount = -skill.getModifiedItemAttr('consumptionQuantityBonus')
         fit.modules.filteredItemIncrease(lambda mod: mod.item.requiresSkill(skill),
-                                         'consumptionQuantity', amount * skill.level)
+                                         'consumptionQuantity', amount * skill.level, **kwargs)
 
 
 class Effect3267(BaseEffect):
@@ -9676,10 +9748,10 @@ class Effect3267(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Industrial Reconfiguration'),
                                       'consumptionQuantity', ship.getModifiedItemAttr('shipBonusORECapital1'),
-                                      skill='Capital Industrial Ships')
+                                      skill='Capital Industrial Ships', **kwargs)
 
 
 class Effect3297(BaseEffect):
@@ -9693,10 +9765,10 @@ class Effect3297(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Energy Neutralizer',
                                       'energyNeutralizerAmount', ship.getModifiedItemAttr('shipBonusAB'),
-                                      skill='Amarr Battleship')
+                                      skill='Amarr Battleship', **kwargs)
 
 
 class Effect3298(BaseEffect):
@@ -9711,10 +9783,10 @@ class Effect3298(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Energy Neutralizer',
                                       'energyNeutralizerAmount', ship.getModifiedItemAttr('shipBonusAC'),
-                                      skill='Amarr Cruiser')
+                                      skill='Amarr Cruiser', **kwargs)
 
 
 class Effect3299(BaseEffect):
@@ -9730,10 +9802,10 @@ class Effect3299(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Energy Neutralizer',
                                       'energyNeutralizerAmount', ship.getModifiedItemAttr('shipBonusAF'),
-                                      skill='Amarr Frigate')
+                                      skill='Amarr Frigate', **kwargs)
 
 
 class Effect3313(BaseEffect):
@@ -9747,8 +9819,8 @@ class Effect3313(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, skill, context):
-        fit.ship.boostItemAttr('maxJumpClones', skill.getModifiedItemAttr('maxJumpClonesBonus') * skill.level)
+    def handler(fit, skill, context, **kwargs):
+        fit.ship.boostItemAttr('maxJumpClones', skill.getModifiedItemAttr('maxJumpClonesBonus') * skill.level, **kwargs)
 
 
 class Effect3331(BaseEffect):
@@ -9762,8 +9834,8 @@ class Effect3331(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
-        fit.ship.boostItemAttr('armorHP', ship.getModifiedItemAttr('eliteBonusCommandShips1'), skill='Command Ships')
+    def handler(fit, ship, context, **kwargs):
+        fit.ship.boostItemAttr('armorHP', ship.getModifiedItemAttr('eliteBonusCommandShips1'), skill='Command Ships', **kwargs)
 
 
 class Effect3335(BaseEffect):
@@ -9777,8 +9849,8 @@ class Effect3335(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
-        fit.ship.boostItemAttr('armorEmDamageResonance', ship.getModifiedItemAttr('shipBonusMC2'), skill='Minmatar Cruiser')
+    def handler(fit, ship, context, **kwargs):
+        fit.ship.boostItemAttr('armorEmDamageResonance', ship.getModifiedItemAttr('shipBonusMC2'), skill='Minmatar Cruiser', **kwargs)
 
 
 class Effect3336(BaseEffect):
@@ -9792,9 +9864,9 @@ class Effect3336(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.ship.boostItemAttr('armorExplosiveDamageResonance', ship.getModifiedItemAttr('shipBonusMC2'),
-                               skill='Minmatar Cruiser')
+                               skill='Minmatar Cruiser', **kwargs)
 
 
 class Effect3339(BaseEffect):
@@ -9808,9 +9880,9 @@ class Effect3339(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.ship.boostItemAttr('armorKineticDamageResonance', ship.getModifiedItemAttr('shipBonusMC2'),
-                               skill='Minmatar Cruiser')
+                               skill='Minmatar Cruiser', **kwargs)
 
 
 class Effect3340(BaseEffect):
@@ -9824,9 +9896,9 @@ class Effect3340(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.ship.boostItemAttr('armorThermalDamageResonance', ship.getModifiedItemAttr('shipBonusMC2'),
-                               skill='Minmatar Cruiser')
+                               skill='Minmatar Cruiser', **kwargs)
 
 
 class Effect3343(BaseEffect):
@@ -9840,10 +9912,10 @@ class Effect3343(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Projectile Turret'),
                                       'falloff', ship.getModifiedItemAttr('eliteBonusHeavyInterdictors1'),
-                                      skill='Heavy Interdiction Cruisers')
+                                      skill='Heavy Interdiction Cruisers', **kwargs)
 
 
 class Effect3355(BaseEffect):
@@ -9857,10 +9929,10 @@ class Effect3355(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Missiles'),
                                         'maxVelocity', ship.getModifiedItemAttr('eliteBonusHeavyInterdictors1'),
-                                        skill='Heavy Interdiction Cruisers')
+                                        skill='Heavy Interdiction Cruisers', **kwargs)
 
 
 class Effect3356(BaseEffect):
@@ -9874,10 +9946,10 @@ class Effect3356(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Assault Missiles'),
                                         'maxVelocity', ship.getModifiedItemAttr('eliteBonusHeavyInterdictors1'),
-                                        skill='Heavy Interdiction Cruisers')
+                                        skill='Heavy Interdiction Cruisers', **kwargs)
 
 
 class Effect3357(BaseEffect):
@@ -9891,10 +9963,10 @@ class Effect3357(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Light Missiles'),
                                         'maxVelocity', ship.getModifiedItemAttr('eliteBonusHeavyInterdictors1'),
-                                        skill='Heavy Interdiction Cruisers')
+                                        skill='Heavy Interdiction Cruisers', **kwargs)
 
 
 class Effect3366(BaseEffect):
@@ -9909,9 +9981,9 @@ class Effect3366(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Sensor Dampener',
-                                      'capacitorNeed', ship.getModifiedItemAttr('shipBonusGF'), skill='Gallente Frigate')
+                                      'capacitorNeed', ship.getModifiedItemAttr('shipBonusGF'), skill='Gallente Frigate', **kwargs)
 
 
 class Effect3367(BaseEffect):
@@ -9925,10 +9997,10 @@ class Effect3367(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Warp Scrambler',
                                       'maxRange', ship.getModifiedItemAttr('eliteBonusElectronicAttackShip1'),
-                                      skill='Electronic Attack Ships')
+                                      skill='Electronic Attack Ships', **kwargs)
 
 
 class Effect3369(BaseEffect):
@@ -9942,10 +10014,10 @@ class Effect3369(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'ECM',
                                       'maxRange', ship.getModifiedItemAttr('eliteBonusElectronicAttackShip1'),
-                                      skill='Electronic Attack Ships')
+                                      skill='Electronic Attack Ships', **kwargs)
 
 
 class Effect3370(BaseEffect):
@@ -9959,10 +10031,10 @@ class Effect3370(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Stasis Web',
                                       'maxRange', ship.getModifiedItemAttr('eliteBonusElectronicAttackShip1'),
-                                      skill='Electronic Attack Ships')
+                                      skill='Electronic Attack Ships', **kwargs)
 
 
 class Effect3371(BaseEffect):
@@ -9976,10 +10048,10 @@ class Effect3371(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Warp Scrambler',
                                       'capacitorNeed', ship.getModifiedItemAttr('eliteBonusElectronicAttackShip2'),
-                                      skill='Electronic Attack Ships')
+                                      skill='Electronic Attack Ships', **kwargs)
 
 
 class Effect3374(BaseEffect):
@@ -9993,9 +10065,9 @@ class Effect3374(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.ship.boostItemAttr('signatureRadius', ship.getModifiedItemAttr('eliteBonusElectronicAttackShip2'),
-                               skill='Electronic Attack Ships')
+                               skill='Electronic Attack Ships', **kwargs)
 
 
 class Effect3379(BaseEffect):
@@ -10009,9 +10081,9 @@ class Effect3379(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, implant, context):
+    def handler(fit, implant, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Afterburner'),
-                                      'capacitorNeed', implant.getModifiedItemAttr('capNeedBonus'))
+                                      'capacitorNeed', implant.getModifiedItemAttr('capNeedBonus'), **kwargs)
 
 
 class Effect3380(BaseEffect):
@@ -10026,24 +10098,24 @@ class Effect3380(BaseEffect):
     type = 'projected', 'active'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         if 'projected' in context:
             if module.charge is not None:
                 if module.charge.ID in (29003, 45010):
-                    fit.ship.increaseItemAttr('warpScrambleStatus', module.getModifiedItemAttr('warpScrambleStrength'))
+                    fit.ship.increaseItemAttr('warpScrambleStatus', module.getModifiedItemAttr('warpScrambleStrength'), **kwargs)
                 if module.charge.ID == 45010:
                     fit.modules.filteredItemIncrease(
                         lambda mod: mod.item.requiresSkill('High Speed Maneuvering') or mod.item.requiresSkill('Micro Jump Drive Operation'),
-                        'activationBlocked', 1)
+                        'activationBlocked', 1, **kwargs)
         else:
-            fit.ship.forceItemAttr('disallowAssistance', 1)
+            fit.ship.forceItemAttr('disallowAssistance', 1, **kwargs)
             if module.charge is None:
-                fit.ship.boostItemAttr('mass', module.getModifiedItemAttr('massBonusPercentage'))
-                fit.ship.boostItemAttr('signatureRadius', module.getModifiedItemAttr('signatureRadiusBonus'))
+                fit.ship.boostItemAttr('mass', module.getModifiedItemAttr('massBonusPercentage'), **kwargs)
+                fit.ship.boostItemAttr('signatureRadius', module.getModifiedItemAttr('signatureRadiusBonus'), **kwargs)
                 fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Propulsion Module',
-                                              'speedBoostFactor', module.getModifiedItemAttr('speedBoostFactorBonus'))
+                                              'speedBoostFactor', module.getModifiedItemAttr('speedBoostFactorBonus'), **kwargs)
                 fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Propulsion Module',
-                                          'speedFactor', module.getModifiedItemAttr('speedFactorBonus'))
+                                          'speedFactor', module.getModifiedItemAttr('speedFactorBonus'), **kwargs)
 
 
 class Effect3392(BaseEffect):
@@ -10057,9 +10129,9 @@ class Effect3392(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Large Energy Turret'),
-                                      'trackingSpeed', ship.getModifiedItemAttr('eliteBonusBlackOps1'), skill='Black Ops')
+                                      'trackingSpeed', ship.getModifiedItemAttr('eliteBonusBlackOps1'), skill='Black Ops', **kwargs)
 
 
 class Effect3403(BaseEffect):
@@ -10073,9 +10145,9 @@ class Effect3403(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         if fit.extraAttributes['cloaked']:
-            fit.ship.multiplyItemAttr('maxVelocity', ship.getModifiedItemAttr('eliteBonusBlackOps2'), skill='Black Ops')
+            fit.ship.multiplyItemAttr('maxVelocity', ship.getModifiedItemAttr('eliteBonusBlackOps2'), skill='Black Ops', **kwargs)
 
 
 class Effect3406(BaseEffect):
@@ -10089,8 +10161,8 @@ class Effect3406(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
-        fit.ship.boostItemAttr('maxVelocity', ship.getModifiedItemAttr('eliteBonusBlackOps1'), skill='Black Ops')
+    def handler(fit, ship, context, **kwargs):
+        fit.ship.boostItemAttr('maxVelocity', ship.getModifiedItemAttr('eliteBonusBlackOps1'), skill='Black Ops', **kwargs)
 
 
 class Effect3415(BaseEffect):
@@ -10104,9 +10176,9 @@ class Effect3415(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Large Energy Turret'),
-                                      'damageMultiplier', ship.getModifiedItemAttr('eliteBonusViolatorsRole1'))
+                                      'damageMultiplier', ship.getModifiedItemAttr('eliteBonusViolatorsRole1'), **kwargs)
 
 
 class Effect3416(BaseEffect):
@@ -10120,9 +10192,9 @@ class Effect3416(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Large Hybrid Turret'),
-                                      'damageMultiplier', ship.getModifiedItemAttr('eliteBonusViolatorsRole1'))
+                                      'damageMultiplier', ship.getModifiedItemAttr('eliteBonusViolatorsRole1'), **kwargs)
 
 
 class Effect3417(BaseEffect):
@@ -10136,9 +10208,9 @@ class Effect3417(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Large Projectile Turret'),
-                                      'damageMultiplier', ship.getModifiedItemAttr('eliteBonusViolatorsRole1'))
+                                      'damageMultiplier', ship.getModifiedItemAttr('eliteBonusViolatorsRole1'), **kwargs)
 
 
 class Effect3424(BaseEffect):
@@ -10152,9 +10224,9 @@ class Effect3424(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Large Hybrid Turret'),
-                                      'trackingSpeed', ship.getModifiedItemAttr('eliteBonusViolators1'), skill='Marauders')
+                                      'trackingSpeed', ship.getModifiedItemAttr('eliteBonusViolators1'), skill='Marauders', **kwargs)
 
 
 class Effect3425(BaseEffect):
@@ -10168,9 +10240,9 @@ class Effect3425(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Large Projectile Turret'),
-                                      'trackingSpeed', ship.getModifiedItemAttr('eliteBonusViolators1'), skill='Marauders')
+                                      'trackingSpeed', ship.getModifiedItemAttr('eliteBonusViolators1'), skill='Marauders', **kwargs)
 
 
 class Effect3427(BaseEffect):
@@ -10184,9 +10256,9 @@ class Effect3427(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Tractor Beam',
-                                      'maxRange', ship.getModifiedItemAttr('eliteBonusViolatorsRole2'))
+                                      'maxRange', ship.getModifiedItemAttr('eliteBonusViolatorsRole2'), **kwargs)
 
 
 class Effect3439(BaseEffect):
@@ -10200,10 +10272,10 @@ class Effect3439(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Target Painter',
                                       'signatureRadiusBonus', ship.getModifiedItemAttr('eliteBonusViolators1'),
-                                      skill='Marauders')
+                                      skill='Marauders', **kwargs)
 
 
 class Effect3447(BaseEffect):
@@ -10218,9 +10290,9 @@ class Effect3447(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Large Projectile Turret'),
-                                      'falloff', ship.getModifiedItemAttr('shipBonusMB'), skill='Minmatar Battleship')
+                                      'falloff', ship.getModifiedItemAttr('shipBonusMB'), skill='Minmatar Battleship', **kwargs)
 
 
 class Effect3466(BaseEffect):
@@ -10234,9 +10306,9 @@ class Effect3466(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.ship.boostItemAttr('rechargeRate', ship.getModifiedItemAttr('eliteBonusElectronicAttackShip2'),
-                               skill='Electronic Attack Ships')
+                               skill='Electronic Attack Ships', **kwargs)
 
 
 class Effect3467(BaseEffect):
@@ -10250,9 +10322,9 @@ class Effect3467(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.ship.boostItemAttr('capacitorCapacity', ship.getModifiedItemAttr('eliteBonusElectronicAttackShip2'),
-                               skill='Electronic Attack Ships')
+                               skill='Electronic Attack Ships', **kwargs)
 
 
 class Effect3468(BaseEffect):
@@ -10266,10 +10338,10 @@ class Effect3468(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Warp Disrupt Field Generator',
                                       'warpScrambleRange', ship.getModifiedItemAttr('eliteBonusHeavyInterdictors2'),
-                                      skill='Heavy Interdiction Cruisers')
+                                      skill='Heavy Interdiction Cruisers', **kwargs)
 
 
 class Effect3473(BaseEffect):
@@ -10283,9 +10355,9 @@ class Effect3473(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Tractor Beam',
-                                      'maxTractorVelocity', ship.getModifiedItemAttr('eliteBonusViolatorsRole3'))
+                                      'maxTractorVelocity', ship.getModifiedItemAttr('eliteBonusViolatorsRole3'), **kwargs)
 
 
 class Effect3478(BaseEffect):
@@ -10300,9 +10372,9 @@ class Effect3478(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Large Energy Turret'),
-                                      'damageMultiplier', ship.getModifiedItemAttr('shipBonusRole7'))
+                                      'damageMultiplier', ship.getModifiedItemAttr('shipBonusRole7'), **kwargs)
 
 
 class Effect3480(BaseEffect):
@@ -10316,9 +10388,9 @@ class Effect3480(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Large Energy Turret'),
-                                      'trackingSpeed', ship.getModifiedItemAttr('shipBonusAB2'), skill='Amarr Battleship')
+                                      'trackingSpeed', ship.getModifiedItemAttr('shipBonusAB2'), skill='Amarr Battleship', **kwargs)
 
 
 class Effect3483(BaseEffect):
@@ -10335,9 +10407,9 @@ class Effect3483(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Energy Turret'),
-                                      'damageMultiplier', ship.getModifiedItemAttr('shipBonusRole7'))
+                                      'damageMultiplier', ship.getModifiedItemAttr('shipBonusRole7'), **kwargs)
 
 
 class Effect3484(BaseEffect):
@@ -10352,9 +10424,9 @@ class Effect3484(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Energy Turret'),
-                                      'trackingSpeed', ship.getModifiedItemAttr('shipBonusAC2'), skill='Amarr Cruiser')
+                                      'trackingSpeed', ship.getModifiedItemAttr('shipBonusAC2'), skill='Amarr Cruiser', **kwargs)
 
 
 class Effect3487(BaseEffect):
@@ -10373,9 +10445,9 @@ class Effect3487(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Energy Turret'),
-                                      'damageMultiplier', ship.getModifiedItemAttr('shipBonusRole7'))
+                                      'damageMultiplier', ship.getModifiedItemAttr('shipBonusRole7'), **kwargs)
 
 
 class Effect3489(BaseEffect):
@@ -10390,9 +10462,9 @@ class Effect3489(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Energy Turret'),
-                                      'trackingSpeed', ship.getModifiedItemAttr('shipBonus2AF'), skill='Amarr Frigate')
+                                      'trackingSpeed', ship.getModifiedItemAttr('shipBonus2AF'), skill='Amarr Frigate', **kwargs)
 
 
 class Effect3493(BaseEffect):
@@ -10406,9 +10478,9 @@ class Effect3493(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Cargo Scanner',
-                                      'cargoScanRange', ship.getModifiedItemAttr('cargoScannerRangeBonus'))
+                                      'cargoScanRange', ship.getModifiedItemAttr('cargoScannerRangeBonus'), **kwargs)
 
 
 class Effect3494(BaseEffect):
@@ -10422,9 +10494,9 @@ class Effect3494(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Survey Scanner',
-                                      'surveyScanRange', ship.getModifiedItemAttr('surveyScannerRangeBonus'))
+                                      'surveyScanRange', ship.getModifiedItemAttr('surveyScannerRangeBonus'), **kwargs)
 
 
 class Effect3495(BaseEffect):
@@ -10442,10 +10514,10 @@ class Effect3495(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         groups = ('Stasis Web', 'Warp Scrambler')
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in groups,
-                                      'capacitorNeed', ship.getModifiedItemAttr('eliteBonusInterceptorRole'))
+                                      'capacitorNeed', ship.getModifiedItemAttr('eliteBonusInterceptorRole'), **kwargs)
 
 
 class Effect3496(BaseEffect):
@@ -10460,9 +10532,9 @@ class Effect3496(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, implant, context):
+    def handler(fit, implant, context, **kwargs):
         fit.appliedImplants.filteredItemMultiply(lambda mod: mod.item.group.name == 'Cyberimplant',
-                                                 'agilityBonus', implant.getModifiedItemAttr('implantSetThukker'))
+                                                 'agilityBonus', implant.getModifiedItemAttr('implantSetThukker'), **kwargs)
 
 
 class Effect3498(BaseEffect):
@@ -10477,9 +10549,9 @@ class Effect3498(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, implant, context):
+    def handler(fit, implant, context, **kwargs):
         fit.appliedImplants.filteredItemMultiply(lambda mod: mod.item.group.name == 'Cyberimplant',
-                                                 'scanStrengthBonus', implant.getModifiedItemAttr('implantSetSisters'))
+                                                 'scanStrengthBonus', implant.getModifiedItemAttr('implantSetSisters'), **kwargs)
 
 
 class Effect3499(BaseEffect):
@@ -10494,10 +10566,10 @@ class Effect3499(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, implant, context):
+    def handler(fit, implant, context, **kwargs):
         fit.appliedImplants.filteredItemMultiply(lambda mod: mod.item.group.name == 'Cyberimplant',
                                                  'boosterAttributeModifier',
-                                                 implant.getModifiedItemAttr('implantSetSyndicate'))
+                                                 implant.getModifiedItemAttr('implantSetSyndicate'), **kwargs)
 
 
 class Effect3513(BaseEffect):
@@ -10512,9 +10584,9 @@ class Effect3513(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, implant, context):
+    def handler(fit, implant, context, **kwargs):
         fit.appliedImplants.filteredItemMultiply(lambda mod: mod.item.group.name == 'Cyberimplant',
-                                                 'rangeSkillBonus', implant.getModifiedItemAttr('implantSetMordus'))
+                                                 'rangeSkillBonus', implant.getModifiedItemAttr('implantSetMordus'), **kwargs)
 
 
 class Effect3514(BaseEffect):
@@ -10528,9 +10600,9 @@ class Effect3514(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Warp Scrambler',
-                                      'maxRange', ship.getModifiedItemAttr('eliteBonusInterceptor2'), skill='Interceptors')
+                                      'maxRange', ship.getModifiedItemAttr('eliteBonusInterceptor2'), skill='Interceptors', **kwargs)
 
 
 class Effect3519(BaseEffect):
@@ -10544,9 +10616,9 @@ class Effect3519(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, skill, context):
+    def handler(fit, skill, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Bomb Deployment'),
-                                      'cpu', skill.getModifiedItemAttr('cpuNeedBonus') * skill.level)
+                                      'cpu', skill.getModifiedItemAttr('cpuNeedBonus') * skill.level, **kwargs)
 
 
 class Effect3520(BaseEffect):
@@ -10560,9 +10632,9 @@ class Effect3520(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, skill, context):
+    def handler(fit, skill, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Bomb Deployment'),
-                                      'power', skill.getModifiedItemAttr('powerNeedBonus') * skill.level)
+                                      'power', skill.getModifiedItemAttr('powerNeedBonus') * skill.level, **kwargs)
 
 
 class Effect3526(BaseEffect):
@@ -10577,11 +10649,11 @@ class Effect3526(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, container, context):
+    def handler(fit, container, context, **kwargs):
         level = container.level if 'skill' in context else 1
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Cynosural Field Generator',
                                       'consumptionQuantity',
-                                      container.getModifiedItemAttr('consumptionQuantityBonusPercentage') * level)
+                                      container.getModifiedItemAttr('consumptionQuantityBonusPercentage') * level, **kwargs)
 
 
 class Effect3530(BaseEffect):
@@ -10595,8 +10667,8 @@ class Effect3530(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
-        fit.ship.boostItemAttr('agility', ship.getModifiedItemAttr('eliteBonusBlackOps1'), skill='Black Ops')
+    def handler(fit, ship, context, **kwargs):
+        fit.ship.boostItemAttr('agility', ship.getModifiedItemAttr('eliteBonusBlackOps1'), skill='Black Ops', **kwargs)
 
 
 class Effect3532(BaseEffect):
@@ -10610,9 +10682,9 @@ class Effect3532(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, skill, context):
+    def handler(fit, skill, context, **kwargs):
         fit.ship.boostItemAttr('jumpDriveConsumptionAmount',
-                               skill.getModifiedItemAttr('consumptionQuantityBonusPercentage') * skill.level)
+                               skill.getModifiedItemAttr('consumptionQuantityBonusPercentage') * skill.level, **kwargs)
 
 
 class Effect3561(BaseEffect):
@@ -10627,11 +10699,11 @@ class Effect3561(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, container, context):
+    def handler(fit, container, context, **kwargs):
         level = container.level if 'skill' in context else 1
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Weapon Disruptor',
                                       'trackingSpeedBonus',
-                                      container.getModifiedItemAttr('scanSkillEwStrengthBonus') * level)
+                                      container.getModifiedItemAttr('scanSkillEwStrengthBonus') * level, **kwargs)
 
 
 class Effect3568(BaseEffect):
@@ -10645,10 +10717,10 @@ class Effect3568(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Remote Tracking Computer',
                                       'maxRangeBonus', ship.getModifiedItemAttr('eliteBonusLogistics1'),
-                                      skill='Logistics Cruisers')
+                                      skill='Logistics Cruisers', **kwargs)
 
 
 class Effect3569(BaseEffect):
@@ -10662,10 +10734,10 @@ class Effect3569(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Remote Tracking Computer',
                                       'maxRangeBonus', ship.getModifiedItemAttr('eliteBonusLogistics2'),
-                                      skill='Logistics Cruisers')
+                                      skill='Logistics Cruisers', **kwargs)
 
 
 class Effect3570(BaseEffect):
@@ -10679,10 +10751,10 @@ class Effect3570(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Remote Tracking Computer',
                                       'trackingSpeedBonus', ship.getModifiedItemAttr('eliteBonusLogistics2'),
-                                      skill='Logistics Cruisers')
+                                      skill='Logistics Cruisers', **kwargs)
 
 
 class Effect3571(BaseEffect):
@@ -10696,10 +10768,10 @@ class Effect3571(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Remote Tracking Computer',
                                       'trackingSpeedBonus', ship.getModifiedItemAttr('eliteBonusLogistics1'),
-                                      skill='Logistics Cruisers')
+                                      skill='Logistics Cruisers', **kwargs)
 
 
 class Effect3586(BaseEffect):
@@ -10714,13 +10786,13 @@ class Effect3586(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, container, context):
+    def handler(fit, container, context, **kwargs):
         level = container.level if 'skill' in context else 1
         penalized = False if 'skill' in context else True
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Sensor Dampener',
                                       'scanResolutionBonus',
                                       container.getModifiedItemAttr('scanSkillEwStrengthBonus') * level,
-                                      stackingPenalties=penalized)
+                                      stackingPenalties=penalized, **kwargs)
 
 
 class Effect3587(BaseEffect):
@@ -10734,10 +10806,10 @@ class Effect3587(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Sensor Dampener',
                                       'maxTargetRangeBonus', ship.getModifiedItemAttr('shipBonusGC2'),
-                                      skill='Gallente Cruiser')
+                                      skill='Gallente Cruiser', **kwargs)
 
 
 class Effect3588(BaseEffect):
@@ -10752,10 +10824,10 @@ class Effect3588(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Sensor Dampener',
                                       'maxTargetRangeBonus', ship.getModifiedItemAttr('shipBonusGF2'),
-                                      skill='Gallente Frigate')
+                                      skill='Gallente Frigate', **kwargs)
 
 
 class Effect3589(BaseEffect):
@@ -10770,10 +10842,10 @@ class Effect3589(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Sensor Dampener',
                                       'scanResolutionBonus', ship.getModifiedItemAttr('shipBonusGF2'),
-                                      skill='Gallente Frigate')
+                                      skill='Gallente Frigate', **kwargs)
 
 
 class Effect3590(BaseEffect):
@@ -10787,10 +10859,10 @@ class Effect3590(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Sensor Dampener',
                                       'scanResolutionBonus', ship.getModifiedItemAttr('shipBonusGC2'),
-                                      skill='Gallente Cruiser')
+                                      skill='Gallente Cruiser', **kwargs)
 
 
 class Effect3591(BaseEffect):
@@ -10805,11 +10877,11 @@ class Effect3591(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, container, context):
+    def handler(fit, container, context, **kwargs):
         level = container.level if 'skill' in context else 1
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Sensor Dampener',
                                       'maxTargetRangeBonus',
-                                      container.getModifiedItemAttr('scanSkillEwStrengthBonus') * level)
+                                      container.getModifiedItemAttr('scanSkillEwStrengthBonus') * level, **kwargs)
 
 
 class Effect3592(BaseEffect):
@@ -10823,8 +10895,8 @@ class Effect3592(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
-        fit.ship.boostItemAttr('hp', ship.getModifiedItemAttr('eliteBonusJumpFreighter1'), skill='Jump Freighters')
+    def handler(fit, ship, context, **kwargs):
+        fit.ship.boostItemAttr('hp', ship.getModifiedItemAttr('eliteBonusJumpFreighter1'), skill='Jump Freighters', **kwargs)
 
 
 class Effect3593(BaseEffect):
@@ -10838,9 +10910,9 @@ class Effect3593(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.ship.boostItemAttr('jumpDriveConsumptionAmount', ship.getModifiedItemAttr('eliteBonusJumpFreighter2'),
-                               skill='Jump Freighters')
+                               skill='Jump Freighters', **kwargs)
 
 
 class Effect3597(BaseEffect):
@@ -10855,8 +10927,8 @@ class Effect3597(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
-        module.boostItemAttr('scanResolutionBonus', module.getModifiedChargeAttr('scanResolutionBonusBonus'))
+    def handler(fit, module, context, **kwargs):
+        module.boostItemAttr('scanResolutionBonus', module.getModifiedChargeAttr('scanResolutionBonusBonus'), **kwargs)
 
 
 class Effect3598(BaseEffect):
@@ -10871,8 +10943,8 @@ class Effect3598(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
-        module.boostItemAttr('maxTargetRangeBonus', module.getModifiedChargeAttr('maxTargetRangeBonusBonus'))
+    def handler(fit, module, context, **kwargs):
+        module.boostItemAttr('maxTargetRangeBonus', module.getModifiedChargeAttr('maxTargetRangeBonusBonus'), **kwargs)
 
 
 class Effect3599(BaseEffect):
@@ -10887,8 +10959,8 @@ class Effect3599(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
-        module.boostItemAttr('trackingSpeedBonus', module.getModifiedChargeAttr('trackingSpeedBonusBonus'))
+    def handler(fit, module, context, **kwargs):
+        module.boostItemAttr('trackingSpeedBonus', module.getModifiedChargeAttr('trackingSpeedBonusBonus'), **kwargs)
 
 
 class Effect3600(BaseEffect):
@@ -10903,8 +10975,8 @@ class Effect3600(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
-        module.boostItemAttr('maxRangeBonus', module.getModifiedChargeAttr('maxRangeBonusBonus'))
+    def handler(fit, module, context, **kwargs):
+        module.boostItemAttr('maxRangeBonus', module.getModifiedChargeAttr('maxRangeBonusBonus'), **kwargs)
 
 
 class Effect3601(BaseEffect):
@@ -10918,8 +10990,8 @@ class Effect3601(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
-        module.forceItemAttr('disallowInEmpireSpace', module.getModifiedChargeAttr('disallowInEmpireSpace'))
+    def handler(fit, module, context, **kwargs):
+        module.forceItemAttr('disallowInEmpireSpace', module.getModifiedChargeAttr('disallowInEmpireSpace'), **kwargs)
 
 
 class Effect3602(BaseEffect):
@@ -10933,8 +11005,8 @@ class Effect3602(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
-        module.boostItemAttr('duration', module.getModifiedChargeAttr('durationBonus'))
+    def handler(fit, module, context, **kwargs):
+        module.boostItemAttr('duration', module.getModifiedChargeAttr('durationBonus'), **kwargs)
 
 
 class Effect3617(BaseEffect):
@@ -10949,8 +11021,8 @@ class Effect3617(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
-        module.boostItemAttr('signatureRadiusBonus', module.getModifiedChargeAttr('signatureRadiusBonusBonus'))
+    def handler(fit, module, context, **kwargs):
+        module.boostItemAttr('signatureRadiusBonus', module.getModifiedChargeAttr('signatureRadiusBonusBonus'), **kwargs)
 
 
 class Effect3618(BaseEffect):
@@ -10965,8 +11037,8 @@ class Effect3618(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
-        module.boostItemAttr('massBonusPercentage', module.getModifiedChargeAttr('massBonusPercentageBonus'))
+    def handler(fit, module, context, **kwargs):
+        module.boostItemAttr('massBonusPercentage', module.getModifiedChargeAttr('massBonusPercentageBonus'), **kwargs)
 
 
 class Effect3619(BaseEffect):
@@ -10981,8 +11053,8 @@ class Effect3619(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
-        module.boostItemAttr('speedBoostFactorBonus', module.getModifiedChargeAttr('speedBoostFactorBonusBonus'))
+    def handler(fit, module, context, **kwargs):
+        module.boostItemAttr('speedBoostFactorBonus', module.getModifiedChargeAttr('speedBoostFactorBonusBonus'), **kwargs)
 
 
 class Effect3620(BaseEffect):
@@ -10997,8 +11069,8 @@ class Effect3620(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
-        module.boostItemAttr('speedFactorBonus', module.getModifiedChargeAttr('speedFactorBonusBonus'))
+    def handler(fit, module, context, **kwargs):
+        module.boostItemAttr('speedFactorBonus', module.getModifiedChargeAttr('speedFactorBonusBonus'), **kwargs)
 
 
 class Effect3648(BaseEffect):
@@ -11012,8 +11084,8 @@ class Effect3648(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
-        module.boostItemAttr('warpScrambleRange', module.getModifiedChargeAttr('warpScrambleRangeBonus'))
+    def handler(fit, module, context, **kwargs):
+        module.boostItemAttr('warpScrambleRange', module.getModifiedChargeAttr('warpScrambleRangeBonus'), **kwargs)
 
 
 class Effect3649(BaseEffect):
@@ -11027,10 +11099,10 @@ class Effect3649(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Large Energy Turret'),
                                       'damageMultiplier', ship.getModifiedItemAttr('eliteBonusViolators1'),
-                                      skill='Marauders')
+                                      skill='Marauders', **kwargs)
 
 
 class Effect3650(BaseEffect):
@@ -11044,9 +11116,9 @@ class Effect3650(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, implant, context):
+    def handler(fit, implant, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Sensor Dampener',
-                                      'maxRange', implant.getModifiedItemAttr('rangeSkillBonus'))
+                                      'maxRange', implant.getModifiedItemAttr('rangeSkillBonus'), **kwargs)
 
 
 class Effect3651(BaseEffect):
@@ -11060,9 +11132,9 @@ class Effect3651(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, implant, context):
+    def handler(fit, implant, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Target Painter',
-                                      'maxRange', implant.getModifiedItemAttr('rangeSkillBonus'))
+                                      'maxRange', implant.getModifiedItemAttr('rangeSkillBonus'), **kwargs)
 
 
 class Effect3652(BaseEffect):
@@ -11076,9 +11148,9 @@ class Effect3652(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, implant, context):
+    def handler(fit, implant, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Weapon Disruptor',
-                                      'maxRange', implant.getModifiedItemAttr('rangeSkillBonus'))
+                                      'maxRange', implant.getModifiedItemAttr('rangeSkillBonus'), **kwargs)
 
 
 class Effect3653(BaseEffect):
@@ -11092,9 +11164,9 @@ class Effect3653(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, implant, context):
+    def handler(fit, implant, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Burst Projectors',
-                                      'maxRange', implant.getModifiedItemAttr('rangeSkillBonus'))
+                                      'maxRange', implant.getModifiedItemAttr('rangeSkillBonus'), **kwargs)
 
 
 class Effect3655(BaseEffect):
@@ -11108,10 +11180,10 @@ class Effect3655(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Gunnery'),
                                       'maxRange', module.getModifiedItemAttr('maxRangeBonus'),
-                                      stackingPenalties=True)
+                                      stackingPenalties=True, **kwargs)
 
 
 class Effect3656(BaseEffect):
@@ -11125,10 +11197,10 @@ class Effect3656(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Gunnery'),
                                       'trackingSpeed', module.getModifiedItemAttr('trackingSpeedBonus'),
-                                      stackingPenalties=True)
+                                      stackingPenalties=True, **kwargs)
 
 
 class Effect3657(BaseEffect):
@@ -11143,9 +11215,9 @@ class Effect3657(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         fit.ship.boostItemAttr('scanResolution', module.getModifiedItemAttr('scanResolutionBonus'),
-                               stackingPenalties=True)
+                               stackingPenalties=True, **kwargs)
 
 
 class Effect3659(BaseEffect):
@@ -11160,9 +11232,9 @@ class Effect3659(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         fit.ship.boostItemAttr('maxTargetRange', module.getModifiedItemAttr('maxTargetRangeBonus'),
-                               stackingPenalties=True)
+                               stackingPenalties=True, **kwargs)
 
 
 class Effect3660(BaseEffect):
@@ -11177,8 +11249,8 @@ class Effect3660(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
-        fit.ship.increaseItemAttr('maxLockedTargets', module.getModifiedItemAttr('maxLockedTargetsBonus'))
+    def handler(fit, module, context, **kwargs):
+        fit.ship.increaseItemAttr('maxLockedTargets', module.getModifiedItemAttr('maxLockedTargetsBonus'), **kwargs)
 
 
 class Effect3668(BaseEffect):
@@ -11192,9 +11264,9 @@ class Effect3668(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, implant, context):
+    def handler(fit, implant, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Mining Laser',
-                                      'maxRange', implant.getModifiedItemAttr('maxRangeBonus'))
+                                      'maxRange', implant.getModifiedItemAttr('maxRangeBonus'), **kwargs)
 
 
 class Effect3669(BaseEffect):
@@ -11208,9 +11280,9 @@ class Effect3669(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, implant, context):
+    def handler(fit, implant, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Frequency Mining Laser',
-                                      'maxRange', implant.getModifiedItemAttr('maxRangeBonus'))
+                                      'maxRange', implant.getModifiedItemAttr('maxRangeBonus'), **kwargs)
 
 
 class Effect3670(BaseEffect):
@@ -11224,9 +11296,9 @@ class Effect3670(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, implant, context):
+    def handler(fit, implant, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Strip Miner',
-                                      'maxRange', implant.getModifiedItemAttr('maxRangeBonus'))
+                                      'maxRange', implant.getModifiedItemAttr('maxRangeBonus'), **kwargs)
 
 
 class Effect3671(BaseEffect):
@@ -11240,9 +11312,9 @@ class Effect3671(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, implant, context):
+    def handler(fit, implant, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Gas Cloud Harvester',
-                                      'maxRange', implant.getModifiedItemAttr('maxRangeBonus'))
+                                      'maxRange', implant.getModifiedItemAttr('maxRangeBonus'), **kwargs)
 
 
 class Effect3672(BaseEffect):
@@ -11257,9 +11329,9 @@ class Effect3672(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, implant, context):
+    def handler(fit, implant, context, **kwargs):
         fit.appliedImplants.filteredItemMultiply(lambda mod: mod.item.group.name == 'Cyberimplant',
-                                                 'maxRangeBonus', implant.getModifiedItemAttr('implantSetORE'))
+                                                 'maxRangeBonus', implant.getModifiedItemAttr('implantSetORE'), **kwargs)
 
 
 class Effect3677(BaseEffect):
@@ -11274,9 +11346,9 @@ class Effect3677(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Large Energy Turret'),
-                                      'maxRange', ship.getModifiedItemAttr('shipBonusAB2'), skill='Amarr Battleship')
+                                      'maxRange', ship.getModifiedItemAttr('shipBonusAB2'), skill='Amarr Battleship', **kwargs)
 
 
 class Effect3678(BaseEffect):
@@ -11291,9 +11363,9 @@ class Effect3678(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.ship.boostItemAttr('shieldCapacity', ship.getModifiedItemAttr('eliteBonusJumpFreighter1'),
-                               skill='Jump Freighters')
+                               skill='Jump Freighters', **kwargs)
 
 
 class Effect3679(BaseEffect):
@@ -11308,8 +11380,8 @@ class Effect3679(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
-        fit.ship.boostItemAttr('armorHP', ship.getModifiedItemAttr('eliteBonusJumpFreighter1'), skill='Jump Freighters')
+    def handler(fit, ship, context, **kwargs):
+        fit.ship.boostItemAttr('armorHP', ship.getModifiedItemAttr('eliteBonusJumpFreighter1'), skill='Jump Freighters', **kwargs)
 
 
 class Effect3680(BaseEffect):
@@ -11323,8 +11395,8 @@ class Effect3680(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
-        fit.ship.boostItemAttr('agility', ship.getModifiedItemAttr('freighterBonusC1'), skill='Caldari Freighter')
+    def handler(fit, ship, context, **kwargs):
+        fit.ship.boostItemAttr('agility', ship.getModifiedItemAttr('freighterBonusC1'), skill='Caldari Freighter', **kwargs)
 
 
 class Effect3681(BaseEffect):
@@ -11338,8 +11410,8 @@ class Effect3681(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
-        fit.ship.boostItemAttr('agility', ship.getModifiedItemAttr('freighterBonusM1'), skill='Minmatar Freighter')
+    def handler(fit, ship, context, **kwargs):
+        fit.ship.boostItemAttr('agility', ship.getModifiedItemAttr('freighterBonusM1'), skill='Minmatar Freighter', **kwargs)
 
 
 class Effect3682(BaseEffect):
@@ -11353,8 +11425,8 @@ class Effect3682(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
-        fit.ship.boostItemAttr('agility', ship.getModifiedItemAttr('freighterBonusG1'), skill='Gallente Freighter')
+    def handler(fit, ship, context, **kwargs):
+        fit.ship.boostItemAttr('agility', ship.getModifiedItemAttr('freighterBonusG1'), skill='Gallente Freighter', **kwargs)
 
 
 class Effect3683(BaseEffect):
@@ -11368,8 +11440,8 @@ class Effect3683(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
-        fit.ship.boostItemAttr('agility', ship.getModifiedItemAttr('freighterBonusA1'), skill='Amarr Freighter')
+    def handler(fit, ship, context, **kwargs):
+        fit.ship.boostItemAttr('agility', ship.getModifiedItemAttr('freighterBonusA1'), skill='Amarr Freighter', **kwargs)
 
 
 class Effect3686(BaseEffect):
@@ -11384,8 +11456,8 @@ class Effect3686(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
-        module.boostItemAttr('falloffBonus', module.getModifiedChargeAttr('falloffBonusBonus'))
+    def handler(fit, module, context, **kwargs):
+        module.boostItemAttr('falloffBonus', module.getModifiedChargeAttr('falloffBonusBonus'), **kwargs)
 
 
 class Effect3703(BaseEffect):
@@ -11399,10 +11471,10 @@ class Effect3703(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         groups = ('Missile Launcher Rapid Light', 'Missile Launcher Heavy', 'Missile Launcher Heavy Assault')
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in groups,
-                                      'speed', ship.getModifiedItemAttr('shipBonusMC2'), skill='Minmatar Cruiser')
+                                      'speed', ship.getModifiedItemAttr('shipBonusMC2'), skill='Minmatar Cruiser', **kwargs)
 
 
 class Effect3705(BaseEffect):
@@ -11417,9 +11489,9 @@ class Effect3705(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Hybrid Turret'),
-                                      'speed', ship.getModifiedItemAttr('shipBonusGC2'), skill='Gallente Cruiser')
+                                      'speed', ship.getModifiedItemAttr('shipBonusGC2'), skill='Gallente Cruiser', **kwargs)
 
 
 class Effect3706(BaseEffect):
@@ -11433,9 +11505,9 @@ class Effect3706(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Projectile Turret'),
-                                      'trackingSpeed', ship.getModifiedItemAttr('shipBonusMC2'), skill='Minmatar Cruiser')
+                                      'trackingSpeed', ship.getModifiedItemAttr('shipBonusMC2'), skill='Minmatar Cruiser', **kwargs)
 
 
 class Effect3726(BaseEffect):
@@ -11449,8 +11521,8 @@ class Effect3726(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
-        fit.ship.boostItemAttr('agility', module.getModifiedItemAttr('agilityBonus'), stackingPenalties=True)
+    def handler(fit, module, context, **kwargs):
+        fit.ship.boostItemAttr('agility', module.getModifiedItemAttr('agilityBonus'), stackingPenalties=True, **kwargs)
 
 
 class Effect3727(BaseEffect):
@@ -11464,9 +11536,9 @@ class Effect3727(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         fit.ship.boostItemAttr('maxVelocity', module.getModifiedItemAttr('implantBonusVelocity'),
-                               stackingPenalties=True)
+                               stackingPenalties=True, **kwargs)
 
 
 class Effect3739(BaseEffect):
@@ -11480,9 +11552,9 @@ class Effect3739(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Tractor Beam', 'maxRange',
-                                      src.getModifiedItemAttr('roleBonusTractorBeamRange'))
+                                      src.getModifiedItemAttr('roleBonusTractorBeamRange'), **kwargs)
 
 
 class Effect3740(BaseEffect):
@@ -11496,9 +11568,9 @@ class Effect3740(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Tractor Beam', 'maxTractorVelocity',
-                                      ship.getModifiedItemAttr('roleBonusTractorBeamVelocity'))
+                                      ship.getModifiedItemAttr('roleBonusTractorBeamVelocity'), **kwargs)
 
 
 class Effect3742(BaseEffect):
@@ -11512,14 +11584,14 @@ class Effect3742(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.ship.boostItemAttr('specialOreHoldCapacity',
                                src.getModifiedItemAttr('shipBonusICS1'),
-                               skill='Industrial Command Ships')
+                               skill='Industrial Command Ships', **kwargs)
 
         fit.ship.boostItemAttr('capacity',
                                src.getModifiedItemAttr('shipBonusICS1'),
-                               skill='Industrial Command Ships')
+                               skill='Industrial Command Ships', **kwargs)
 
 
 class Effect3744(BaseEffect):
@@ -11533,17 +11605,17 @@ class Effect3744(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Mining Foreman'), 'warfareBuff4Value',
-                                      src.getModifiedItemAttr('shipBonusICS2'), skill='Industrial Command Ships')
+                                      src.getModifiedItemAttr('shipBonusICS2'), skill='Industrial Command Ships', **kwargs)
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Mining Foreman'), 'warfareBuff1Value',
-                                      src.getModifiedItemAttr('shipBonusICS2'), skill='Industrial Command Ships')
+                                      src.getModifiedItemAttr('shipBonusICS2'), skill='Industrial Command Ships', **kwargs)
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Mining Foreman'), 'buffDuration',
-                                      src.getModifiedItemAttr('shipBonusICS2'), skill='Industrial Command Ships')
+                                      src.getModifiedItemAttr('shipBonusICS2'), skill='Industrial Command Ships', **kwargs)
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Mining Foreman'), 'warfareBuff3Value',
-                                      src.getModifiedItemAttr('shipBonusICS2'), skill='Industrial Command Ships')
+                                      src.getModifiedItemAttr('shipBonusICS2'), skill='Industrial Command Ships', **kwargs)
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Mining Foreman'), 'warfareBuff2Value',
-                                      src.getModifiedItemAttr('shipBonusICS2'), skill='Industrial Command Ships')
+                                      src.getModifiedItemAttr('shipBonusICS2'), skill='Industrial Command Ships', **kwargs)
 
 
 class Effect3745(BaseEffect):
@@ -11557,9 +11629,9 @@ class Effect3745(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Survey Scanner', 'surveyScanRange',
-                                      src.getModifiedItemAttr('roleBonusSurveyScannerRange'))
+                                      src.getModifiedItemAttr('roleBonusSurveyScannerRange'), **kwargs)
 
 
 class Effect3765(BaseEffect):
@@ -11573,9 +11645,9 @@ class Effect3765(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == 'Missile Launcher Torpedo',
-                                         'power', ship.getModifiedItemAttr('stealthBomberLauncherPower'))
+                                         'power', ship.getModifiedItemAttr('stealthBomberLauncherPower'), **kwargs)
 
 
 class Effect3766(BaseEffect):
@@ -11589,10 +11661,10 @@ class Effect3766(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('High Speed Maneuvering'),
                                       'signatureRadiusBonus', ship.getModifiedItemAttr('eliteBonusInterceptor'),
-                                      skill='Interceptors')
+                                      skill='Interceptors', **kwargs)
 
 
 class Effect3767(BaseEffect):
@@ -11606,10 +11678,10 @@ class Effect3767(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Missiles'),
                                         'aoeVelocity', ship.getModifiedItemAttr('eliteBonusCommandShips2'),
-                                        skill='Command Ships')
+                                        skill='Command Ships', **kwargs)
 
 
 class Effect3771(BaseEffect):
@@ -11623,8 +11695,8 @@ class Effect3771(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
-        fit.ship.increaseItemAttr('armorHP', module.getModifiedItemAttr('armorHPBonusAdd') or 0)
+    def handler(fit, module, context, **kwargs):
+        fit.ship.increaseItemAttr('armorHP', module.getModifiedItemAttr('armorHPBonusAdd') or 0, **kwargs)
 
 
 class Effect3773(BaseEffect):
@@ -11638,9 +11710,9 @@ class Effect3773(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
-        fit.ship.increaseItemAttr('turretSlotsLeft', module.getModifiedItemAttr('turretHardPointModifier'))
-        fit.ship.increaseItemAttr('launcherSlotsLeft', module.getModifiedItemAttr('launcherHardPointModifier'))
+    def handler(fit, module, context, **kwargs):
+        fit.ship.increaseItemAttr('turretSlotsLeft', module.getModifiedItemAttr('turretHardPointModifier'), **kwargs)
+        fit.ship.increaseItemAttr('launcherSlotsLeft', module.getModifiedItemAttr('launcherHardPointModifier'), **kwargs)
 
 
 class Effect3774(BaseEffect):
@@ -11654,10 +11726,10 @@ class Effect3774(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
-        fit.ship.increaseItemAttr('hiSlots', module.getModifiedItemAttr('hiSlotModifier'))
-        fit.ship.increaseItemAttr('medSlots', module.getModifiedItemAttr('medSlotModifier'))
-        fit.ship.increaseItemAttr('lowSlots', module.getModifiedItemAttr('lowSlotModifier'))
+    def handler(fit, module, context, **kwargs):
+        fit.ship.increaseItemAttr('hiSlots', module.getModifiedItemAttr('hiSlotModifier'), **kwargs)
+        fit.ship.increaseItemAttr('medSlots', module.getModifiedItemAttr('medSlotModifier'), **kwargs)
+        fit.ship.increaseItemAttr('lowSlots', module.getModifiedItemAttr('lowSlotModifier'), **kwargs)
 
 
 class Effect3782(BaseEffect):
@@ -11671,8 +11743,8 @@ class Effect3782(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
-        fit.ship.increaseItemAttr('powerOutput', module.getModifiedItemAttr('powerOutput'))
+    def handler(fit, module, context, **kwargs):
+        fit.ship.increaseItemAttr('powerOutput', module.getModifiedItemAttr('powerOutput'), **kwargs)
 
 
 class Effect3783(BaseEffect):
@@ -11686,8 +11758,8 @@ class Effect3783(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
-        fit.ship.increaseItemAttr('cpuOutput', module.getModifiedItemAttr('cpuOutput'))
+    def handler(fit, module, context, **kwargs):
+        fit.ship.increaseItemAttr('cpuOutput', module.getModifiedItemAttr('cpuOutput'), **kwargs)
 
 
 class Effect3797(BaseEffect):
@@ -11701,8 +11773,8 @@ class Effect3797(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
-        fit.ship.increaseItemAttr('droneBandwidth', module.getModifiedItemAttr('droneBandwidth'))
+    def handler(fit, module, context, **kwargs):
+        fit.ship.increaseItemAttr('droneBandwidth', module.getModifiedItemAttr('droneBandwidth'), **kwargs)
 
 
 class Effect3799(BaseEffect):
@@ -11716,8 +11788,8 @@ class Effect3799(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
-        fit.ship.increaseItemAttr('droneCapacity', module.getModifiedItemAttr('droneCapacity'))
+    def handler(fit, module, context, **kwargs):
+        fit.ship.increaseItemAttr('droneCapacity', module.getModifiedItemAttr('droneCapacity'), **kwargs)
 
 
 class Effect3807(BaseEffect):
@@ -11731,8 +11803,8 @@ class Effect3807(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
-        fit.ship.increaseItemAttr('maxTargetRange', module.getModifiedItemAttr('maxTargetRange'))
+    def handler(fit, module, context, **kwargs):
+        fit.ship.increaseItemAttr('maxTargetRange', module.getModifiedItemAttr('maxTargetRange'), **kwargs)
 
 
 class Effect3808(BaseEffect):
@@ -11747,8 +11819,8 @@ class Effect3808(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
-        fit.ship.increaseItemAttr('signatureRadius', module.getModifiedItemAttr('signatureRadius'))
+    def handler(fit, module, context, **kwargs):
+        fit.ship.increaseItemAttr('signatureRadius', module.getModifiedItemAttr('signatureRadius'), **kwargs)
 
 
 class Effect3810(BaseEffect):
@@ -11763,8 +11835,8 @@ class Effect3810(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, subsystem, context):
-        fit.ship.increaseItemAttr('capacity', subsystem.getModifiedItemAttr('cargoCapacityAdd') or 0)
+    def handler(fit, subsystem, context, **kwargs):
+        fit.ship.increaseItemAttr('capacity', subsystem.getModifiedItemAttr('cargoCapacityAdd') or 0, **kwargs)
 
 
 class Effect3811(BaseEffect):
@@ -11778,8 +11850,8 @@ class Effect3811(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
-        fit.ship.increaseItemAttr('capacitorCapacity', module.getModifiedItemAttr('capacitorCapacity') or 0)
+    def handler(fit, module, context, **kwargs):
+        fit.ship.increaseItemAttr('capacitorCapacity', module.getModifiedItemAttr('capacitorCapacity') or 0, **kwargs)
 
 
 class Effect3831(BaseEffect):
@@ -11793,8 +11865,8 @@ class Effect3831(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
-        fit.ship.increaseItemAttr('shieldCapacity', module.getModifiedItemAttr('shieldCapacity'))
+    def handler(fit, module, context, **kwargs):
+        fit.ship.increaseItemAttr('shieldCapacity', module.getModifiedItemAttr('shieldCapacity'), **kwargs)
 
 
 class Effect3857(BaseEffect):
@@ -11808,9 +11880,9 @@ class Effect3857(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         fit.ship.boostItemAttr('maxVelocity', module.getModifiedItemAttr('subsystemBonusAmarrPropulsion'),
-                               skill='Amarr Propulsion Systems')
+                               skill='Amarr Propulsion Systems', **kwargs)
 
 
 class Effect3859(BaseEffect):
@@ -11824,9 +11896,9 @@ class Effect3859(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.ship.boostItemAttr('maxVelocity', src.getModifiedItemAttr('subsystemBonusCaldariPropulsion'),
-                               skill='Caldari Propulsion Systems')
+                               skill='Caldari Propulsion Systems', **kwargs)
 
 
 class Effect3860(BaseEffect):
@@ -11840,9 +11912,9 @@ class Effect3860(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         fit.ship.boostItemAttr('maxVelocity', module.getModifiedItemAttr('subsystemBonusMinmatarPropulsion'),
-                               skill='Minmatar Propulsion Systems')
+                               skill='Minmatar Propulsion Systems', **kwargs)
 
 
 class Effect3861(BaseEffect):
@@ -11856,10 +11928,10 @@ class Effect3861(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Afterburner'),
                                       'speedFactor', module.getModifiedItemAttr('subsystemBonusMinmatarPropulsion'),
-                                      skill='Minmatar Propulsion Systems')
+                                      skill='Minmatar Propulsion Systems', **kwargs)
 
 
 class Effect3863(BaseEffect):
@@ -11873,10 +11945,10 @@ class Effect3863(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Afterburner'),
                                       'speedFactor', module.getModifiedItemAttr('subsystemBonusCaldariPropulsion'),
-                                      skill='Caldari Propulsion Systems')
+                                      skill='Caldari Propulsion Systems', **kwargs)
 
 
 class Effect3864(BaseEffect):
@@ -11890,10 +11962,10 @@ class Effect3864(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Afterburner'),
                                       'speedFactor', module.getModifiedItemAttr('subsystemBonusAmarrPropulsion'),
-                                      skill='Amarr Propulsion Systems')
+                                      skill='Amarr Propulsion Systems', **kwargs)
 
 
 class Effect3865(BaseEffect):
@@ -11907,9 +11979,9 @@ class Effect3865(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.ship.boostItemAttr('agility', src.getModifiedItemAttr('subsystemBonusAmarrPropulsion2'),
-                               skill='Amarr Propulsion Systems')
+                               skill='Amarr Propulsion Systems', **kwargs)
 
 
 class Effect3866(BaseEffect):
@@ -11923,9 +11995,9 @@ class Effect3866(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.ship.boostItemAttr('agility', src.getModifiedItemAttr('subsystemBonusCaldariPropulsion2'),
-                               skill='Caldari Propulsion Systems')
+                               skill='Caldari Propulsion Systems', **kwargs)
 
 
 class Effect3867(BaseEffect):
@@ -11939,9 +12011,9 @@ class Effect3867(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.ship.boostItemAttr('agility', src.getModifiedItemAttr('subsystemBonusGallentePropulsion2'),
-                               skill='Gallente Propulsion Systems')
+                               skill='Gallente Propulsion Systems', **kwargs)
 
 
 class Effect3868(BaseEffect):
@@ -11955,9 +12027,9 @@ class Effect3868(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.ship.boostItemAttr('agility', src.getModifiedItemAttr('subsystemBonusMinmatarPropulsion2'),
-                               skill='Minmatar Propulsion Systems')
+                               skill='Minmatar Propulsion Systems', **kwargs)
 
 
 class Effect3869(BaseEffect):
@@ -11971,10 +12043,10 @@ class Effect3869(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('High Speed Maneuvering'),
                                       'signatureRadiusBonus', src.getModifiedItemAttr('subsystemBonusMinmatarPropulsion2'),
-                                      skill='Minmatar Propulsion Systems')
+                                      skill='Minmatar Propulsion Systems', **kwargs)
 
 
 class Effect3872(BaseEffect):
@@ -11988,10 +12060,10 @@ class Effect3872(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('High Speed Maneuvering'),
                                       'signatureRadiusBonus', src.getModifiedItemAttr('subsystemBonusAmarrPropulsion2'),
-                                      skill='Amarr Propulsion Systems')
+                                      skill='Amarr Propulsion Systems', **kwargs)
 
 
 class Effect3875(BaseEffect):
@@ -12005,10 +12077,10 @@ class Effect3875(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Propulsion Module',
                                       'capacitorNeed', module.getModifiedItemAttr('subsystemBonusGallentePropulsion'),
-                                      skill='Gallente Propulsion Systems')
+                                      skill='Gallente Propulsion Systems', **kwargs)
 
 
 class Effect3893(BaseEffect):
@@ -12022,9 +12094,9 @@ class Effect3893(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.ship.boostItemAttr('scanLadarStrength', src.getModifiedItemAttr('subsystemBonusMinmatarCore'),
-                               skill='Minmatar Core Systems')
+                               skill='Minmatar Core Systems', **kwargs)
 
 
 class Effect3895(BaseEffect):
@@ -12038,9 +12110,9 @@ class Effect3895(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.ship.boostItemAttr('scanMagnetometricStrength', src.getModifiedItemAttr('subsystemBonusGallenteCore'),
-                               skill='Gallente Core Systems')
+                               skill='Gallente Core Systems', **kwargs)
 
 
 class Effect3897(BaseEffect):
@@ -12054,8 +12126,8 @@ class Effect3897(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
-        fit.ship.boostItemAttr('scanGravimetricStrength', src.getModifiedItemAttr('subsystemBonusCaldariCore'), skill='Caldari Core Systems')
+    def handler(fit, src, context, **kwargs):
+        fit.ship.boostItemAttr('scanGravimetricStrength', src.getModifiedItemAttr('subsystemBonusCaldariCore'), skill='Caldari Core Systems', **kwargs)
 
 
 class Effect3900(BaseEffect):
@@ -12069,9 +12141,9 @@ class Effect3900(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.ship.boostItemAttr('scanRadarStrength', src.getModifiedItemAttr('subsystemBonusAmarrCore'),
-                               skill='Amarr Core Systems')
+                               skill='Amarr Core Systems', **kwargs)
 
 
 class Effect3959(BaseEffect):
@@ -12086,10 +12158,10 @@ class Effect3959(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Repair Systems'),
                                       'armorDamageAmount', module.getModifiedItemAttr('subsystemBonusAmarrDefensive'),
-                                      skill='Amarr Defensive Systems')
+                                      skill='Amarr Defensive Systems', **kwargs)
 
 
 class Effect3961(BaseEffect):
@@ -12104,10 +12176,10 @@ class Effect3961(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Repair Systems'),
                                       'armorDamageAmount', module.getModifiedItemAttr('subsystemBonusGallenteDefensive'),
-                                      skill='Gallente Defensive Systems')
+                                      skill='Gallente Defensive Systems', **kwargs)
 
 
 class Effect3962(BaseEffect):
@@ -12122,13 +12194,13 @@ class Effect3962(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Repair Systems'),
                                       'armorDamageAmount', src.getModifiedItemAttr('subsystemBonusMinmatarDefensive'),
-                                      skill='Minmatar Defensive Systems')
+                                      skill='Minmatar Defensive Systems', **kwargs)
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Operation'),
                                       'shieldBonus', src.getModifiedItemAttr('subsystemBonusMinmatarDefensive'),
-                                      skill='Minmatar Defensive Systems')
+                                      skill='Minmatar Defensive Systems', **kwargs)
 
 
 class Effect3964(BaseEffect):
@@ -12143,10 +12215,10 @@ class Effect3964(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Operation'),
                                       'shieldBonus', module.getModifiedItemAttr('subsystemBonusCaldariDefensive'),
-                                      skill='Caldari Defensive Systems')
+                                      skill='Caldari Defensive Systems', **kwargs)
 
 
 class Effect3976(BaseEffect):
@@ -12160,9 +12232,9 @@ class Effect3976(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         fit.ship.boostItemAttr('shieldCapacity', module.getModifiedItemAttr('subsystemBonusCaldariDefensive'),
-                               skill='Caldari Defensive Systems')
+                               skill='Caldari Defensive Systems', **kwargs)
 
 
 class Effect3979(BaseEffect):
@@ -12176,11 +12248,11 @@ class Effect3979(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.ship.boostItemAttr('shieldCapacity', src.getModifiedItemAttr('subsystemBonusMinmatarDefensive'),
-                               skill='Minmatar Defensive Systems')
+                               skill='Minmatar Defensive Systems', **kwargs)
         fit.ship.boostItemAttr('armorHP', src.getModifiedItemAttr('subsystemBonusMinmatarDefensive'),
-                               skill='Minmatar Defensive Systems')
+                               skill='Minmatar Defensive Systems', **kwargs)
 
 
 class Effect3980(BaseEffect):
@@ -12194,9 +12266,9 @@ class Effect3980(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         fit.ship.boostItemAttr('armorHP', module.getModifiedItemAttr('subsystemBonusGallenteDefensive'),
-                               skill='Gallente Defensive Systems')
+                               skill='Gallente Defensive Systems', **kwargs)
 
 
 class Effect3982(BaseEffect):
@@ -12210,9 +12282,9 @@ class Effect3982(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         fit.ship.boostItemAttr('armorHP', module.getModifiedItemAttr('subsystemBonusAmarrDefensive'),
-                               skill='Amarr Defensive Systems')
+                               skill='Amarr Defensive Systems', **kwargs)
 
 
 class Effect3992(BaseEffect):
@@ -12227,8 +12299,8 @@ class Effect3992(BaseEffect):
     type = ('projected', 'passive')
 
     @staticmethod
-    def handler(fit, beacon, context):
-        fit.ship.multiplyItemAttr('shieldCapacity', beacon.getModifiedItemAttr('shieldCapacityMultiplier'))
+    def handler(fit, beacon, context, **kwargs):
+        fit.ship.multiplyItemAttr('shieldCapacity', beacon.getModifiedItemAttr('shieldCapacityMultiplier'), **kwargs)
 
 
 class Effect3993(BaseEffect):
@@ -12244,9 +12316,9 @@ class Effect3993(BaseEffect):
     type = ('projected', 'passive')
 
     @staticmethod
-    def handler(fit, beacon, context):
+    def handler(fit, beacon, context, **kwargs):
         fit.ship.multiplyItemAttr('maxTargetRange', beacon.getModifiedItemAttr('maxTargetRangeMultiplier'),
-                                  stackingPenalties=True, penaltyGroup='postMul')
+                                  stackingPenalties=True, penaltyGroup='postMul', **kwargs)
 
 
 class Effect3995(BaseEffect):
@@ -12262,9 +12334,9 @@ class Effect3995(BaseEffect):
     type = ('projected', 'passive')
 
     @staticmethod
-    def handler(fit, beacon, context):
+    def handler(fit, beacon, context, **kwargs):
         fit.ship.multiplyItemAttr('signatureRadius', beacon.getModifiedItemAttr('signatureRadiusMultiplier'),
-                                  stackingPenalties=True, penaltyGroup='postMul')
+                                  stackingPenalties=True, penaltyGroup='postMul', **kwargs)
 
 
 class Effect3996(BaseEffect):
@@ -12280,9 +12352,9 @@ class Effect3996(BaseEffect):
     type = ('projected', 'passive')
 
     @staticmethod
-    def handler(fit, beacon, context):
+    def handler(fit, beacon, context, **kwargs):
         fit.ship.boostItemAttr('armorEmDamageResonance', beacon.getModifiedItemAttr('armorEmDamageResistanceBonus'),
-                               stackingPenalties=True)
+                               stackingPenalties=True, **kwargs)
 
 
 class Effect3997(BaseEffect):
@@ -12298,10 +12370,10 @@ class Effect3997(BaseEffect):
     type = ('projected', 'passive')
 
     @staticmethod
-    def handler(fit, beacon, context):
+    def handler(fit, beacon, context, **kwargs):
         fit.ship.boostItemAttr('armorExplosiveDamageResonance',
                                beacon.getModifiedItemAttr('armorExplosiveDamageResistanceBonus'),
-                               stackingPenalties=True)
+                               stackingPenalties=True, **kwargs)
 
 
 class Effect3998(BaseEffect):
@@ -12317,10 +12389,10 @@ class Effect3998(BaseEffect):
     type = ('projected', 'passive')
 
     @staticmethod
-    def handler(fit, beacon, context):
+    def handler(fit, beacon, context, **kwargs):
         fit.ship.boostItemAttr('armorKineticDamageResonance',
                                beacon.getModifiedItemAttr('armorKineticDamageResistanceBonus'),
-                               stackingPenalties=True)
+                               stackingPenalties=True, **kwargs)
 
 
 class Effect3999(BaseEffect):
@@ -12336,10 +12408,10 @@ class Effect3999(BaseEffect):
     type = ('projected', 'passive')
 
     @staticmethod
-    def handler(fit, beacon, context):
+    def handler(fit, beacon, context, **kwargs):
         fit.ship.boostItemAttr('armorThermalDamageResonance',
                                beacon.getModifiedItemAttr('armorThermalDamageResistanceBonus'),
-                               stackingPenalties=True)
+                               stackingPenalties=True, **kwargs)
 
 
 class Effect4002(BaseEffect):
@@ -12354,10 +12426,10 @@ class Effect4002(BaseEffect):
     type = ('projected', 'passive')
 
     @staticmethod
-    def handler(fit, beacon, context):
+    def handler(fit, beacon, context, **kwargs):
         fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
                                            'maxVelocity', beacon.getModifiedItemAttr('missileVelocityMultiplier'),
-                                           stackingPenalties=True, penaltyGroup='postMul')
+                                           stackingPenalties=True, penaltyGroup='postMul', **kwargs)
 
 
 class Effect4003(BaseEffect):
@@ -12372,9 +12444,9 @@ class Effect4003(BaseEffect):
     type = ('projected', 'passive')
 
     @staticmethod
-    def handler(fit, beacon, context):
+    def handler(fit, beacon, context, **kwargs):
         fit.ship.multiplyItemAttr('maxVelocity', beacon.getModifiedItemAttr('maxVelocityMultiplier'),
-                                  stackingPenalties=True, penaltyGroup='postMul')
+                                  stackingPenalties=True, penaltyGroup='postMul', **kwargs)
 
 
 class Effect4016(BaseEffect):
@@ -12389,10 +12461,10 @@ class Effect4016(BaseEffect):
     type = ('projected', 'passive')
 
     @staticmethod
-    def handler(fit, beacon, context):
+    def handler(fit, beacon, context, **kwargs):
         fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill('Gunnery'),
                                          'damageMultiplier', beacon.getModifiedItemAttr('damageMultiplierMultiplier'),
-                                         stackingPenalties=True)
+                                         stackingPenalties=True, **kwargs)
 
 
 class Effect4017(BaseEffect):
@@ -12407,10 +12479,10 @@ class Effect4017(BaseEffect):
     type = ('projected', 'passive')
 
     @staticmethod
-    def handler(fit, beacon, context):
+    def handler(fit, beacon, context, **kwargs):
         fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
                                            'thermalDamage', beacon.getModifiedItemAttr('damageMultiplierMultiplier'),
-                                           stackingPenalties=True, penaltyGroup='postMul')
+                                           stackingPenalties=True, penaltyGroup='postMul', **kwargs)
 
 
 class Effect4018(BaseEffect):
@@ -12425,10 +12497,10 @@ class Effect4018(BaseEffect):
     type = ('projected', 'passive')
 
     @staticmethod
-    def handler(fit, beacon, context):
+    def handler(fit, beacon, context, **kwargs):
         fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
                                            'emDamage', beacon.getModifiedItemAttr('damageMultiplierMultiplier'),
-                                           stackingPenalties=True, penaltyGroup='postMul')
+                                           stackingPenalties=True, penaltyGroup='postMul', **kwargs)
 
 
 class Effect4019(BaseEffect):
@@ -12443,10 +12515,10 @@ class Effect4019(BaseEffect):
     type = ('projected', 'passive')
 
     @staticmethod
-    def handler(fit, beacon, context):
+    def handler(fit, beacon, context, **kwargs):
         fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
                                            'explosiveDamage', beacon.getModifiedItemAttr('damageMultiplierMultiplier'),
-                                           stackingPenalties=True, penaltyGroup='postMul')
+                                           stackingPenalties=True, penaltyGroup='postMul', **kwargs)
 
 
 class Effect4020(BaseEffect):
@@ -12461,10 +12533,10 @@ class Effect4020(BaseEffect):
     type = ('projected', 'passive')
 
     @staticmethod
-    def handler(fit, beacon, context):
+    def handler(fit, beacon, context, **kwargs):
         fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
                                            'kineticDamage', beacon.getModifiedItemAttr('damageMultiplierMultiplier'),
-                                           stackingPenalties=True, penaltyGroup='postMul')
+                                           stackingPenalties=True, penaltyGroup='postMul', **kwargs)
 
 
 class Effect4021(BaseEffect):
@@ -12479,10 +12551,10 @@ class Effect4021(BaseEffect):
     type = ('projected', 'passive')
 
     @staticmethod
-    def handler(fit, beacon, context):
+    def handler(fit, beacon, context, **kwargs):
         fit.drones.filteredItemMultiply(lambda drone: drone.item.requiresSkill('Drones'),
                                         'damageMultiplier', beacon.getModifiedItemAttr('damageMultiplierMultiplier'),
-                                        stackingPenalties=True, penaltyGroup='postMul')
+                                        stackingPenalties=True, penaltyGroup='postMul', **kwargs)
 
 
 class Effect4022(BaseEffect):
@@ -12497,10 +12569,10 @@ class Effect4022(BaseEffect):
     type = ('projected', 'passive')
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill('Gunnery'),
                                          'trackingSpeed', module.getModifiedItemAttr('trackingSpeedMultiplier'),
-                                         stackingPenalties=True, penaltyGroup='postMul')
+                                         stackingPenalties=True, penaltyGroup='postMul', **kwargs)
 
 
 class Effect4023(BaseEffect):
@@ -12515,9 +12587,9 @@ class Effect4023(BaseEffect):
     type = ('projected', 'passive')
 
     @staticmethod
-    def handler(fit, beacon, context):
+    def handler(fit, beacon, context, **kwargs):
         fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
-                                           'aoeVelocity', beacon.getModifiedItemAttr('aoeVelocityMultiplier'))
+                                           'aoeVelocity', beacon.getModifiedItemAttr('aoeVelocityMultiplier'), **kwargs)
 
 
 class Effect4033(BaseEffect):
@@ -12532,9 +12604,9 @@ class Effect4033(BaseEffect):
     type = ('projected', 'passive')
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         fit.modules.filteredItemMultiply(lambda mod: 'heatDamage' in mod.itemModifiedAttributes,
-                                         'heatDamage', module.getModifiedItemAttr('heatDamageMultiplier'))
+                                         'heatDamage', module.getModifiedItemAttr('heatDamageMultiplier'), **kwargs)
 
 
 class Effect4034(BaseEffect):
@@ -12549,9 +12621,9 @@ class Effect4034(BaseEffect):
     type = ('projected', 'passive')
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         fit.modules.filteredItemMultiply(lambda mod: 'overloadArmorDamageAmount' in mod.itemModifiedAttributes,
-                                         'overloadArmorDamageAmount', module.getModifiedItemAttr('overloadBonusMultiplier'))
+                                         'overloadArmorDamageAmount', module.getModifiedItemAttr('overloadBonusMultiplier'), **kwargs)
 
 
 class Effect4035(BaseEffect):
@@ -12566,9 +12638,9 @@ class Effect4035(BaseEffect):
     type = ('projected', 'passive')
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         fit.modules.filteredItemMultiply(lambda mod: 'overloadDamageModifier' in mod.itemModifiedAttributes,
-                                         'overloadDamageModifier', module.getModifiedItemAttr('overloadBonusMultiplier'))
+                                         'overloadDamageModifier', module.getModifiedItemAttr('overloadBonusMultiplier'), **kwargs)
 
 
 class Effect4036(BaseEffect):
@@ -12583,9 +12655,9 @@ class Effect4036(BaseEffect):
     type = ('projected', 'passive')
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         fit.modules.filteredItemMultiply(lambda mod: 'overloadDurationBonus' in mod.itemModifiedAttributes,
-                                         'overloadDurationBonus', module.getModifiedItemAttr('overloadBonusMultiplier'))
+                                         'overloadDurationBonus', module.getModifiedItemAttr('overloadBonusMultiplier'), **kwargs)
 
 
 class Effect4037(BaseEffect):
@@ -12600,9 +12672,9 @@ class Effect4037(BaseEffect):
     type = ('projected', 'passive')
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         fit.modules.filteredItemMultiply(lambda mod: 'overloadECCMStrenghtBonus' in mod.itemModifiedAttributes,
-                                         'overloadECCMStrenghtBonus', module.getModifiedItemAttr('overloadBonusMultiplier'))
+                                         'overloadECCMStrenghtBonus', module.getModifiedItemAttr('overloadBonusMultiplier'), **kwargs)
 
 
 class Effect4038(BaseEffect):
@@ -12617,9 +12689,9 @@ class Effect4038(BaseEffect):
     type = ('projected', 'passive')
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         fit.modules.filteredItemMultiply(lambda mod: 'overloadECMStrenghtBonus' in mod.itemModifiedAttributes,
-                                         'overloadECMStrenghtBonus', module.getModifiedItemAttr('overloadBonusMultiplier'))
+                                         'overloadECMStrenghtBonus', module.getModifiedItemAttr('overloadBonusMultiplier'), **kwargs)
 
 
 class Effect4039(BaseEffect):
@@ -12634,9 +12706,9 @@ class Effect4039(BaseEffect):
     type = ('projected', 'passive')
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         fit.modules.filteredItemMultiply(lambda mod: 'overloadHardeningBonus' in mod.itemModifiedAttributes,
-                                         'overloadHardeningBonus', module.getModifiedItemAttr('overloadBonusMultiplier'))
+                                         'overloadHardeningBonus', module.getModifiedItemAttr('overloadBonusMultiplier'), **kwargs)
 
 
 class Effect4040(BaseEffect):
@@ -12651,9 +12723,9 @@ class Effect4040(BaseEffect):
     type = ('projected', 'passive')
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         fit.modules.filteredItemMultiply(lambda mod: 'overloadRangeBonus' in mod.itemModifiedAttributes,
-                                         'overloadRangeBonus', module.getModifiedItemAttr('overloadBonusMultiplier'))
+                                         'overloadRangeBonus', module.getModifiedItemAttr('overloadBonusMultiplier'), **kwargs)
 
 
 class Effect4041(BaseEffect):
@@ -12668,9 +12740,9 @@ class Effect4041(BaseEffect):
     type = ('projected', 'passive')
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         fit.modules.filteredItemMultiply(lambda mod: 'overloadRofBonus' in mod.itemModifiedAttributes,
-                                         'overloadRofBonus', module.getModifiedItemAttr('overloadBonusMultiplier'))
+                                         'overloadRofBonus', module.getModifiedItemAttr('overloadBonusMultiplier'), **kwargs)
 
 
 class Effect4042(BaseEffect):
@@ -12685,9 +12757,9 @@ class Effect4042(BaseEffect):
     type = ('projected', 'passive')
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         fit.modules.filteredItemMultiply(lambda mod: 'overloadSelfDurationBonus' in mod.itemModifiedAttributes,
-                                         'overloadSelfDurationBonus', module.getModifiedItemAttr('overloadBonusMultiplier'))
+                                         'overloadSelfDurationBonus', module.getModifiedItemAttr('overloadBonusMultiplier'), **kwargs)
 
 
 class Effect4043(BaseEffect):
@@ -12702,9 +12774,9 @@ class Effect4043(BaseEffect):
     type = ('projected', 'passive')
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         fit.modules.filteredItemMultiply(lambda mod: 'overloadShieldBonus' in mod.itemModifiedAttributes,
-                                         'overloadShieldBonus', module.getModifiedItemAttr('overloadBonusMultiplier'))
+                                         'overloadShieldBonus', module.getModifiedItemAttr('overloadBonusMultiplier'), **kwargs)
 
 
 class Effect4044(BaseEffect):
@@ -12719,9 +12791,9 @@ class Effect4044(BaseEffect):
     type = ('projected', 'passive')
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         fit.modules.filteredItemMultiply(lambda mod: 'overloadSpeedFactorBonus' in mod.itemModifiedAttributes,
-                                         'overloadSpeedFactorBonus', module.getModifiedItemAttr('overloadBonusMultiplier'))
+                                         'overloadSpeedFactorBonus', module.getModifiedItemAttr('overloadBonusMultiplier'), **kwargs)
 
 
 class Effect4045(BaseEffect):
@@ -12736,9 +12808,9 @@ class Effect4045(BaseEffect):
     type = ('projected', 'passive')
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == 'Smart Bomb',
-                                         'empFieldRange', module.getModifiedItemAttr('empFieldRangeMultiplier'))
+                                         'empFieldRange', module.getModifiedItemAttr('empFieldRangeMultiplier'), **kwargs)
 
 
 class Effect4046(BaseEffect):
@@ -12753,9 +12825,9 @@ class Effect4046(BaseEffect):
     type = ('projected', 'passive')
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == 'Smart Bomb',
-                                         'emDamage', module.getModifiedItemAttr('smartbombDamageMultiplier'))
+                                         'emDamage', module.getModifiedItemAttr('smartbombDamageMultiplier'), **kwargs)
 
 
 class Effect4047(BaseEffect):
@@ -12770,9 +12842,9 @@ class Effect4047(BaseEffect):
     type = ('projected', 'passive')
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == 'Smart Bomb',
-                                         'thermalDamage', module.getModifiedItemAttr('smartbombDamageMultiplier'))
+                                         'thermalDamage', module.getModifiedItemAttr('smartbombDamageMultiplier'), **kwargs)
 
 
 class Effect4048(BaseEffect):
@@ -12787,9 +12859,9 @@ class Effect4048(BaseEffect):
     type = ('projected', 'passive')
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == 'Smart Bomb',
-                                         'kineticDamage', module.getModifiedItemAttr('smartbombDamageMultiplier'))
+                                         'kineticDamage', module.getModifiedItemAttr('smartbombDamageMultiplier'), **kwargs)
 
 
 class Effect4049(BaseEffect):
@@ -12804,9 +12876,9 @@ class Effect4049(BaseEffect):
     type = ('projected', 'passive')
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == 'Smart Bomb',
-                                         'explosiveDamage', module.getModifiedItemAttr('smartbombDamageMultiplier'))
+                                         'explosiveDamage', module.getModifiedItemAttr('smartbombDamageMultiplier'), **kwargs)
 
 
 class Effect4054(BaseEffect):
@@ -12821,10 +12893,10 @@ class Effect4054(BaseEffect):
     type = ('projected', 'passive')
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill('Small Energy Turret'),
                                          'damageMultiplier', module.getModifiedItemAttr('smallWeaponDamageMultiplier'),
-                                         stackingPenalties=True)
+                                         stackingPenalties=True, **kwargs)
 
 
 class Effect4055(BaseEffect):
@@ -12839,10 +12911,10 @@ class Effect4055(BaseEffect):
     type = ('projected', 'passive')
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill('Small Projectile Turret'),
                                          'damageMultiplier', module.getModifiedItemAttr('smallWeaponDamageMultiplier'),
-                                         stackingPenalties=True)
+                                         stackingPenalties=True, **kwargs)
 
 
 class Effect4056(BaseEffect):
@@ -12857,10 +12929,10 @@ class Effect4056(BaseEffect):
     type = ('projected', 'passive')
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill('Small Hybrid Turret'),
                                          'damageMultiplier', module.getModifiedItemAttr('smallWeaponDamageMultiplier'),
-                                         stackingPenalties=True)
+                                         stackingPenalties=True, **kwargs)
 
 
 class Effect4057(BaseEffect):
@@ -12875,10 +12947,10 @@ class Effect4057(BaseEffect):
     type = ('projected', 'passive')
 
     @staticmethod
-    def handler(fit, beacon, context):
+    def handler(fit, beacon, context, **kwargs):
         fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill('Rockets'),
                                            'emDamage', beacon.getModifiedItemAttr('smallWeaponDamageMultiplier'),
-                                           stackingPenalties=True, penaltyGroup='postMul')
+                                           stackingPenalties=True, penaltyGroup='postMul', **kwargs)
 
 
 class Effect4058(BaseEffect):
@@ -12893,10 +12965,10 @@ class Effect4058(BaseEffect):
     type = ('projected', 'passive')
 
     @staticmethod
-    def handler(fit, beacon, context):
+    def handler(fit, beacon, context, **kwargs):
         fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill('Rockets'),
                                            'explosiveDamage', beacon.getModifiedItemAttr('smallWeaponDamageMultiplier'),
-                                           stackingPenalties=True, penaltyGroup='postMul')
+                                           stackingPenalties=True, penaltyGroup='postMul', **kwargs)
 
 
 class Effect4059(BaseEffect):
@@ -12911,10 +12983,10 @@ class Effect4059(BaseEffect):
     type = ('projected', 'passive')
 
     @staticmethod
-    def handler(fit, beacon, context):
+    def handler(fit, beacon, context, **kwargs):
         fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill('Rockets'),
                                            'kineticDamage', beacon.getModifiedItemAttr('smallWeaponDamageMultiplier'),
-                                           stackingPenalties=True, penaltyGroup='postMul')
+                                           stackingPenalties=True, penaltyGroup='postMul', **kwargs)
 
 
 class Effect4060(BaseEffect):
@@ -12929,10 +13001,10 @@ class Effect4060(BaseEffect):
     type = ('projected', 'passive')
 
     @staticmethod
-    def handler(fit, beacon, context):
+    def handler(fit, beacon, context, **kwargs):
         fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill('Rockets'),
                                            'thermalDamage', beacon.getModifiedItemAttr('smallWeaponDamageMultiplier'),
-                                           stackingPenalties=True, penaltyGroup='postMul')
+                                           stackingPenalties=True, penaltyGroup='postMul', **kwargs)
 
 
 class Effect4061(BaseEffect):
@@ -12947,10 +13019,10 @@ class Effect4061(BaseEffect):
     type = ('projected', 'passive')
 
     @staticmethod
-    def handler(fit, beacon, context):
+    def handler(fit, beacon, context, **kwargs):
         fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill('Light Missiles'),
                                            'thermalDamage', beacon.getModifiedItemAttr('smallWeaponDamageMultiplier'),
-                                           stackingPenalties=True, penaltyGroup='postMul')
+                                           stackingPenalties=True, penaltyGroup='postMul', **kwargs)
 
 
 class Effect4062(BaseEffect):
@@ -12965,10 +13037,10 @@ class Effect4062(BaseEffect):
     type = ('projected', 'passive')
 
     @staticmethod
-    def handler(fit, beacon, context):
+    def handler(fit, beacon, context, **kwargs):
         fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill('Light Missiles'),
                                            'emDamage', beacon.getModifiedItemAttr('smallWeaponDamageMultiplier'),
-                                           stackingPenalties=True, penaltyGroup='postMul')
+                                           stackingPenalties=True, penaltyGroup='postMul', **kwargs)
 
 
 class Effect4063(BaseEffect):
@@ -12983,10 +13055,10 @@ class Effect4063(BaseEffect):
     type = ('projected', 'passive')
 
     @staticmethod
-    def handler(fit, beacon, context):
+    def handler(fit, beacon, context, **kwargs):
         fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill('Light Missiles'),
                                            'explosiveDamage', beacon.getModifiedItemAttr('smallWeaponDamageMultiplier'),
-                                           stackingPenalties=True, penaltyGroup='postMul')
+                                           stackingPenalties=True, penaltyGroup='postMul', **kwargs)
 
 
 class Effect4086(BaseEffect):
@@ -13001,11 +13073,11 @@ class Effect4086(BaseEffect):
     type = ('projected', 'passive')
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill('Repair Systems') or
                                                      mod.item.requiresSkill('Capital Repair Systems'),
                                          'armorDamageAmount', module.getModifiedItemAttr('armorDamageAmountMultiplier'),
-                                         stackingPenalties=True, penaltyGroup='postMul')
+                                         stackingPenalties=True, penaltyGroup='postMul', **kwargs)
 
 
 class Effect4088(BaseEffect):
@@ -13020,11 +13092,11 @@ class Effect4088(BaseEffect):
     type = ('projected', 'passive')
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill('Remote Armor Repair Systems'),
                                          'armorDamageAmount',
                                          module.getModifiedItemAttr('armorDamageAmountMultiplierRemote'),
-                                         stackingPenalties=True)
+                                         stackingPenalties=True, **kwargs)
 
 
 class Effect4089(BaseEffect):
@@ -13039,10 +13111,10 @@ class Effect4089(BaseEffect):
     type = ('projected', 'passive')
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill('Shield Emission Systems'),
                                          'shieldBonus', module.getModifiedItemAttr('shieldBonusMultiplierRemote'),
-                                         stackingPenalties=True, penaltyGroup='postMul')
+                                         stackingPenalties=True, penaltyGroup='postMul', **kwargs)
 
 
 class Effect4090(BaseEffect):
@@ -13057,8 +13129,8 @@ class Effect4090(BaseEffect):
     type = ('projected', 'passive')
 
     @staticmethod
-    def handler(fit, beacon, context):
-        fit.ship.multiplyItemAttr('capacitorCapacity', beacon.getModifiedItemAttr('capacitorCapacityMultiplierSystem'))
+    def handler(fit, beacon, context, **kwargs):
+        fit.ship.multiplyItemAttr('capacitorCapacity', beacon.getModifiedItemAttr('capacitorCapacityMultiplierSystem'), **kwargs)
 
 
 class Effect4091(BaseEffect):
@@ -13074,8 +13146,8 @@ class Effect4091(BaseEffect):
     type = ('projected', 'passive')
 
     @staticmethod
-    def handler(fit, beacon, context):
-        fit.ship.multiplyItemAttr('rechargeRate', beacon.getModifiedItemAttr('rechargeRateMultiplier'))
+    def handler(fit, beacon, context, **kwargs):
+        fit.ship.multiplyItemAttr('rechargeRate', beacon.getModifiedItemAttr('rechargeRateMultiplier'), **kwargs)
 
 
 class Effect4093(BaseEffect):
@@ -13089,10 +13161,10 @@ class Effect4093(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Energy Turret'),
                                       'damageMultiplier', module.getModifiedItemAttr('subsystemBonusAmarrOffensive'),
-                                      skill='Amarr Offensive Systems')
+                                      skill='Amarr Offensive Systems', **kwargs)
 
 
 class Effect4104(BaseEffect):
@@ -13106,10 +13178,10 @@ class Effect4104(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Hybrid Turret'),
                                       'maxRange', module.getModifiedItemAttr('subsystemBonusCaldariOffensive'),
-                                      skill='Caldari Offensive Systems')
+                                      skill='Caldari Offensive Systems', **kwargs)
 
 
 class Effect4106(BaseEffect):
@@ -13123,10 +13195,10 @@ class Effect4106(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Hybrid Turret'),
                                       'falloff', module.getModifiedItemAttr('subsystemBonusGallenteOffensive'),
-                                      skill='Gallente Offensive Systems')
+                                      skill='Gallente Offensive Systems', **kwargs)
 
 
 class Effect4114(BaseEffect):
@@ -13140,10 +13212,10 @@ class Effect4114(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Projectile Turret'),
                                       'falloff', module.getModifiedItemAttr('subsystemBonusMinmatarOffensive'),
-                                      skill='Minmatar Offensive Systems')
+                                      skill='Minmatar Offensive Systems', **kwargs)
 
 
 class Effect4115(BaseEffect):
@@ -13157,10 +13229,10 @@ class Effect4115(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Projectile Turret'),
                                       'maxRange', module.getModifiedItemAttr('subsystemBonusMinmatarOffensive'),
-                                      skill='Minmatar Offensive Systems')
+                                      skill='Minmatar Offensive Systems', **kwargs)
 
 
 class Effect4122(BaseEffect):
@@ -13174,10 +13246,10 @@ class Effect4122(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         groups = ('Missile Launcher Heavy', 'Missile Launcher Rapid Light', 'Missile Launcher Heavy Assault')
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in groups,
-                                      'speed', src.getModifiedItemAttr('subsystemBonusCaldariOffensive'), skill='Caldari Offensive Systems')
+                                      'speed', src.getModifiedItemAttr('subsystemBonusCaldariOffensive'), skill='Caldari Offensive Systems', **kwargs)
 
 
 class Effect4135(BaseEffect):
@@ -13192,9 +13264,9 @@ class Effect4135(BaseEffect):
     type = ('projected', 'passive')
 
     @staticmethod
-    def handler(fit, beacon, context):
+    def handler(fit, beacon, context, **kwargs):
         fit.ship.boostItemAttr('shieldEmDamageResonance', beacon.getModifiedItemAttr('shieldEmDamageResistanceBonus'),
-                               stackingPenalties=True)
+                               stackingPenalties=True, **kwargs)
 
 
 class Effect4136(BaseEffect):
@@ -13209,10 +13281,10 @@ class Effect4136(BaseEffect):
     type = ('projected', 'passive')
 
     @staticmethod
-    def handler(fit, beacon, context):
+    def handler(fit, beacon, context, **kwargs):
         fit.ship.boostItemAttr('shieldExplosiveDamageResonance',
                                beacon.getModifiedItemAttr('shieldExplosiveDamageResistanceBonus'),
-                               stackingPenalties=True)
+                               stackingPenalties=True, **kwargs)
 
 
 class Effect4137(BaseEffect):
@@ -13227,10 +13299,10 @@ class Effect4137(BaseEffect):
     type = ('projected', 'passive')
 
     @staticmethod
-    def handler(fit, beacon, context):
+    def handler(fit, beacon, context, **kwargs):
         fit.ship.boostItemAttr('shieldKineticDamageResonance',
                                beacon.getModifiedItemAttr('shieldKineticDamageResistanceBonus'),
-                               stackingPenalties=True)
+                               stackingPenalties=True, **kwargs)
 
 
 class Effect4138(BaseEffect):
@@ -13245,10 +13317,10 @@ class Effect4138(BaseEffect):
     type = ('projected', 'passive')
 
     @staticmethod
-    def handler(fit, beacon, context):
+    def handler(fit, beacon, context, **kwargs):
         fit.ship.boostItemAttr('shieldThermalDamageResonance',
                                beacon.getModifiedItemAttr('shieldThermalDamageResistanceBonus'),
-                               stackingPenalties=True)
+                               stackingPenalties=True, **kwargs)
 
 
 class Effect4152(BaseEffect):
@@ -13262,10 +13334,10 @@ class Effect4152(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: True, 'heatDamage',
                                       module.getModifiedItemAttr('subsystemBonusAmarrCore'),
-                                      skill='Amarr Core Systems')
+                                      skill='Amarr Core Systems', **kwargs)
 
 
 class Effect4153(BaseEffect):
@@ -13279,10 +13351,10 @@ class Effect4153(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: True, 'heatDamage',
                                       module.getModifiedItemAttr('subsystemBonusCaldariCore'),
-                                      skill='Caldari Core Systems')
+                                      skill='Caldari Core Systems', **kwargs)
 
 
 class Effect4154(BaseEffect):
@@ -13296,10 +13368,10 @@ class Effect4154(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: True, 'heatDamage',
                                       module.getModifiedItemAttr('subsystemBonusGallenteCore'),
-                                      skill='Gallente Core Systems')
+                                      skill='Gallente Core Systems', **kwargs)
 
 
 class Effect4155(BaseEffect):
@@ -13313,10 +13385,10 @@ class Effect4155(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: True, 'heatDamage',
                                       module.getModifiedItemAttr('subsystemBonusMinmatarCore'),
-                                      skill='Minmatar Core Systems')
+                                      skill='Minmatar Core Systems', **kwargs)
 
 
 class Effect4158(BaseEffect):
@@ -13330,9 +13402,9 @@ class Effect4158(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.ship.boostItemAttr('capacitorCapacity', src.getModifiedItemAttr('subsystemBonusCaldariCore'),
-                               skill='Caldari Core Systems')
+                               skill='Caldari Core Systems', **kwargs)
 
 
 class Effect4159(BaseEffect):
@@ -13346,8 +13418,8 @@ class Effect4159(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
-        fit.ship.boostItemAttr('capacitorCapacity', src.getModifiedItemAttr('subsystemBonusAmarrCore'), skill='Amarr Core Systems')
+    def handler(fit, src, context, **kwargs):
+        fit.ship.boostItemAttr('capacitorCapacity', src.getModifiedItemAttr('subsystemBonusAmarrCore'), skill='Amarr Core Systems', **kwargs)
 
 
 class Effect4161(BaseEffect):
@@ -13363,11 +13435,11 @@ class Effect4161(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, container, context):
+    def handler(fit, container, context, **kwargs):
         level = container.level if 'skill' in context else 1
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Astrometrics'),
                                         'baseMaxScanDeviation',
-                                        container.getModifiedItemAttr('maxScanDeviationModifier') * level)
+                                        container.getModifiedItemAttr('maxScanDeviationModifier') * level, **kwargs)
 
 
 class Effect4162(BaseEffect):
@@ -13386,12 +13458,12 @@ class Effect4162(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, container, context):
+    def handler(fit, container, context, **kwargs):
         level = container.level if 'skill' in context else 1
         penalized = False if 'skill' in context or 'implant' in context else True
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Astrometrics'),
                                         'baseSensorStrength', container.getModifiedItemAttr('scanStrengthBonus') * level,
-                                        stackingPenalties=penalized)
+                                        stackingPenalties=penalized, **kwargs)
 
 
 class Effect4165(BaseEffect):
@@ -13405,10 +13477,10 @@ class Effect4165(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.group.name == 'Scanner Probe',
                                         'baseSensorStrength', ship.getModifiedItemAttr('shipBonusCF2'),
-                                        skill='Caldari Frigate')
+                                        skill='Caldari Frigate', **kwargs)
 
 
 class Effect4166(BaseEffect):
@@ -13422,10 +13494,10 @@ class Effect4166(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.group.name == 'Scanner Probe',
                                         'baseSensorStrength', ship.getModifiedItemAttr('shipBonusMF2'),
-                                        skill='Minmatar Frigate')
+                                        skill='Minmatar Frigate', **kwargs)
 
 
 class Effect4167(BaseEffect):
@@ -13439,10 +13511,10 @@ class Effect4167(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.group.name == 'Scanner Probe',
                                         'baseSensorStrength', ship.getModifiedItemAttr('shipBonusGF2'),
-                                        skill='Gallente Frigate')
+                                        skill='Gallente Frigate', **kwargs)
 
 
 class Effect4168(BaseEffect):
@@ -13456,10 +13528,10 @@ class Effect4168(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.group.name == 'Scanner Probe',
                                         'baseSensorStrength', ship.getModifiedItemAttr('eliteBonusCovertOps2'),
-                                        skill='Covert Ops')
+                                        skill='Covert Ops', **kwargs)
 
 
 class Effect4187(BaseEffect):
@@ -13473,10 +13545,10 @@ class Effect4187(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: True, 'heatDamage',
                                       ship.getModifiedItemAttr('shipBonusStrategicCruiserAmarr1'),
-                                      skill='Amarr Strategic Cruiser')
+                                      skill='Amarr Strategic Cruiser', **kwargs)
 
 
 class Effect4188(BaseEffect):
@@ -13490,10 +13562,10 @@ class Effect4188(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: True, 'heatDamage',
                                       ship.getModifiedItemAttr('shipBonusStrategicCruiserCaldari1'),
-                                      skill='Caldari Strategic Cruiser')
+                                      skill='Caldari Strategic Cruiser', **kwargs)
 
 
 class Effect4189(BaseEffect):
@@ -13507,10 +13579,10 @@ class Effect4189(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: True, 'heatDamage',
                                       ship.getModifiedItemAttr('shipBonusStrategicCruiserGallente1'),
-                                      skill='Gallente Strategic Cruiser')
+                                      skill='Gallente Strategic Cruiser', **kwargs)
 
 
 class Effect4190(BaseEffect):
@@ -13524,10 +13596,10 @@ class Effect4190(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: True, 'heatDamage',
                                       ship.getModifiedItemAttr('shipBonusStrategicCruiserMinmatar1'),
-                                      skill='Minmatar Strategic Cruiser')
+                                      skill='Minmatar Strategic Cruiser', **kwargs)
 
 
 class Effect4215(BaseEffect):
@@ -13541,10 +13613,10 @@ class Effect4215(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Energy Turret'),
                                       'capacitorNeed', module.getModifiedItemAttr('subsystemBonusAmarrOffensive2'),
-                                      skill='Amarr Offensive Systems')
+                                      skill='Amarr Offensive Systems', **kwargs)
 
 
 class Effect4216(BaseEffect):
@@ -13558,9 +13630,9 @@ class Effect4216(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Energy Nosferatu', 'powerTransferAmount',
-                                      src.getModifiedItemAttr('subsystemBonusAmarrCore2'), skill='Amarr Core Systems')
+                                      src.getModifiedItemAttr('subsystemBonusAmarrCore2'), skill='Amarr Core Systems', **kwargs)
 
 
 class Effect4217(BaseEffect):
@@ -13574,9 +13646,9 @@ class Effect4217(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Energy Neutralizer', 'energyNeutralizerAmount',
-                                      src.getModifiedItemAttr('subsystemBonusAmarrCore2'), skill='Amarr Core Systems')
+                                      src.getModifiedItemAttr('subsystemBonusAmarrCore2'), skill='Amarr Core Systems', **kwargs)
 
 
 class Effect4248(BaseEffect):
@@ -13590,16 +13662,16 @@ class Effect4248(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Light Missiles'),
                                         'kineticDamage', src.getModifiedItemAttr('subsystemBonusCaldariOffensive2'),
-                                        skill='Caldari Offensive Systems')
+                                        skill='Caldari Offensive Systems', **kwargs)
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Missiles'),
                                         'kineticDamage', src.getModifiedItemAttr('subsystemBonusCaldariOffensive2'),
-                                        skill='Caldari Offensive Systems')
+                                        skill='Caldari Offensive Systems', **kwargs)
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Assault Missiles'),
                                         'kineticDamage', src.getModifiedItemAttr('subsystemBonusCaldariOffensive2'),
-                                        skill='Caldari Offensive Systems')
+                                        skill='Caldari Offensive Systems', **kwargs)
 
 
 class Effect4250(BaseEffect):
@@ -13613,19 +13685,19 @@ class Effect4250(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Drones'),
                                      'armorHP', src.getModifiedItemAttr('subsystemBonusGallenteOffensive'),
-                                     skill='Gallente Offensive Systems')
+                                     skill='Gallente Offensive Systems', **kwargs)
         fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Drones'),
                                      'hp', src.getModifiedItemAttr('subsystemBonusGallenteOffensive'),
-                                     skill='Gallente Offensive Systems')
+                                     skill='Gallente Offensive Systems', **kwargs)
         fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Drones'),
                                      'damageMultiplier', src.getModifiedItemAttr('subsystemBonusGallenteOffensive'),
-                                     skill='Gallente Offensive Systems')
+                                     skill='Gallente Offensive Systems', **kwargs)
         fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Drones'),
                                      'shieldCapacity', src.getModifiedItemAttr('subsystemBonusGallenteOffensive'),
-                                     skill='Gallente Offensive Systems')
+                                     skill='Gallente Offensive Systems', **kwargs)
 
 
 class Effect4251(BaseEffect):
@@ -13639,10 +13711,10 @@ class Effect4251(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Projectile Turret'),
                                       'damageMultiplier', module.getModifiedItemAttr('subsystemBonusMinmatarOffensive2'),
-                                      skill='Minmatar Offensive Systems')
+                                      skill='Minmatar Offensive Systems', **kwargs)
 
 
 class Effect4256(BaseEffect):
@@ -13656,11 +13728,11 @@ class Effect4256(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         groups = ('Missile Launcher Heavy', 'Missile Launcher Rapid Light', 'Missile Launcher Heavy Assault')
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in groups,
                                       'speed', src.getModifiedItemAttr('subsystemBonusMinmatarOffensive2'),
-                                      skill='Minmatar Offensive Systems')
+                                      skill='Minmatar Offensive Systems', **kwargs)
 
 
 class Effect4264(BaseEffect):
@@ -13674,9 +13746,9 @@ class Effect4264(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.ship.boostItemAttr('rechargeRate', src.getModifiedItemAttr('subsystemBonusMinmatarCore'),
-                               skill='Minmatar Core Systems')
+                               skill='Minmatar Core Systems', **kwargs)
 
 
 class Effect4265(BaseEffect):
@@ -13690,9 +13762,9 @@ class Effect4265(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.ship.boostItemAttr('rechargeRate', src.getModifiedItemAttr('subsystemBonusGallenteCore'),
-                               skill='Gallente Core Systems')
+                               skill='Gallente Core Systems', **kwargs)
 
 
 class Effect4269(BaseEffect):
@@ -13706,9 +13778,9 @@ class Effect4269(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.ship.boostItemAttr('scanResolution', src.getModifiedItemAttr('subsystemBonusAmarrCore3'),
-                               skill='Amarr Core Systems')
+                               skill='Amarr Core Systems', **kwargs)
 
 
 class Effect4270(BaseEffect):
@@ -13722,9 +13794,9 @@ class Effect4270(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.ship.boostItemAttr('scanResolution', src.getModifiedItemAttr('subsystemBonusMinmatarCore3'),
-                               skill='Minmatar Core Systems')
+                               skill='Minmatar Core Systems', **kwargs)
 
 
 class Effect4271(BaseEffect):
@@ -13738,8 +13810,8 @@ class Effect4271(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
-        fit.ship.boostItemAttr('maxTargetRange', src.getModifiedItemAttr('subsystemBonusCaldariCore2'), skill='Caldari Core Systems')
+    def handler(fit, src, context, **kwargs):
+        fit.ship.boostItemAttr('maxTargetRange', src.getModifiedItemAttr('subsystemBonusCaldariCore2'), skill='Caldari Core Systems', **kwargs)
 
 
 class Effect4272(BaseEffect):
@@ -13753,9 +13825,9 @@ class Effect4272(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.ship.boostItemAttr('maxTargetRange', src.getModifiedItemAttr('subsystemBonusGallenteCore2'),
-                               skill='Gallente Core Systems')
+                               skill='Gallente Core Systems', **kwargs)
 
 
 class Effect4273(BaseEffect):
@@ -13769,9 +13841,9 @@ class Effect4273(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Warp Scrambler', 'maxRange',
-                                      src.getModifiedItemAttr('subsystemBonusGallenteCore2'), skill='Gallente Core Systems')
+                                      src.getModifiedItemAttr('subsystemBonusGallenteCore2'), skill='Gallente Core Systems', **kwargs)
 
 
 class Effect4274(BaseEffect):
@@ -13785,9 +13857,9 @@ class Effect4274(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Stasis Web',
-                                      'maxRange', src.getModifiedItemAttr('subsystemBonusMinmatarCore2'), skill='Minmatar Core Systems')
+                                      'maxRange', src.getModifiedItemAttr('subsystemBonusMinmatarCore2'), skill='Minmatar Core Systems', **kwargs)
 
 
 class Effect4275(BaseEffect):
@@ -13801,9 +13873,9 @@ class Effect4275(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.ship.boostItemAttr('warpSpeedMultiplier', src.getModifiedItemAttr('subsystemBonusCaldariPropulsion2'),
-                               skill='Caldari Propulsion Systems')
+                               skill='Caldari Propulsion Systems', **kwargs)
 
 
 class Effect4277(BaseEffect):
@@ -13817,9 +13889,9 @@ class Effect4277(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.ship.boostItemAttr('warpCapacitorNeed', src.getModifiedItemAttr('subsystemBonusGallentePropulsion'),
-                               skill='Gallente Propulsion Systems')
+                               skill='Gallente Propulsion Systems', **kwargs)
 
 
 class Effect4278(BaseEffect):
@@ -13833,9 +13905,9 @@ class Effect4278(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.ship.boostItemAttr('warpSpeedMultiplier', src.getModifiedItemAttr('subsystemBonusGallentePropulsion2'),
-                               skill='Gallente Propulsion Systems')
+                               skill='Gallente Propulsion Systems', **kwargs)
 
 
 class Effect4280(BaseEffect):
@@ -13850,8 +13922,8 @@ class Effect4280(BaseEffect):
     type = ('projected', 'passive')
 
     @staticmethod
-    def handler(fit, beacon, context):
-        fit.ship.multiplyItemAttr('agility', beacon.getModifiedItemAttr('agilityMultiplier'), stackingPenalties=True)
+    def handler(fit, beacon, context, **kwargs):
+        fit.ship.multiplyItemAttr('agility', beacon.getModifiedItemAttr('agilityMultiplier'), stackingPenalties=True, **kwargs)
 
 
 class Effect4282(BaseEffect):
@@ -13865,10 +13937,10 @@ class Effect4282(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Hybrid Turret'),
                                       'damageMultiplier', module.getModifiedItemAttr('subsystemBonusGallenteOffensive2'),
-                                      skill='Gallente Offensive Systems')
+                                      skill='Gallente Offensive Systems', **kwargs)
 
 
 class Effect4283(BaseEffect):
@@ -13882,10 +13954,10 @@ class Effect4283(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Hybrid Turret'),
                                       'damageMultiplier', module.getModifiedItemAttr('subsystemBonusCaldariOffensive2'),
-                                      skill='Caldari Offensive Systems')
+                                      skill='Caldari Offensive Systems', **kwargs)
 
 
 class Effect4286(BaseEffect):
@@ -13899,9 +13971,9 @@ class Effect4286(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Remote Armor Repair Systems'), 'capacitorNeed',
-                                      src.getModifiedItemAttr('subsystemBonusAmarrOffensive2'), skill='Amarr Offensive Systems')
+                                      src.getModifiedItemAttr('subsystemBonusAmarrOffensive2'), skill='Amarr Offensive Systems', **kwargs)
 
 
 class Effect4288(BaseEffect):
@@ -13915,9 +13987,9 @@ class Effect4288(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Remote Armor Repair Systems'), 'capacitorNeed',
-                                      src.getModifiedItemAttr('subsystemBonusGallenteOffensive2'), skill='Gallente Offensive Systems')
+                                      src.getModifiedItemAttr('subsystemBonusGallenteOffensive2'), skill='Gallente Offensive Systems', **kwargs)
 
 
 class Effect4290(BaseEffect):
@@ -13931,10 +14003,10 @@ class Effect4290(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Emission Systems') or mod.item.requiresSkill('Remote Armor Repair Systems'),
                                       'capacitorNeed', src.getModifiedItemAttr('subsystemBonusMinmatarOffensive2'),
-                                      skill='Minmatar Offensive Systems')
+                                      skill='Minmatar Offensive Systems', **kwargs)
 
 
 class Effect4292(BaseEffect):
@@ -13948,10 +14020,10 @@ class Effect4292(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Emission Systems'),
                                       'capacitorNeed', src.getModifiedItemAttr('subsystemBonusCaldariOffensive2'),
-                                      skill='Caldari Offensive Systems')
+                                      skill='Caldari Offensive Systems', **kwargs)
 
 
 class Effect4321(BaseEffect):
@@ -13965,17 +14037,17 @@ class Effect4321(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'ECM', 'scanLadarStrengthBonus',
-                                      src.getModifiedItemAttr('subsystemBonusCaldariCore2'), skill='Caldari Core Systems')
+                                      src.getModifiedItemAttr('subsystemBonusCaldariCore2'), skill='Caldari Core Systems', **kwargs)
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'ECM', 'scanRadarStrengthBonus',
-                                      src.getModifiedItemAttr('subsystemBonusCaldariCore2'), skill='Caldari Core Systems')
+                                      src.getModifiedItemAttr('subsystemBonusCaldariCore2'), skill='Caldari Core Systems', **kwargs)
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'ECM', 'maxRange',
-                                      src.getModifiedItemAttr('subsystemBonusCaldariCore2'), skill='Caldari Core Systems')
+                                      src.getModifiedItemAttr('subsystemBonusCaldariCore2'), skill='Caldari Core Systems', **kwargs)
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'ECM', 'scanGravimetricStrengthBonus',
-                                      src.getModifiedItemAttr('subsystemBonusCaldariCore2'), skill='Caldari Core Systems')
+                                      src.getModifiedItemAttr('subsystemBonusCaldariCore2'), skill='Caldari Core Systems', **kwargs)
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'ECM', 'scanMagnetometricStrengthBonus',
-                                      src.getModifiedItemAttr('subsystemBonusCaldariCore2'), skill='Caldari Core Systems')
+                                      src.getModifiedItemAttr('subsystemBonusCaldariCore2'), skill='Caldari Core Systems', **kwargs)
 
 
 class Effect4327(BaseEffect):
@@ -13989,15 +14061,15 @@ class Effect4327(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Drones'),
-                                     'hp', src.getModifiedItemAttr('subsystemBonusAmarrOffensive3'), skill='Amarr Offensive Systems')
+                                     'hp', src.getModifiedItemAttr('subsystemBonusAmarrOffensive3'), skill='Amarr Offensive Systems', **kwargs)
         fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Drones'),
-                                     'armorHP', src.getModifiedItemAttr('subsystemBonusAmarrOffensive3'), skill='Amarr Offensive Systems')
+                                     'armorHP', src.getModifiedItemAttr('subsystemBonusAmarrOffensive3'), skill='Amarr Offensive Systems', **kwargs)
         fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Drones'),
-                                     'shieldCapacity', src.getModifiedItemAttr('subsystemBonusAmarrOffensive3'), skill='Amarr Offensive Systems')
+                                     'shieldCapacity', src.getModifiedItemAttr('subsystemBonusAmarrOffensive3'), skill='Amarr Offensive Systems', **kwargs)
         fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Drones'),
-                                     'damageMultiplier', src.getModifiedItemAttr('subsystemBonusAmarrOffensive3'), skill='Amarr Offensive Systems')
+                                     'damageMultiplier', src.getModifiedItemAttr('subsystemBonusAmarrOffensive3'), skill='Amarr Offensive Systems', **kwargs)
 
 
 class Effect4330(BaseEffect):
@@ -14011,10 +14083,10 @@ class Effect4330(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Energy Turret'),
                                       'maxRange', module.getModifiedItemAttr('subsystemBonusAmarrOffensive3'),
-                                      skill='Amarr Offensive Systems')
+                                      skill='Amarr Offensive Systems', **kwargs)
 
 
 class Effect4331(BaseEffect):
@@ -14028,10 +14100,10 @@ class Effect4331(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Missiles') or mod.charge.requiresSkill('Heavy Assault Missiles'),
                                         'maxVelocity', src.getModifiedItemAttr('subsystemBonusCaldariOffensive3'),
-                                        skill='Caldari Offensive Systems')
+                                        skill='Caldari Offensive Systems', **kwargs)
 
 
 class Effect4342(BaseEffect):
@@ -14045,9 +14117,9 @@ class Effect4342(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.ship.boostItemAttr('maxTargetRange', src.getModifiedItemAttr('subsystemBonusMinmatarCore2'),
-                               skill='Minmatar Core Systems')
+                               skill='Minmatar Core Systems', **kwargs)
 
 
 class Effect4343(BaseEffect):
@@ -14061,9 +14133,9 @@ class Effect4343(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.ship.boostItemAttr('maxTargetRange', src.getModifiedItemAttr('subsystemBonusAmarrCore2'),
-                               skill='Amarr Core Systems')
+                               skill='Amarr Core Systems', **kwargs)
 
 
 class Effect4347(BaseEffect):
@@ -14078,10 +14150,10 @@ class Effect4347(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Hybrid Turret'),
                                       'trackingSpeed', module.getModifiedItemAttr('subsystemBonusGallenteOffensive3'),
-                                      skill='Gallente Offensive Systems')
+                                      skill='Gallente Offensive Systems', **kwargs)
 
 
 class Effect4351(BaseEffect):
@@ -14095,10 +14167,10 @@ class Effect4351(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Projectile Turret'),
                                       'trackingSpeed', module.getModifiedItemAttr('subsystemBonusMinmatarOffensive3'),
-                                      skill='Minmatar Offensive Systems')
+                                      skill='Minmatar Offensive Systems', **kwargs)
 
 
 class Effect4358(BaseEffect):
@@ -14112,10 +14184,10 @@ class Effect4358(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'ECM',
                                       'maxRange', module.getModifiedItemAttr('ecmRangeBonus'),
-                                      stackingPenalties=True)
+                                      stackingPenalties=True, **kwargs)
 
 
 class Effect4360(BaseEffect):
@@ -14129,10 +14201,10 @@ class Effect4360(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         groups = ('Missile Launcher Heavy', 'Missile Launcher Rapid Light', 'Missile Launcher Heavy Assault')
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in groups,
-                                      'speed', src.getModifiedItemAttr('subsystemBonusAmarrOffensive'), skill='Amarr Offensive Systems')
+                                      'speed', src.getModifiedItemAttr('subsystemBonusAmarrOffensive'), skill='Amarr Offensive Systems', **kwargs)
 
 
 class Effect4362(BaseEffect):
@@ -14146,15 +14218,15 @@ class Effect4362(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill('Missile Launcher Operation'),
-                                        'explosiveDamage', src.getModifiedItemAttr('subsystemBonusAmarrOffensive2'), skill='Amarr Offensive Systems')
+                                        'explosiveDamage', src.getModifiedItemAttr('subsystemBonusAmarrOffensive2'), skill='Amarr Offensive Systems', **kwargs)
         fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill('Missile Launcher Operation'),
-                                        'kineticDamage', src.getModifiedItemAttr('subsystemBonusAmarrOffensive2'), skill='Amarr Offensive Systems')
+                                        'kineticDamage', src.getModifiedItemAttr('subsystemBonusAmarrOffensive2'), skill='Amarr Offensive Systems', **kwargs)
         fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill('Missile Launcher Operation'),
-                                        'emDamage', src.getModifiedItemAttr('subsystemBonusAmarrOffensive2'), skill='Amarr Offensive Systems')
+                                        'emDamage', src.getModifiedItemAttr('subsystemBonusAmarrOffensive2'), skill='Amarr Offensive Systems', **kwargs)
         fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill('Missile Launcher Operation'),
-                                        'thermalDamage', src.getModifiedItemAttr('subsystemBonusAmarrOffensive2'), skill='Amarr Offensive Systems')
+                                        'thermalDamage', src.getModifiedItemAttr('subsystemBonusAmarrOffensive2'), skill='Amarr Offensive Systems', **kwargs)
 
 
 class Effect4366(BaseEffect):
@@ -14168,9 +14240,9 @@ class Effect4366(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Hybrid Turret'),
-                                      'damageMultiplier', ship.getModifiedItemAttr('shipBonusCC2'), skill='Caldari Cruiser')
+                                      'damageMultiplier', ship.getModifiedItemAttr('shipBonusCC2'), skill='Caldari Cruiser', **kwargs)
 
 
 class Effect4369(BaseEffect):
@@ -14184,8 +14256,8 @@ class Effect4369(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
-        fit.ship.forceItemAttr('warpBubbleImmune', module.getModifiedItemAttr('warpBubbleImmuneModifier'))
+    def handler(fit, module, context, **kwargs):
+        fit.ship.forceItemAttr('warpBubbleImmune', module.getModifiedItemAttr('warpBubbleImmuneModifier'), **kwargs)
 
 
 class Effect4370(BaseEffect):
@@ -14199,10 +14271,10 @@ class Effect4370(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'ECM',
                                       'falloffEffectiveness', ship.getModifiedItemAttr('shipBonusCC2'),
-                                      skill='Caldari Cruiser')
+                                      skill='Caldari Cruiser', **kwargs)
 
 
 class Effect4372(BaseEffect):
@@ -14216,10 +14288,10 @@ class Effect4372(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'ECM',
                                       'falloffEffectiveness', ship.getModifiedItemAttr('shipBonusCB3'),
-                                      skill='Caldari Battleship')
+                                      skill='Caldari Battleship', **kwargs)
 
 
 class Effect4373(BaseEffect):
@@ -14233,39 +14305,13 @@ class Effect4373(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Skirmish Command'),
-                                      'buffDuration', src.getModifiedItemAttr('subsystemBonusAmarrOffensive'), skill='Amarr Offensive Systems')
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Skirmish Command'),
-                                      'warfareBuff2Value', src.getModifiedItemAttr('subsystemBonusAmarrOffensive'), skill='Amarr Offensive Systems')
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Skirmish Command'),
-                                      'warfareBuff3Value', src.getModifiedItemAttr('subsystemBonusAmarrOffensive'), skill='Amarr Offensive Systems')
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Skirmish Command'),
-                                      'warfareBuff1Value', src.getModifiedItemAttr('subsystemBonusAmarrOffensive'), skill='Amarr Offensive Systems')
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Skirmish Command'),
-                                      'warfareBuff4Value', src.getModifiedItemAttr('subsystemBonusAmarrOffensive'), skill='Amarr Offensive Systems')
-
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Armored Command'),
-                                      'warfareBuff3Value', src.getModifiedItemAttr('subsystemBonusAmarrOffensive'), skill='Amarr Offensive Systems')
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Armored Command'),
-                                      'warfareBuff1Value', src.getModifiedItemAttr('subsystemBonusAmarrOffensive'), skill='Amarr Offensive Systems')
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Armored Command'),
-                                      'warfareBuff4Value', src.getModifiedItemAttr('subsystemBonusAmarrOffensive'), skill='Amarr Offensive Systems')
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Armored Command'),
-                                      'warfareBuff2Value', src.getModifiedItemAttr('subsystemBonusAmarrOffensive'), skill='Amarr Offensive Systems')
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Armored Command'),
-                                      'buffDuration', src.getModifiedItemAttr('subsystemBonusAmarrOffensive'), skill='Amarr Offensive Systems')
-
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Information Command'),
-                                      'warfareBuff3Value', src.getModifiedItemAttr('subsystemBonusAmarrOffensive'), skill='Amarr Offensive Systems')
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Information Command'),
-                                      'warfareBuff1Value', src.getModifiedItemAttr('subsystemBonusAmarrOffensive'), skill='Amarr Offensive Systems')
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Information Command'),
-                                      'warfareBuff2Value', src.getModifiedItemAttr('subsystemBonusAmarrOffensive'), skill='Amarr Offensive Systems')
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Information Command'),
-                                      'buffDuration', src.getModifiedItemAttr('subsystemBonusAmarrOffensive'), skill='Amarr Offensive Systems')
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Information Command'),
-                                      'warfareBuff4Value', src.getModifiedItemAttr('subsystemBonusAmarrOffensive'), skill='Amarr Offensive Systems')
+    def handler(fit, src, context, **kwargs):
+        for attrName in ('buffDuration', 'warfareBuff1Value', 'warfareBuff2Value', 'warfareBuff3Value', 'warfareBuff4Value'):
+            fit.modules.filteredItemBoost(lambda mod: (mod.item.requiresSkill('Skirmish Command') or
+                                                       mod.item.requiresSkill('Armored Command') or
+                                                       mod.item.requiresSkill('Information Command')),
+                                          attrName, src.getModifiedItemAttr('subsystemBonusAmarrOffensive'),
+                                          skill='Amarr Offensive Systems', **kwargs)
 
 
 class Effect4377(BaseEffect):
@@ -14280,9 +14326,9 @@ class Effect4377(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Torpedoes'),
-                                        'maxVelocity', ship.getModifiedItemAttr('shipBonusGF2'), skill='Gallente Frigate')
+                                        'maxVelocity', ship.getModifiedItemAttr('shipBonusGF2'), skill='Gallente Frigate', **kwargs)
 
 
 class Effect4378(BaseEffect):
@@ -14296,9 +14342,9 @@ class Effect4378(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Torpedoes'),
-                                        'maxVelocity', ship.getModifiedItemAttr('shipBonusMF2'), skill='Minmatar Frigate')
+                                        'maxVelocity', ship.getModifiedItemAttr('shipBonusMF2'), skill='Minmatar Frigate', **kwargs)
 
 
 class Effect4379(BaseEffect):
@@ -14312,9 +14358,9 @@ class Effect4379(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Torpedoes'),
-                                        'maxVelocity', ship.getModifiedItemAttr('shipBonus2AF'), skill='Amarr Frigate')
+                                        'maxVelocity', ship.getModifiedItemAttr('shipBonus2AF'), skill='Amarr Frigate', **kwargs)
 
 
 class Effect4380(BaseEffect):
@@ -14328,9 +14374,9 @@ class Effect4380(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Torpedoes'),
-                                        'maxVelocity', ship.getModifiedItemAttr('shipBonusCF2'), skill='Caldari Frigate')
+                                        'maxVelocity', ship.getModifiedItemAttr('shipBonusCF2'), skill='Caldari Frigate', **kwargs)
 
 
 class Effect4384(BaseEffect):
@@ -14344,10 +14390,10 @@ class Effect4384(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Missiles'),
                                         'maxVelocity', ship.getModifiedItemAttr('eliteBonusReconShip1'),
-                                        skill='Recon Ships')
+                                        skill='Recon Ships', **kwargs)
 
 
 class Effect4385(BaseEffect):
@@ -14361,10 +14407,10 @@ class Effect4385(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Assault Missiles'),
                                         'maxVelocity', ship.getModifiedItemAttr('eliteBonusReconShip1'),
-                                        skill='Recon Ships')
+                                        skill='Recon Ships', **kwargs)
 
 
 class Effect4393(BaseEffect):
@@ -14379,10 +14425,10 @@ class Effect4393(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Torpedoes'),
                                         'thermalDamage', ship.getModifiedItemAttr('eliteBonusCovertOps2'),
-                                        skill='Covert Ops')
+                                        skill='Covert Ops', **kwargs)
 
 
 class Effect4394(BaseEffect):
@@ -14396,9 +14442,9 @@ class Effect4394(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Torpedoes'),
-                                        'emDamage', ship.getModifiedItemAttr('eliteBonusCovertOps2'), skill='Covert Ops')
+                                        'emDamage', ship.getModifiedItemAttr('eliteBonusCovertOps2'), skill='Covert Ops', **kwargs)
 
 
 class Effect4395(BaseEffect):
@@ -14413,10 +14459,10 @@ class Effect4395(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Torpedoes'),
                                         'explosiveDamage', ship.getModifiedItemAttr('eliteBonusCovertOps2'),
-                                        skill='Covert Ops')
+                                        skill='Covert Ops', **kwargs)
 
 
 class Effect4396(BaseEffect):
@@ -14430,10 +14476,10 @@ class Effect4396(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Torpedoes'),
                                         'kineticDamage', ship.getModifiedItemAttr('eliteBonusCovertOps2'),
-                                        skill='Covert Ops')
+                                        skill='Covert Ops', **kwargs)
 
 
 class Effect4397(BaseEffect):
@@ -14447,9 +14493,9 @@ class Effect4397(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Torpedoes'),
-                                        'aoeVelocity', ship.getModifiedItemAttr('shipBonusGF'), skill='Gallente Frigate')
+                                        'aoeVelocity', ship.getModifiedItemAttr('shipBonusGF'), skill='Gallente Frigate', **kwargs)
 
 
 class Effect4398(BaseEffect):
@@ -14464,9 +14510,9 @@ class Effect4398(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Torpedoes'),
-                                        'aoeVelocity', ship.getModifiedItemAttr('shipBonusMF'), skill='Minmatar Frigate')
+                                        'aoeVelocity', ship.getModifiedItemAttr('shipBonusMF'), skill='Minmatar Frigate', **kwargs)
 
 
 class Effect4399(BaseEffect):
@@ -14480,9 +14526,9 @@ class Effect4399(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Torpedoes'),
-                                        'aoeVelocity', ship.getModifiedItemAttr('shipBonusCF'), skill='Caldari Frigate')
+                                        'aoeVelocity', ship.getModifiedItemAttr('shipBonusCF'), skill='Caldari Frigate', **kwargs)
 
 
 class Effect4400(BaseEffect):
@@ -14496,9 +14542,9 @@ class Effect4400(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Torpedoes'),
-                                        'aoeVelocity', ship.getModifiedItemAttr('shipBonusAF'), skill='Amarr Frigate')
+                                        'aoeVelocity', ship.getModifiedItemAttr('shipBonusAF'), skill='Amarr Frigate', **kwargs)
 
 
 class Effect4413(BaseEffect):
@@ -14512,9 +14558,9 @@ class Effect4413(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Torpedoes'),
-                                        'explosionDelay', ship.getModifiedItemAttr('shipBonusGF'), skill='Gallente Frigate')
+                                        'explosionDelay', ship.getModifiedItemAttr('shipBonusGF'), skill='Gallente Frigate', **kwargs)
 
 
 class Effect4415(BaseEffect):
@@ -14529,9 +14575,9 @@ class Effect4415(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Torpedoes'),
-                                        'explosionDelay', ship.getModifiedItemAttr('shipBonusMF'), skill='Minmatar Frigate')
+                                        'explosionDelay', ship.getModifiedItemAttr('shipBonusMF'), skill='Minmatar Frigate', **kwargs)
 
 
 class Effect4416(BaseEffect):
@@ -14545,9 +14591,9 @@ class Effect4416(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Torpedoes'),
-                                        'explosionDelay', ship.getModifiedItemAttr('shipBonusCF'), skill='Caldari Frigate')
+                                        'explosionDelay', ship.getModifiedItemAttr('shipBonusCF'), skill='Caldari Frigate', **kwargs)
 
 
 class Effect4417(BaseEffect):
@@ -14561,9 +14607,9 @@ class Effect4417(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Torpedoes'),
-                                        'explosionDelay', ship.getModifiedItemAttr('shipBonusAF'), skill='Amarr Frigate')
+                                        'explosionDelay', ship.getModifiedItemAttr('shipBonusAF'), skill='Amarr Frigate', **kwargs)
 
 
 class Effect4451(BaseEffect):
@@ -14577,8 +14623,8 @@ class Effect4451(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, implant, context):
-        fit.ship.increaseItemAttr('scanRadarStrength', implant.getModifiedItemAttr('scanRadarStrengthModifier'))
+    def handler(fit, implant, context, **kwargs):
+        fit.ship.increaseItemAttr('scanRadarStrength', implant.getModifiedItemAttr('scanRadarStrengthModifier'), **kwargs)
 
 
 class Effect4452(BaseEffect):
@@ -14592,8 +14638,8 @@ class Effect4452(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, implant, context):
-        fit.ship.increaseItemAttr('scanLadarStrength', implant.getModifiedItemAttr('scanLadarStrengthModifier'))
+    def handler(fit, implant, context, **kwargs):
+        fit.ship.increaseItemAttr('scanLadarStrength', implant.getModifiedItemAttr('scanLadarStrengthModifier'), **kwargs)
 
 
 class Effect4453(BaseEffect):
@@ -14607,8 +14653,8 @@ class Effect4453(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, implant, context):
-        fit.ship.increaseItemAttr('scanGravimetricStrength', implant.getModifiedItemAttr('scanGravimetricStrengthModifier'))
+    def handler(fit, implant, context, **kwargs):
+        fit.ship.increaseItemAttr('scanGravimetricStrength', implant.getModifiedItemAttr('scanGravimetricStrengthModifier'), **kwargs)
 
 
 class Effect4454(BaseEffect):
@@ -14622,9 +14668,9 @@ class Effect4454(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, implant, context):
+    def handler(fit, implant, context, **kwargs):
         fit.ship.increaseItemAttr('scanMagnetometricStrength',
-                                  implant.getModifiedItemAttr('scanMagnetometricStrengthModifier'))
+                                  implant.getModifiedItemAttr('scanMagnetometricStrengthModifier'), **kwargs)
 
 
 class Effect4456(BaseEffect):
@@ -14639,10 +14685,10 @@ class Effect4456(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, implant, context):
+    def handler(fit, implant, context, **kwargs):
         fit.appliedImplants.filteredItemMultiply(lambda target: target.item.requiresSkill('Cybernetics'),
                                                  'scanMagnetometricStrengthPercent',
-                                                 implant.getModifiedItemAttr('implantSetFederationNavy'))
+                                                 implant.getModifiedItemAttr('implantSetFederationNavy'), **kwargs)
 
 
 class Effect4457(BaseEffect):
@@ -14657,10 +14703,10 @@ class Effect4457(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, implant, context):
+    def handler(fit, implant, context, **kwargs):
         fit.appliedImplants.filteredItemMultiply(lambda target: target.item.requiresSkill('Cybernetics'),
                                                  'scanRadarStrengthPercent',
-                                                 implant.getModifiedItemAttr('implantSetImperialNavy'))
+                                                 implant.getModifiedItemAttr('implantSetImperialNavy'), **kwargs)
 
 
 class Effect4458(BaseEffect):
@@ -14675,10 +14721,10 @@ class Effect4458(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, implant, context):
+    def handler(fit, implant, context, **kwargs):
         fit.appliedImplants.filteredItemMultiply(lambda target: target.item.requiresSkill('Cybernetics'),
                                                  'scanLadarStrengthPercent',
-                                                 implant.getModifiedItemAttr('implantSetRepublicFleet'))
+                                                 implant.getModifiedItemAttr('implantSetRepublicFleet'), **kwargs)
 
 
 class Effect4459(BaseEffect):
@@ -14693,10 +14739,10 @@ class Effect4459(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, implant, context):
+    def handler(fit, implant, context, **kwargs):
         fit.appliedImplants.filteredItemMultiply(lambda target: target.item.requiresSkill('Cybernetics'),
                                                  'scanGravimetricStrengthPercent',
-                                                 implant.getModifiedItemAttr('implantSetCaldariNavy'))
+                                                 implant.getModifiedItemAttr('implantSetCaldariNavy'), **kwargs)
 
 
 class Effect4460(BaseEffect):
@@ -14711,10 +14757,10 @@ class Effect4460(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, implant, context):
+    def handler(fit, implant, context, **kwargs):
         fit.appliedImplants.filteredItemMultiply(lambda target: target.item.requiresSkill('Cybernetics'),
                                                  'scanRadarStrengthModifier',
-                                                 implant.getModifiedItemAttr('implantSetLGImperialNavy'))
+                                                 implant.getModifiedItemAttr('implantSetLGImperialNavy'), **kwargs)
 
 
 class Effect4461(BaseEffect):
@@ -14729,10 +14775,10 @@ class Effect4461(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, implant, context):
+    def handler(fit, implant, context, **kwargs):
         fit.appliedImplants.filteredItemMultiply(lambda target: target.item.requiresSkill('Cybernetics'),
                                                  'scanMagnetometricStrengthModifier',
-                                                 implant.getModifiedItemAttr('implantSetLGFederationNavy'))
+                                                 implant.getModifiedItemAttr('implantSetLGFederationNavy'), **kwargs)
 
 
 class Effect4462(BaseEffect):
@@ -14747,10 +14793,10 @@ class Effect4462(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, implant, context):
+    def handler(fit, implant, context, **kwargs):
         fit.appliedImplants.filteredItemMultiply(lambda target: target.item.requiresSkill('Cybernetics'),
                                                  'scanGravimetricStrengthModifier',
-                                                 implant.getModifiedItemAttr('implantSetLGCaldariNavy'))
+                                                 implant.getModifiedItemAttr('implantSetLGCaldariNavy'), **kwargs)
 
 
 class Effect4463(BaseEffect):
@@ -14765,10 +14811,10 @@ class Effect4463(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, implant, context):
+    def handler(fit, implant, context, **kwargs):
         fit.appliedImplants.filteredItemMultiply(lambda target: target.item.requiresSkill('Cybernetics'),
                                                  'scanLadarStrengthModifier',
-                                                 implant.getModifiedItemAttr('implantSetLGRepublicFleet'))
+                                                 implant.getModifiedItemAttr('implantSetLGRepublicFleet'), **kwargs)
 
 
 class Effect4464(BaseEffect):
@@ -14782,9 +14828,9 @@ class Effect4464(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Projectile Turret'), 'speed',
-                                      src.getModifiedItemAttr('shipBonusMF'), stackingPenalties=True, skill='Minmatar Frigate')
+                                      src.getModifiedItemAttr('shipBonusMF'), stackingPenalties=True, skill='Minmatar Frigate', **kwargs)
 
 
 class Effect4471(BaseEffect):
@@ -14800,9 +14846,9 @@ class Effect4471(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Stasis Web',
-                                      'maxRange', ship.getModifiedItemAttr('shipBonusMF2'), skill='Minmatar Frigate')
+                                      'maxRange', ship.getModifiedItemAttr('shipBonusMF2'), skill='Minmatar Frigate', **kwargs)
 
 
 class Effect4472(BaseEffect):
@@ -14816,9 +14862,9 @@ class Effect4472(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Projectile Turret'),
-                                      'damageMultiplier', ship.getModifiedItemAttr('shipBonusMC'), skill='Minmatar Cruiser')
+                                      'damageMultiplier', ship.getModifiedItemAttr('shipBonusMC'), skill='Minmatar Cruiser', **kwargs)
 
 
 class Effect4473(BaseEffect):
@@ -14833,8 +14879,8 @@ class Effect4473(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
-        fit.ship.boostItemAttr('maxVelocity', ship.getModifiedItemAttr('shipBonusATC1'))
+    def handler(fit, ship, context, **kwargs):
+        fit.ship.boostItemAttr('maxVelocity', ship.getModifiedItemAttr('shipBonusATC1'), **kwargs)
 
 
 class Effect4474(BaseEffect):
@@ -14848,9 +14894,9 @@ class Effect4474(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Projectile Turret'),
-                                      'maxRange', ship.getModifiedItemAttr('shipBonusATC2'))
+                                      'maxRange', ship.getModifiedItemAttr('shipBonusATC2'), **kwargs)
 
 
 class Effect4475(BaseEffect):
@@ -14864,9 +14910,9 @@ class Effect4475(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Projectile Turret'),
-                                      'falloff', ship.getModifiedItemAttr('shipBonusATC2'))
+                                      'falloff', ship.getModifiedItemAttr('shipBonusATC2'), **kwargs)
 
 
 class Effect4476(BaseEffect):
@@ -14880,9 +14926,9 @@ class Effect4476(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Projectile Turret'),
-                                      'falloff', ship.getModifiedItemAttr('shipBonusATF2'))
+                                      'falloff', ship.getModifiedItemAttr('shipBonusATF2'), **kwargs)
 
 
 class Effect4477(BaseEffect):
@@ -14896,9 +14942,9 @@ class Effect4477(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Projectile Turret'),
-                                      'maxRange', ship.getModifiedItemAttr('shipBonusATF2'))
+                                      'maxRange', ship.getModifiedItemAttr('shipBonusATF2'), **kwargs)
 
 
 class Effect4478(BaseEffect):
@@ -14912,9 +14958,9 @@ class Effect4478(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Propulsion Module',
-                                      'capacitorNeed', ship.getModifiedItemAttr('shipBonusATF1'))
+                                      'capacitorNeed', ship.getModifiedItemAttr('shipBonusATF1'), **kwargs)
 
 
 class Effect4479(BaseEffect):
@@ -14928,10 +14974,10 @@ class Effect4479(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.group.name == 'Survey Probe',
                                         'explosionDelay', ship.getModifiedItemAttr('eliteBonusCovertOps3'),
-                                        skill='Covert Ops')
+                                        skill='Covert Ops', **kwargs)
 
 
 class Effect4482(BaseEffect):
@@ -14946,9 +14992,9 @@ class Effect4482(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Energy Turret'),
-                                      'maxRange', ship.getModifiedItemAttr('shipBonus2AF'), skill='Amarr Frigate')
+                                      'maxRange', ship.getModifiedItemAttr('shipBonus2AF'), skill='Amarr Frigate', **kwargs)
 
 
 class Effect4484(BaseEffect):
@@ -14962,9 +15008,9 @@ class Effect4484(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Large Projectile Turret'),
-                                      'falloff', ship.getModifiedItemAttr('shipBonusGB'), skill='Gallente Battleship')
+                                      'falloff', ship.getModifiedItemAttr('shipBonusGB'), skill='Gallente Battleship', **kwargs)
 
 
 class Effect4485(BaseEffect):
@@ -14978,9 +15024,9 @@ class Effect4485(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Stasis Web',
-                                      'speedFactor', ship.getModifiedItemAttr('shipBonusMB'), skill='Minmatar Battleship')
+                                      'speedFactor', ship.getModifiedItemAttr('shipBonusMB'), skill='Minmatar Battleship', **kwargs)
 
 
 class Effect4489(BaseEffect):
@@ -15039,9 +15085,9 @@ class Effect4510(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Stasis Web',
-                                      'speedFactor', ship.getModifiedItemAttr('shipBonusMC2'), skill='Minmatar Cruiser')
+                                      'speedFactor', ship.getModifiedItemAttr('shipBonusMC2'), skill='Minmatar Cruiser', **kwargs)
 
 
 class Effect4512(BaseEffect):
@@ -15056,9 +15102,9 @@ class Effect4512(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Projectile Turret'),
-                                      'falloff', ship.getModifiedItemAttr('shipBonusGC'), skill='Gallente Cruiser')
+                                      'falloff', ship.getModifiedItemAttr('shipBonusGC'), skill='Gallente Cruiser', **kwargs)
 
 
 class Effect4513(BaseEffect):
@@ -15073,9 +15119,9 @@ class Effect4513(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Stasis Web',
-                                      'speedFactor', ship.getModifiedItemAttr('shipBonusMF2'), skill='Minmatar Frigate')
+                                      'speedFactor', ship.getModifiedItemAttr('shipBonusMF2'), skill='Minmatar Frigate', **kwargs)
 
 
 class Effect4515(BaseEffect):
@@ -15090,9 +15136,9 @@ class Effect4515(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Projectile Turret'),
-                                      'falloff', ship.getModifiedItemAttr('shipBonusMF'), skill='Minmatar Frigate')
+                                      'falloff', ship.getModifiedItemAttr('shipBonusMF'), skill='Minmatar Frigate', **kwargs)
 
 
 class Effect4516(BaseEffect):
@@ -15107,9 +15153,9 @@ class Effect4516(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Hybrid Turret'),
-                                      'falloff', ship.getModifiedItemAttr('shipBonusGC'), skill='Gallente Cruiser')
+                                      'falloff', ship.getModifiedItemAttr('shipBonusGC'), skill='Gallente Cruiser', **kwargs)
 
 
 class Effect4527(BaseEffect):
@@ -15123,10 +15169,10 @@ class Effect4527(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Gunnery'),
                                       'falloff', module.getModifiedItemAttr('falloffBonus'),
-                                      stackingPenalties=True)
+                                      stackingPenalties=True, **kwargs)
 
 
 class Effect4555(BaseEffect):
@@ -15140,9 +15186,9 @@ class Effect4555(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, skill, context):
+    def handler(fit, skill, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('XL Cruise Missiles'),
-                                        'emDamage', skill.getModifiedItemAttr('damageMultiplierBonus') * skill.level)
+                                        'emDamage', skill.getModifiedItemAttr('damageMultiplierBonus') * skill.level, **kwargs)
 
 
 class Effect4556(BaseEffect):
@@ -15156,9 +15202,9 @@ class Effect4556(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, skill, context):
+    def handler(fit, skill, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('XL Cruise Missiles'),
-                                        'explosiveDamage', skill.getModifiedItemAttr('damageMultiplierBonus') * skill.level)
+                                        'explosiveDamage', skill.getModifiedItemAttr('damageMultiplierBonus') * skill.level, **kwargs)
 
 
 class Effect4557(BaseEffect):
@@ -15172,9 +15218,9 @@ class Effect4557(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, skill, context):
+    def handler(fit, skill, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('XL Cruise Missiles'),
-                                        'kineticDamage', skill.getModifiedItemAttr('damageMultiplierBonus') * skill.level)
+                                        'kineticDamage', skill.getModifiedItemAttr('damageMultiplierBonus') * skill.level, **kwargs)
 
 
 class Effect4558(BaseEffect):
@@ -15188,9 +15234,9 @@ class Effect4558(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, skill, context):
+    def handler(fit, skill, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('XL Cruise Missiles'),
-                                        'thermalDamage', skill.getModifiedItemAttr('damageMultiplierBonus') * skill.level)
+                                        'thermalDamage', skill.getModifiedItemAttr('damageMultiplierBonus') * skill.level, **kwargs)
 
 
 class Effect4559(BaseEffect):
@@ -15204,11 +15250,11 @@ class Effect4559(BaseEffect):
     type = 'active'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         for attr in ('maxRange', 'falloff', 'trackingSpeed'):
             fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Gunnery'),
                                           attr, module.getModifiedItemAttr('%sBonus' % attr),
-                                          stackingPenalties=True)
+                                          stackingPenalties=True, **kwargs)
 
 
 class Effect4575(BaseEffect):
@@ -15223,72 +15269,72 @@ class Effect4575(BaseEffect):
     type = 'active'
 
     @staticmethod
-    def handler(fit, src, context):
-        fit.ship.boostItemAttr('maxVelocity', src.getModifiedItemAttr('speedFactor'), stackingPenalties=True)
-        fit.ship.multiplyItemAttr('mass', src.getModifiedItemAttr('siegeMassMultiplier'))
+    def handler(fit, src, context, **kwargs):
+        fit.ship.boostItemAttr('maxVelocity', src.getModifiedItemAttr('speedFactor'), stackingPenalties=True, **kwargs)
+        fit.ship.multiplyItemAttr('mass', src.getModifiedItemAttr('siegeMassMultiplier'), **kwargs)
         fit.ship.multiplyItemAttr('scanResolution',
                                   src.getModifiedItemAttr('scanResolutionMultiplier'),
-                                  stackingPenalties=True)
+                                  stackingPenalties=True, **kwargs)
 
         #  Remote Shield Repper Bonuses
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Capital Shield Emission Systems'),
-                                      'duration', src.getModifiedItemAttr('industrialCoreRemoteLogisticsDurationBonus'))
+                                      'duration', src.getModifiedItemAttr('industrialCoreRemoteLogisticsDurationBonus'), **kwargs)
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Capital Shield Emission Systems'),
                                       'maxRange', src.getModifiedItemAttr('industrialCoreRemoteLogisticsRangeBonus'),
-                                      stackingPenalties=True)
+                                      stackingPenalties=True, **kwargs)
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Capital Shield Emission Systems'),
-                                      'capacitorNeed', src.getModifiedItemAttr('industrialCoreRemoteLogisticsDurationBonus'))
+                                      'capacitorNeed', src.getModifiedItemAttr('industrialCoreRemoteLogisticsDurationBonus'), **kwargs)
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Capital Shield Emission Systems'),
                                       'falloffEffectiveness', src.getModifiedItemAttr('industrialCoreRemoteLogisticsRangeBonus'),
-                                      stackingPenalties=True)
+                                      stackingPenalties=True, **kwargs)
 
         #  Local Shield Repper Bonuses
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Capital Shield Operation'),
-                                      'duration', src.getModifiedItemAttr('industrialCoreLocalLogisticsDurationBonus'))
+                                      'duration', src.getModifiedItemAttr('industrialCoreLocalLogisticsDurationBonus'), **kwargs)
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Capital Shield Operation'),
                                       'shieldBonus', src.getModifiedItemAttr('industrialCoreLocalLogisticsAmountBonus'),
-                                      stackingPenalties=True)
+                                      stackingPenalties=True, **kwargs)
 
         # Mining Burst Bonuses
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Mining Foreman'),
-                                      'warfareBuff1Value', src.getModifiedItemAttr('industrialCoreBonusMiningBurstStrength'))
+                                      'warfareBuff1Value', src.getModifiedItemAttr('industrialCoreBonusMiningBurstStrength'), **kwargs)
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Mining Foreman'),
-                                      'warfareBuff2Value', src.getModifiedItemAttr('industrialCoreBonusMiningBurstStrength'))
+                                      'warfareBuff2Value', src.getModifiedItemAttr('industrialCoreBonusMiningBurstStrength'), **kwargs)
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Mining Foreman'),
-                                      'warfareBuff3Value', src.getModifiedItemAttr('industrialCoreBonusMiningBurstStrength'))
+                                      'warfareBuff3Value', src.getModifiedItemAttr('industrialCoreBonusMiningBurstStrength'), **kwargs)
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Mining Foreman'),
-                                      'warfareBuff4Value', src.getModifiedItemAttr('industrialCoreBonusMiningBurstStrength'))
+                                      'warfareBuff4Value', src.getModifiedItemAttr('industrialCoreBonusMiningBurstStrength'), **kwargs)
 
         #  Command Burst Range Bonus
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Leadership'),
                                       'maxRange', src.getModifiedItemAttr('industrialCoreBonusCommandBurstRange'),
-                                      stackingPenalties=True)
+                                      stackingPenalties=True, **kwargs)
 
         # Drone Bonuses
         fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Ice Harvesting Drone Operation'),
-                                     'duration', src.getModifiedItemAttr('industrialCoreBonusDroneIceHarvesting'))
+                                     'duration', src.getModifiedItemAttr('industrialCoreBonusDroneIceHarvesting'), **kwargs)
         fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Mining Drone Operation'),
-                                     'miningAmount', src.getModifiedItemAttr('industrialCoreBonusDroneMining'))
+                                     'miningAmount', src.getModifiedItemAttr('industrialCoreBonusDroneMining'), **kwargs)
         fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Drones'),
                                      'maxVelocity', src.getModifiedItemAttr('industrialCoreBonusDroneVelocity'),
-                                     stackingPenalties=True)
+                                     stackingPenalties=True, **kwargs)
         fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Drones'),
                                      'damageMultiplier', src.getModifiedItemAttr('industrialCoreBonusDroneDamageHP'),
-                                     stackingPenalties=True)
+                                     stackingPenalties=True, **kwargs)
         fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Drones'),
-                                     'shieldCapacity', src.getModifiedItemAttr('industrialCoreBonusDroneDamageHP'))
+                                     'shieldCapacity', src.getModifiedItemAttr('industrialCoreBonusDroneDamageHP'), **kwargs)
         fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Drones'),
-                                     'armorHP', src.getModifiedItemAttr('industrialCoreBonusDroneDamageHP'))
+                                     'armorHP', src.getModifiedItemAttr('industrialCoreBonusDroneDamageHP'), **kwargs)
         fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Drones'),
-                                     'hp', src.getModifiedItemAttr('industrialCoreBonusDroneDamageHP'))
+                                     'hp', src.getModifiedItemAttr('industrialCoreBonusDroneDamageHP'), **kwargs)
 
         # Remote impedance (no reps, etc)
-        fit.ship.increaseItemAttr('warpScrambleStatus', src.getModifiedItemAttr('siegeModeWarpStatus'))
-        fit.ship.boostItemAttr('remoteRepairImpedance', src.getModifiedItemAttr('remoteRepairImpedanceBonus'))
-        fit.ship.increaseItemAttr('disallowTethering', src.getModifiedItemAttr('disallowTethering'))
-        fit.ship.boostItemAttr('sensorDampenerResistance', src.getModifiedItemAttr('sensorDampenerResistanceBonus'))
-        fit.ship.boostItemAttr('remoteAssistanceImpedance', src.getModifiedItemAttr('remoteAssistanceImpedanceBonus'))
-        fit.ship.increaseItemAttr('disallowDocking', src.getModifiedItemAttr('disallowDocking'))
+        fit.ship.increaseItemAttr('warpScrambleStatus', src.getModifiedItemAttr('siegeModeWarpStatus'), **kwargs)
+        fit.ship.boostItemAttr('remoteRepairImpedance', src.getModifiedItemAttr('remoteRepairImpedanceBonus'), **kwargs)
+        fit.ship.increaseItemAttr('disallowTethering', src.getModifiedItemAttr('disallowTethering'), **kwargs)
+        fit.ship.boostItemAttr('sensorDampenerResistance', src.getModifiedItemAttr('sensorDampenerResistanceBonus'), **kwargs)
+        fit.ship.boostItemAttr('remoteAssistanceImpedance', src.getModifiedItemAttr('remoteAssistanceImpedanceBonus'), **kwargs)
+        fit.ship.increaseItemAttr('disallowDocking', src.getModifiedItemAttr('disallowDocking'), **kwargs)
 
 
 class Effect4576(BaseEffect):
@@ -15302,10 +15348,10 @@ class Effect4576(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Remote Tracking Computer',
                                       'falloffBonus', ship.getModifiedItemAttr('eliteBonusLogistics1'),
-                                      skill='Logistics Cruisers')
+                                      skill='Logistics Cruisers', **kwargs)
 
 
 class Effect4577(BaseEffect):
@@ -15319,10 +15365,10 @@ class Effect4577(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Remote Tracking Computer',
                                       'falloffBonus', ship.getModifiedItemAttr('eliteBonusLogistics2'),
-                                      skill='Logistics Cruisers')
+                                      skill='Logistics Cruisers', **kwargs)
 
 
 class Effect4579(BaseEffect):
@@ -15336,9 +15382,9 @@ class Effect4579(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         fit.drones.filteredItemBoost(lambda drone: drone.item.group.name == 'Stasis Webifying Drone',
-                                     'speedFactor', module.getModifiedItemAttr('webSpeedFactorBonus'))
+                                     'speedFactor', module.getModifiedItemAttr('webSpeedFactorBonus'), **kwargs)
 
 
 class Effect4619(BaseEffect):
@@ -15352,9 +15398,9 @@ class Effect4619(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Drones'),
-                                     'damageMultiplier', ship.getModifiedItemAttr('shipBonusGF2'), skill='Gallente Frigate')
+                                     'damageMultiplier', ship.getModifiedItemAttr('shipBonusGF2'), skill='Gallente Frigate', **kwargs)
 
 
 class Effect4620(BaseEffect):
@@ -15369,9 +15415,9 @@ class Effect4620(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Warp Scrambler',
-                                      'maxRange', ship.getModifiedItemAttr('shipBonusGF2'), skill='Gallente Frigate')
+                                      'maxRange', ship.getModifiedItemAttr('shipBonusGF2'), skill='Gallente Frigate', **kwargs)
 
 
 class Effect4621(BaseEffect):
@@ -15387,9 +15433,9 @@ class Effect4621(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: True, 'heatDamage',
-                                      ship.getModifiedItemAttr('shipBonusATF1'))
+                                      ship.getModifiedItemAttr('shipBonusATF1'), **kwargs)
 
 
 class Effect4622(BaseEffect):
@@ -15403,9 +15449,9 @@ class Effect4622(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Hybrid Turret'),
-                                      'maxRange', ship.getModifiedItemAttr('shipBonusATF2'))
+                                      'maxRange', ship.getModifiedItemAttr('shipBonusATF2'), **kwargs)
 
 
 class Effect4623(BaseEffect):
@@ -15419,9 +15465,9 @@ class Effect4623(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Hybrid Turret'),
-                                      'trackingSpeed', ship.getModifiedItemAttr('shipBonusATF2'))
+                                      'trackingSpeed', ship.getModifiedItemAttr('shipBonusATF2'), **kwargs)
 
 
 class Effect4624(BaseEffect):
@@ -15435,9 +15481,9 @@ class Effect4624(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Hybrid Turret'),
-                                      'trackingSpeed', ship.getModifiedItemAttr('shipBonusATC2'))
+                                      'trackingSpeed', ship.getModifiedItemAttr('shipBonusATC2'), **kwargs)
 
 
 class Effect4625(BaseEffect):
@@ -15451,9 +15497,9 @@ class Effect4625(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Hybrid Turret'),
-                                      'falloff', ship.getModifiedItemAttr('shipBonusATC2'))
+                                      'falloff', ship.getModifiedItemAttr('shipBonusATC2'), **kwargs)
 
 
 class Effect4626(BaseEffect):
@@ -15468,9 +15514,9 @@ class Effect4626(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Warp Scrambler',
-                                      'maxRange', ship.getModifiedItemAttr('shipBonusGC2'), skill='Gallente Cruiser')
+                                      'maxRange', ship.getModifiedItemAttr('shipBonusGC2'), skill='Gallente Cruiser', **kwargs)
 
 
 class Effect4635(BaseEffect):
@@ -15484,12 +15530,12 @@ class Effect4635(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         damageTypes = ('em', 'explosive', 'kinetic', 'thermal')
         for damageType in damageTypes:
             fit.modules.filteredChargeBoost(
                 lambda mod: mod.charge.requiresSkill('Cruise Missiles') or mod.charge.requiresSkill('Torpedoes'),
-                '{0}Damage'.format(damageType), ship.getModifiedItemAttr('eliteBonusViolatorsRole1'))
+                '{0}Damage'.format(damageType), ship.getModifiedItemAttr('eliteBonusViolatorsRole1'), **kwargs)
 
 
 class Effect4636(BaseEffect):
@@ -15503,10 +15549,10 @@ class Effect4636(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredChargeBoost(
             lambda mod: mod.charge.requiresSkill('Cruise Missiles') or mod.charge.requiresSkill('Torpedoes'),
-            'aoeVelocity', ship.getModifiedItemAttr('shipBonus2CB'), skill='Caldari Battleship')
+            'aoeVelocity', ship.getModifiedItemAttr('shipBonus2CB'), skill='Caldari Battleship', **kwargs)
 
 
 class Effect4637(BaseEffect):
@@ -15521,10 +15567,10 @@ class Effect4637(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredChargeBoost(
             lambda mod: mod.charge.requiresSkill('Cruise Missiles') or mod.charge.requiresSkill('Torpedoes'),
-            'maxVelocity', ship.getModifiedItemAttr('shipBonusCB3'), skill='Caldari Battleship')
+            'maxVelocity', ship.getModifiedItemAttr('shipBonusCB3'), skill='Caldari Battleship', **kwargs)
 
 
 class Effect4640(BaseEffect):
@@ -15540,11 +15586,11 @@ class Effect4640(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         damageTypes = ('Em', 'Explosive', 'Kinetic', 'Thermal')
         for damageType in damageTypes:
             fit.ship.boostItemAttr('armor{0}DamageResonance'.format(damageType), ship.getModifiedItemAttr('shipBonusAC2'),
-                                   skill='Amarr Cruiser')
+                                   skill='Amarr Cruiser', **kwargs)
 
 
 class Effect4643(BaseEffect):
@@ -15558,12 +15604,12 @@ class Effect4643(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         damageTypes = ('em', 'explosive', 'kinetic', 'thermal')
         for damageType in damageTypes:
             fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Assault Missiles'),
                                             '{0}Damage'.format(damageType), ship.getModifiedItemAttr('shipBonusAC'),
-                                            skill='Amarr Cruiser')
+                                            skill='Amarr Cruiser', **kwargs)
 
 
 class Effect4645(BaseEffect):
@@ -15577,11 +15623,11 @@ class Effect4645(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         groups = ('Missile Launcher Rapid Light', 'Missile Launcher Heavy Assault', 'Missile Launcher Heavy')
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in groups,
                                       'speed', ship.getModifiedItemAttr('eliteBonusHeavyGunship2'),
-                                      skill='Heavy Assault Cruisers')
+                                      skill='Heavy Assault Cruisers', **kwargs)
 
 
 class Effect4648(BaseEffect):
@@ -15595,11 +15641,11 @@ class Effect4648(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         sensorTypes = ('Gravimetric', 'Ladar', 'Magnetometric', 'Radar')
         for type in sensorTypes:
             fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'ECM', 'scan{0}StrengthBonus'.format(type),
-                                          ship.getModifiedItemAttr('eliteBonusBlackOps1'), skill='Black Ops')
+                                          ship.getModifiedItemAttr('eliteBonusBlackOps1'), skill='Black Ops', **kwargs)
 
 
 class Effect4649(BaseEffect):
@@ -15613,10 +15659,10 @@ class Effect4649(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         affectedGroups = ('Missile Launcher Cruise', 'Missile Launcher Torpedo')
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in affectedGroups,
-                                      'speed', ship.getModifiedItemAttr('shipBonus2CB'), skill='Caldari Battleship')
+                                      'speed', ship.getModifiedItemAttr('shipBonus2CB'), skill='Caldari Battleship', **kwargs)
 
 
 class Effect4667(BaseEffect):
@@ -15630,10 +15676,10 @@ class Effect4667(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Salvaging'),
                                       'duration', ship.getModifiedItemAttr('shipBonusOreIndustrial1'),
-                                      skill='ORE Industrial')
+                                      skill='ORE Industrial', **kwargs)
 
 
 class Effect4668(BaseEffect):
@@ -15647,10 +15693,10 @@ class Effect4668(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Tractor Beam',
                                       'duration', ship.getModifiedItemAttr('shipBonusOreIndustrial1'),
-                                      skill='ORE Industrial')
+                                      skill='ORE Industrial', **kwargs)
 
 
 class Effect4669(BaseEffect):
@@ -15664,10 +15710,10 @@ class Effect4669(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Tractor Beam',
                                       'maxTractorVelocity', ship.getModifiedItemAttr('shipBonusOreIndustrial2'),
-                                      skill='ORE Industrial')
+                                      skill='ORE Industrial', **kwargs)
 
 
 class Effect4670(BaseEffect):
@@ -15681,10 +15727,10 @@ class Effect4670(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Tractor Beam',
                                       'maxRange', ship.getModifiedItemAttr('shipBonusOreIndustrial2'),
-                                      skill='ORE Industrial')
+                                      skill='ORE Industrial', **kwargs)
 
 
 class Effect4728(BaseEffect):
@@ -15700,29 +15746,29 @@ class Effect4728(BaseEffect):
     type = ('projected', 'passive')
 
     @staticmethod
-    def handler(fit, beacon, context):
+    def handler(fit, beacon, context, **kwargs):
         damages = ('em', 'thermal', 'kinetic', 'explosive')
         for damage in damages:
             # Nerf missile damage
             fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
                                             '{0}Damage'.format(damage),
-                                            beacon.getModifiedItemAttr('systemEffectDamageReduction'))
+                                            beacon.getModifiedItemAttr('systemEffectDamageReduction'), **kwargs)
             # Nerf smartbomb damage
             fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Smart Bomb',
                                           '{0}Damage'.format(damage),
-                                          beacon.getModifiedItemAttr('systemEffectDamageReduction'))
+                                          beacon.getModifiedItemAttr('systemEffectDamageReduction'), **kwargs)
             # Nerf armor resistances
             fit.ship.boostItemAttr('armor{0}DamageResonance'.format(damage.capitalize()),
-                                   beacon.getModifiedItemAttr('armor{0}DamageResistanceBonus'.format(damage.capitalize())))
+                                   beacon.getModifiedItemAttr('armor{0}DamageResistanceBonus'.format(damage.capitalize())), **kwargs)
             # Nerf shield resistances
             fit.ship.boostItemAttr('shield{0}DamageResonance'.format(damage.capitalize()),
-                                   beacon.getModifiedItemAttr('shield{0}DamageResistanceBonus'.format(damage.capitalize())))
+                                   beacon.getModifiedItemAttr('shield{0}DamageResistanceBonus'.format(damage.capitalize())), **kwargs)
         # Nerf drone damage output
         fit.drones.filteredItemBoost(lambda drone: True,
-                                     'damageMultiplier', beacon.getModifiedItemAttr('systemEffectDamageReduction'))
+                                     'damageMultiplier', beacon.getModifiedItemAttr('systemEffectDamageReduction'), **kwargs)
         # Nerf turret damage output
         fit.modules.filteredItemBoost(lambda module: module.item.requiresSkill('Gunnery'),
-                                      'damageMultiplier', beacon.getModifiedItemAttr('systemEffectDamageReduction'))
+                                      'damageMultiplier', beacon.getModifiedItemAttr('systemEffectDamageReduction'), **kwargs)
 
 
 class Effect4760(BaseEffect):
@@ -15736,9 +15782,9 @@ class Effect4760(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.ship.boostItemAttr('warpCapacitorNeed', src.getModifiedItemAttr('subsystemBonusCaldariPropulsion'),
-                               skill='Caldari Propulsion Systems')
+                               skill='Caldari Propulsion Systems', **kwargs)
 
 
 class Effect4775(BaseEffect):
@@ -15752,10 +15798,10 @@ class Effect4775(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Energy Neutralizer',
                                       'energyNeutralizerAmount', ship.getModifiedItemAttr('shipBonus2AF'),
-                                      skill='Amarr Frigate')
+                                      skill='Amarr Frigate', **kwargs)
 
 
 class Effect4782(BaseEffect):
@@ -15769,9 +15815,9 @@ class Effect4782(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Energy Turret'),
-                                      'maxRange', ship.getModifiedItemAttr('shipBonusATF2'))
+                                      'maxRange', ship.getModifiedItemAttr('shipBonusATF2'), **kwargs)
 
 
 class Effect4789(BaseEffect):
@@ -15785,9 +15831,9 @@ class Effect4789(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Energy Turret'),
-                                      'damageMultiplier', ship.getModifiedItemAttr('shipBonusATF1'))
+                                      'damageMultiplier', ship.getModifiedItemAttr('shipBonusATF1'), **kwargs)
 
 
 class Effect4793(BaseEffect):
@@ -15801,9 +15847,9 @@ class Effect4793(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Missile Launcher Heavy',
-                                      'speed', ship.getModifiedItemAttr('shipBonusATC1'))
+                                      'speed', ship.getModifiedItemAttr('shipBonusATC1'), **kwargs)
 
 
 class Effect4794(BaseEffect):
@@ -15817,9 +15863,9 @@ class Effect4794(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Missile Launcher Rapid Light',
-                                      'speed', ship.getModifiedItemAttr('shipBonusATC1'))
+                                      'speed', ship.getModifiedItemAttr('shipBonusATC1'), **kwargs)
 
 
 class Effect4795(BaseEffect):
@@ -15833,9 +15879,9 @@ class Effect4795(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Missile Launcher Heavy Assault',
-                                      'speed', ship.getModifiedItemAttr('shipBonusATC1'))
+                                      'speed', ship.getModifiedItemAttr('shipBonusATC1'), **kwargs)
 
 
 class Effect4799(BaseEffect):
@@ -15849,12 +15895,12 @@ class Effect4799(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         sensorTypes = ('Gravimetric', 'Ladar', 'Magnetometric', 'Radar')
         for type in sensorTypes:
             fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Burst Jammer',
                                           'scan{0}StrengthBonus'.format(type),
-                                          ship.getModifiedItemAttr('eliteBonusBlackOps1'), skill='Black Ops')
+                                          ship.getModifiedItemAttr('eliteBonusBlackOps1'), skill='Black Ops', **kwargs)
 
 
 class Effect4804(BaseEffect):
@@ -15870,9 +15916,9 @@ class Effect4804(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, skill, context):
+    def handler(fit, skill, context, **kwargs):
         fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill(skill), 'accessDifficultyBonus',
-                                         skill.getModifiedItemAttr('accessDifficultyBonusAbsolutePercent') * skill.level)
+                                         skill.getModifiedItemAttr('accessDifficultyBonusAbsolutePercent') * skill.level, **kwargs)
 
 
 class Effect4809(BaseEffect):
@@ -15886,10 +15932,10 @@ class Effect4809(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'ECM',
                                       'scanGravimetricStrengthBonus', module.getModifiedItemAttr('ecmStrengthBonusPercent'),
-                                      stackingPenalties=True)
+                                      stackingPenalties=True, **kwargs)
 
 
 class Effect4810(BaseEffect):
@@ -15903,10 +15949,10 @@ class Effect4810(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'ECM',
                                       'scanLadarStrengthBonus', module.getModifiedItemAttr('ecmStrengthBonusPercent'),
-                                      stackingPenalties=True)
+                                      stackingPenalties=True, **kwargs)
 
 
 class Effect4811(BaseEffect):
@@ -15920,11 +15966,11 @@ class Effect4811(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'ECM',
                                       'scanMagnetometricStrengthBonus',
                                       module.getModifiedItemAttr('ecmStrengthBonusPercent'),
-                                      stackingPenalties=True)
+                                      stackingPenalties=True, **kwargs)
 
 
 class Effect4812(BaseEffect):
@@ -15938,10 +15984,10 @@ class Effect4812(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'ECM',
                                       'scanRadarStrengthBonus', module.getModifiedItemAttr('ecmStrengthBonusPercent'),
-                                      stackingPenalties=True)
+                                      stackingPenalties=True, **kwargs)
 
 
 class Effect4814(BaseEffect):
@@ -15955,9 +16001,9 @@ class Effect4814(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, skill, context):
+    def handler(fit, skill, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill(skill), 'consumptionQuantity',
-                                      skill.getModifiedItemAttr('consumptionQuantityBonusPercent') * skill.level)
+                                      skill.getModifiedItemAttr('consumptionQuantityBonusPercent') * skill.level, **kwargs)
 
 
 class Effect4817(BaseEffect):
@@ -15971,9 +16017,9 @@ class Effect4817(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, implant, context):
+    def handler(fit, implant, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Salvager',
-                                      'duration', implant.getModifiedItemAttr('durationBonus'))
+                                      'duration', implant.getModifiedItemAttr('durationBonus'), **kwargs)
 
 
 class Effect4820(BaseEffect):
@@ -15987,9 +16033,9 @@ class Effect4820(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill('Large Energy Turret'),
-                                         'power', ship.getModifiedItemAttr('bcLargeTurretPower'))
+                                         'power', ship.getModifiedItemAttr('bcLargeTurretPower'), **kwargs)
 
 
 class Effect4821(BaseEffect):
@@ -16004,9 +16050,9 @@ class Effect4821(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill('Large Hybrid Turret'),
-                                         'power', ship.getModifiedItemAttr('bcLargeTurretPower'))
+                                         'power', ship.getModifiedItemAttr('bcLargeTurretPower'), **kwargs)
 
 
 class Effect4822(BaseEffect):
@@ -16020,9 +16066,9 @@ class Effect4822(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill('Large Projectile Turret'),
-                                         'power', ship.getModifiedItemAttr('bcLargeTurretPower'))
+                                         'power', ship.getModifiedItemAttr('bcLargeTurretPower'), **kwargs)
 
 
 class Effect4823(BaseEffect):
@@ -16036,9 +16082,9 @@ class Effect4823(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill('Large Energy Turret'),
-                                         'cpu', ship.getModifiedItemAttr('bcLargeTurretCPU'))
+                                         'cpu', ship.getModifiedItemAttr('bcLargeTurretCPU'), **kwargs)
 
 
 class Effect4824(BaseEffect):
@@ -16053,9 +16099,9 @@ class Effect4824(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill('Large Hybrid Turret'),
-                                         'cpu', ship.getModifiedItemAttr('bcLargeTurretCPU'))
+                                         'cpu', ship.getModifiedItemAttr('bcLargeTurretCPU'), **kwargs)
 
 
 class Effect4825(BaseEffect):
@@ -16069,9 +16115,9 @@ class Effect4825(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill('Large Projectile Turret'),
-                                         'cpu', ship.getModifiedItemAttr('bcLargeTurretCPU'))
+                                         'cpu', ship.getModifiedItemAttr('bcLargeTurretCPU'), **kwargs)
 
 
 class Effect4826(BaseEffect):
@@ -16085,9 +16131,9 @@ class Effect4826(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill('Large Energy Turret'),
-                                         'capacitorNeed', ship.getModifiedItemAttr('bcLargeTurretCap'))
+                                         'capacitorNeed', ship.getModifiedItemAttr('bcLargeTurretCap'), **kwargs)
 
 
 class Effect4827(BaseEffect):
@@ -16102,9 +16148,9 @@ class Effect4827(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill('Large Hybrid Turret'),
-                                         'capacitorNeed', ship.getModifiedItemAttr('bcLargeTurretCap'))
+                                         'capacitorNeed', ship.getModifiedItemAttr('bcLargeTurretCap'), **kwargs)
 
 
 class Effect4867(BaseEffect):
@@ -16119,10 +16165,10 @@ class Effect4867(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, implant, context):
+    def handler(fit, implant, context, **kwargs):
         fit.appliedImplants.filteredItemMultiply(lambda mod: mod.item.group.name == 'Special Edition Implant',
                                                  'powerEngineeringOutputBonus',
-                                                 implant.getModifiedItemAttr('implantSetChristmas'))
+                                                 implant.getModifiedItemAttr('implantSetChristmas'), **kwargs)
 
 
 class Effect4868(BaseEffect):
@@ -16137,10 +16183,10 @@ class Effect4868(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, implant, context):
+    def handler(fit, implant, context, **kwargs):
         fit.appliedImplants.filteredItemMultiply(lambda mod: mod.item.group.name == 'Special Edition Implant',
                                                  'capacitorCapacityBonus',
-                                                 implant.getModifiedItemAttr('implantSetChristmas'))
+                                                 implant.getModifiedItemAttr('implantSetChristmas'), **kwargs)
 
 
 class Effect4869(BaseEffect):
@@ -16155,9 +16201,9 @@ class Effect4869(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, implant, context):
+    def handler(fit, implant, context, **kwargs):
         fit.appliedImplants.filteredItemMultiply(lambda mod: mod.item.group.name == 'Special Edition Implant',
-                                                 'cpuOutputBonus2', implant.getModifiedItemAttr('implantSetChristmas'))
+                                                 'cpuOutputBonus2', implant.getModifiedItemAttr('implantSetChristmas'), **kwargs)
 
 
 class Effect4871(BaseEffect):
@@ -16172,9 +16218,9 @@ class Effect4871(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, implant, context):
+    def handler(fit, implant, context, **kwargs):
         fit.appliedImplants.filteredItemMultiply(lambda mod: mod.item.group.name == 'Special Edition Implant',
-                                                 'capRechargeBonus', implant.getModifiedItemAttr('implantSetChristmas'))
+                                                 'capRechargeBonus', implant.getModifiedItemAttr('implantSetChristmas'), **kwargs)
 
 
 class Effect4896(BaseEffect):
@@ -16188,9 +16234,9 @@ class Effect4896(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Drones'),
-                                     'hp', ship.getModifiedItemAttr('shipBonusGF2'), skill='Gallente Frigate')
+                                     'hp', ship.getModifiedItemAttr('shipBonusGF2'), skill='Gallente Frigate', **kwargs)
 
 
 class Effect4897(BaseEffect):
@@ -16204,9 +16250,9 @@ class Effect4897(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Drones'),
-                                     'armorHP', ship.getModifiedItemAttr('shipBonusGF2'), skill='Gallente Frigate')
+                                     'armorHP', ship.getModifiedItemAttr('shipBonusGF2'), skill='Gallente Frigate', **kwargs)
 
 
 class Effect4898(BaseEffect):
@@ -16220,9 +16266,9 @@ class Effect4898(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Drones'),
-                                     'shieldCapacity', ship.getModifiedItemAttr('shipBonusGF2'), skill='Gallente Frigate')
+                                     'shieldCapacity', ship.getModifiedItemAttr('shipBonusGF2'), skill='Gallente Frigate', **kwargs)
 
 
 class Effect4901(BaseEffect):
@@ -16236,9 +16282,9 @@ class Effect4901(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Missile Launcher Operation'),
-                                      'speed', ship.getModifiedItemAttr('shipBonus2AF'), skill='Amarr Frigate')
+                                      'speed', ship.getModifiedItemAttr('shipBonus2AF'), skill='Amarr Frigate', **kwargs)
 
 
 class Effect4902(BaseEffect):
@@ -16254,9 +16300,9 @@ class Effect4902(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('High Speed Maneuvering'),
-                                      'signatureRadiusBonus', ship.getModifiedItemAttr('MWDSignatureRadiusBonus'))
+                                      'signatureRadiusBonus', ship.getModifiedItemAttr('MWDSignatureRadiusBonus'), **kwargs)
 
 
 class Effect4906(BaseEffect):
@@ -16271,10 +16317,10 @@ class Effect4906(BaseEffect):
     type = ('projected', 'passive')
 
     @staticmethod
-    def handler(fit, beacon, context):
+    def handler(fit, beacon, context, **kwargs):
         fit.drones.filteredItemMultiply(lambda drone: drone.item.requiresSkill('Fighters'),
                                         'damageMultiplier', beacon.getModifiedItemAttr('damageMultiplierMultiplier'),
-                                        stackingPenalties=True, penaltyGroup='postMul')
+                                        stackingPenalties=True, penaltyGroup='postMul', **kwargs)
 
 
 class Effect4911(BaseEffect):
@@ -16288,8 +16334,8 @@ class Effect4911(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
-        fit.ship.multiplyItemAttr('shieldRechargeRate', module.getModifiedItemAttr('shieldRechargeRateMultiplier'))
+    def handler(fit, module, context, **kwargs):
+        fit.ship.multiplyItemAttr('shieldRechargeRate', module.getModifiedItemAttr('shieldRechargeRateMultiplier'), **kwargs)
 
 
 class Effect4921(BaseEffect):
@@ -16303,8 +16349,8 @@ class Effect4921(BaseEffect):
     type = 'active'
 
     @staticmethod
-    def handler(fit, module, context):
-        fit.ship.boostItemAttr('signatureRadius', module.getModifiedItemAttr('signatureRadiusBonusPercent'))
+    def handler(fit, module, context, **kwargs):
+        fit.ship.boostItemAttr('signatureRadius', module.getModifiedItemAttr('signatureRadiusBonusPercent'), **kwargs)
 
 
 class Effect4923(BaseEffect):
@@ -16318,9 +16364,9 @@ class Effect4923(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, skill, context):
+    def handler(fit, skill, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Micro Jump Drive Operation'),
-                                      'duration', skill.getModifiedItemAttr('durationBonus') * skill.level)
+                                      'duration', skill.getModifiedItemAttr('durationBonus') * skill.level, **kwargs)
 
 
 class Effect4928(BaseEffect):
@@ -16335,7 +16381,7 @@ class Effect4928(BaseEffect):
     type = 'active'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         # pyfalog = Logger(__name__)
 
         damagePattern = fit.damagePattern
@@ -16451,7 +16497,7 @@ class Effect4928(BaseEffect):
                     'armorEmDamageResonance', 'armorThermalDamageResonance', 'armorKineticDamageResonance',
                     'armorExplosiveDamageResonance')):
                 module.increaseItemAttr(attr, average[i] - module.getModifiedItemAttr(attr))
-                fit.ship.multiplyItemAttr(attr, average[i], stackingPenalties=True, penaltyGroup='preMul')
+                fit.ship.multiplyItemAttr(attr, average[i], stackingPenalties=True, penaltyGroup='preMul', **kwargs)
 
 
 class Effect4934(BaseEffect):
@@ -16465,10 +16511,10 @@ class Effect4934(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Repair Systems'),
                                       'armorDamageAmount', ship.getModifiedItemAttr('shipBonusGF2'),
-                                      skill='Gallente Frigate')
+                                      skill='Gallente Frigate', **kwargs)
 
 
 class Effect4936(BaseEffect):
@@ -16483,10 +16529,10 @@ class Effect4936(BaseEffect):
     type = 'active'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         amount = module.getModifiedItemAttr('shieldBonus')
         speed = module.getModifiedItemAttr('duration') / 1000.0
-        fit.extraAttributes.increase('shieldRepair', amount / speed)
+        fit.extraAttributes.increase('shieldRepair', amount / speed, **kwargs)
 
 
 class Effect4941(BaseEffect):
@@ -16501,9 +16547,9 @@ class Effect4941(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Hybrid Turret'),
-                                      'damageMultiplier', ship.getModifiedItemAttr('shipBonusCF2'), skill='Caldari Frigate')
+                                      'damageMultiplier', ship.getModifiedItemAttr('shipBonusCF2'), skill='Caldari Frigate', **kwargs)
 
 
 class Effect4942(BaseEffect):
@@ -16528,9 +16574,9 @@ class Effect4945(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, skill, context):
+    def handler(fit, skill, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Target Breaker',
-                                      'duration', skill.getModifiedItemAttr('durationBonus') * skill.level)
+                                      'duration', skill.getModifiedItemAttr('durationBonus') * skill.level, **kwargs)
 
 
 class Effect4946(BaseEffect):
@@ -16544,9 +16590,9 @@ class Effect4946(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, skill, context):
+    def handler(fit, skill, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Target Breaker',
-                                      'capacitorNeed', skill.getModifiedItemAttr('capNeedBonus') * skill.level)
+                                      'capacitorNeed', skill.getModifiedItemAttr('capNeedBonus') * skill.level, **kwargs)
 
 
 class Effect4950(BaseEffect):
@@ -16560,9 +16606,9 @@ class Effect4950(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Operation'),
-                                      'shieldBonus', ship.getModifiedItemAttr('shipBonusMB'), skill='Minmatar Battleship')
+                                      'shieldBonus', ship.getModifiedItemAttr('shipBonusMB'), skill='Minmatar Battleship', **kwargs)
 
 
 class Effect4951(BaseEffect):
@@ -16578,10 +16624,10 @@ class Effect4951(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, container, context):
+    def handler(fit, container, context, **kwargs):
         fit.modules.filteredItemBoost(
             lambda mod: mod.item.requiresSkill('Shield Operation') or mod.item.requiresSkill('Capital Shield Operation'),
-            'shieldBonus', container.getModifiedItemAttr('shieldBoostMultiplier'))
+            'shieldBonus', container.getModifiedItemAttr('shieldBoostMultiplier'), **kwargs)
 
 
 class Effect4961(BaseEffect):
@@ -16596,11 +16642,11 @@ class Effect4961(BaseEffect):
     type = ('projected', 'passive')
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill('Shield Operation') or
                                                      mod.item.requiresSkill('Capital Shield Operation'),
                                          'shieldBonus', module.getModifiedItemAttr('shieldBonusMultiplier'),
-                                         stackingPenalties=True, penaltyGroup='postMul')
+                                         stackingPenalties=True, penaltyGroup='postMul', **kwargs)
 
 
 class Effect4967(BaseEffect):
@@ -16614,10 +16660,10 @@ class Effect4967(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         fit.modules.filteredItemBoost(
             lambda mod: mod.item.requiresSkill('Shield Operation') or mod.item.requiresSkill('Capital Shield Operation'),
-            'duration', module.getModifiedItemAttr('durationSkillBonus'))
+            'duration', module.getModifiedItemAttr('durationSkillBonus'), **kwargs)
 
 
 class Effect4970(BaseEffect):
@@ -16635,11 +16681,11 @@ class Effect4970(BaseEffect):
     type = 'boosterSideEffect'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Operation'), 'shieldBonus',
-                                      src.getModifiedItemAttr('boosterShieldBoostAmountPenalty'))
+                                      src.getModifiedItemAttr('boosterShieldBoostAmountPenalty'), **kwargs)
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Capital Shield Operation'), 'shieldBonus',
-                                      src.getModifiedItemAttr('boosterShieldBoostAmountPenalty'))
+                                      src.getModifiedItemAttr('boosterShieldBoostAmountPenalty'), **kwargs)
 
 
 class Effect4972(BaseEffect):
@@ -16653,9 +16699,9 @@ class Effect4972(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Missile Launcher Light',
-                                      'speed', ship.getModifiedItemAttr('eliteBonusGunship1'), skill='Assault Frigates')
+                                      'speed', ship.getModifiedItemAttr('eliteBonusGunship1'), skill='Assault Frigates', **kwargs)
 
 
 class Effect4973(BaseEffect):
@@ -16669,9 +16715,9 @@ class Effect4973(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Missile Launcher Rocket',
-                                      'speed', ship.getModifiedItemAttr('eliteBonusGunship1'), skill='Assault Frigates')
+                                      'speed', ship.getModifiedItemAttr('eliteBonusGunship1'), skill='Assault Frigates', **kwargs)
 
 
 class Effect4974(BaseEffect):
@@ -16686,9 +16732,9 @@ class Effect4974(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Operation'),
-                                      'shieldBonus', ship.getModifiedItemAttr('eliteBonusViolators2'), skill='Marauders')
+                                      'shieldBonus', ship.getModifiedItemAttr('eliteBonusViolators2'), skill='Marauders', **kwargs)
 
 
 class Effect4975(BaseEffect):
@@ -16702,9 +16748,9 @@ class Effect4975(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
-                                        'kineticDamage', ship.getModifiedItemAttr('shipBonusATF2'))
+                                        'kineticDamage', ship.getModifiedItemAttr('shipBonusATF2'), **kwargs)
 
 
 class Effect4976(BaseEffect):
@@ -16718,12 +16764,12 @@ class Effect4976(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         lvl = src.level
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Armor Resistance Shift Hardener', 'duration',
-                                      src.getModifiedItemAttr('durationBonus') * lvl)
+                                      src.getModifiedItemAttr('durationBonus') * lvl, **kwargs)
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Resistance Phasing'), 'duration',
-                                      src.getModifiedItemAttr('durationBonus') * lvl)
+                                      src.getModifiedItemAttr('durationBonus') * lvl, **kwargs)
 
 
 class Effect4989(BaseEffect):
@@ -16737,9 +16783,9 @@ class Effect4989(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, implant, context):
+    def handler(fit, implant, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
-                                        'aoeCloudSize', implant.getModifiedItemAttr('aoeCloudSizeBonus'))
+                                        'aoeCloudSize', implant.getModifiedItemAttr('aoeCloudSizeBonus'), **kwargs)
 
 
 class Effect4990(BaseEffect):
@@ -16754,9 +16800,9 @@ class Effect4990(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Energy Turret'),
-                                      'capacitorNeed', ship.getModifiedItemAttr('rookieSETCapBonus'))
+                                      'capacitorNeed', ship.getModifiedItemAttr('rookieSETCapBonus'), **kwargs)
 
 
 class Effect4991(BaseEffect):
@@ -16772,9 +16818,9 @@ class Effect4991(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Energy Turret'),
-                                      'damageMultiplier', ship.getModifiedItemAttr('rookieSETDamageBonus'))
+                                      'damageMultiplier', ship.getModifiedItemAttr('rookieSETDamageBonus'), **kwargs)
 
 
 class Effect4994(BaseEffect):
@@ -16792,8 +16838,8 @@ class Effect4994(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
-        fit.ship.boostItemAttr('armorEmDamageResonance', ship.getModifiedItemAttr('rookieArmorResistanceBonus'))
+    def handler(fit, ship, context, **kwargs):
+        fit.ship.boostItemAttr('armorEmDamageResonance', ship.getModifiedItemAttr('rookieArmorResistanceBonus'), **kwargs)
 
 
 class Effect4995(BaseEffect):
@@ -16811,8 +16857,8 @@ class Effect4995(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
-        fit.ship.boostItemAttr('armorExplosiveDamageResonance', ship.getModifiedItemAttr('rookieArmorResistanceBonus'))
+    def handler(fit, ship, context, **kwargs):
+        fit.ship.boostItemAttr('armorExplosiveDamageResonance', ship.getModifiedItemAttr('rookieArmorResistanceBonus'), **kwargs)
 
 
 class Effect4996(BaseEffect):
@@ -16830,8 +16876,8 @@ class Effect4996(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
-        fit.ship.boostItemAttr('armorKineticDamageResonance', ship.getModifiedItemAttr('rookieArmorResistanceBonus'))
+    def handler(fit, ship, context, **kwargs):
+        fit.ship.boostItemAttr('armorKineticDamageResonance', ship.getModifiedItemAttr('rookieArmorResistanceBonus'), **kwargs)
 
 
 class Effect4997(BaseEffect):
@@ -16849,8 +16895,8 @@ class Effect4997(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
-        fit.ship.boostItemAttr('armorThermalDamageResonance', ship.getModifiedItemAttr('rookieArmorResistanceBonus'))
+    def handler(fit, ship, context, **kwargs):
+        fit.ship.boostItemAttr('armorThermalDamageResonance', ship.getModifiedItemAttr('rookieArmorResistanceBonus'), **kwargs)
 
 
 class Effect4999(BaseEffect):
@@ -16864,9 +16910,9 @@ class Effect4999(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Hybrid Turret'),
-                                      'maxRange', ship.getModifiedItemAttr('rookieSHTOptimalBonus'))
+                                      'maxRange', ship.getModifiedItemAttr('rookieSHTOptimalBonus'), **kwargs)
 
 
 class Effect5000(BaseEffect):
@@ -16880,9 +16926,9 @@ class Effect5000(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
-                                        'kineticDamage', ship.getModifiedItemAttr('rookieMissileKinDamageBonus'))
+                                        'kineticDamage', ship.getModifiedItemAttr('rookieMissileKinDamageBonus'), **kwargs)
 
 
 class Effect5008(BaseEffect):
@@ -16898,8 +16944,8 @@ class Effect5008(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
-        fit.ship.boostItemAttr('shieldEmDamageResonance', ship.getModifiedItemAttr('rookieShieldResistBonus'))
+    def handler(fit, ship, context, **kwargs):
+        fit.ship.boostItemAttr('shieldEmDamageResonance', ship.getModifiedItemAttr('rookieShieldResistBonus'), **kwargs)
 
 
 class Effect5009(BaseEffect):
@@ -16915,8 +16961,8 @@ class Effect5009(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
-        fit.ship.boostItemAttr('shieldExplosiveDamageResonance', ship.getModifiedItemAttr('rookieShieldResistBonus'))
+    def handler(fit, ship, context, **kwargs):
+        fit.ship.boostItemAttr('shieldExplosiveDamageResonance', ship.getModifiedItemAttr('rookieShieldResistBonus'), **kwargs)
 
 
 class Effect5011(BaseEffect):
@@ -16932,8 +16978,8 @@ class Effect5011(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
-        fit.ship.boostItemAttr('shieldKineticDamageResonance', ship.getModifiedItemAttr('rookieShieldResistBonus'))
+    def handler(fit, ship, context, **kwargs):
+        fit.ship.boostItemAttr('shieldKineticDamageResonance', ship.getModifiedItemAttr('rookieShieldResistBonus'), **kwargs)
 
 
 class Effect5012(BaseEffect):
@@ -16949,8 +16995,8 @@ class Effect5012(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
-        fit.ship.boostItemAttr('shieldThermalDamageResonance', ship.getModifiedItemAttr('rookieShieldResistBonus'))
+    def handler(fit, ship, context, **kwargs):
+        fit.ship.boostItemAttr('shieldThermalDamageResonance', ship.getModifiedItemAttr('rookieShieldResistBonus'), **kwargs)
 
 
 class Effect5013(BaseEffect):
@@ -16966,9 +17012,9 @@ class Effect5013(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Hybrid Turret'),
-                                      'damageMultiplier', ship.getModifiedItemAttr('rookieSHTDamageBonus'))
+                                      'damageMultiplier', ship.getModifiedItemAttr('rookieSHTDamageBonus'), **kwargs)
 
 
 class Effect5014(BaseEffect):
@@ -16986,9 +17032,9 @@ class Effect5014(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Drones'),
-                                     'damageMultiplier', ship.getModifiedItemAttr('rookieDroneBonus'))
+                                     'damageMultiplier', ship.getModifiedItemAttr('rookieDroneBonus'), **kwargs)
 
 
 class Effect5015(BaseEffect):
@@ -17002,9 +17048,9 @@ class Effect5015(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Sensor Dampener',
-                                      'maxTargetRangeBonus', ship.getModifiedItemAttr('rookieDampStrengthBonus'))
+                                      'maxTargetRangeBonus', ship.getModifiedItemAttr('rookieDampStrengthBonus'), **kwargs)
 
 
 class Effect5016(BaseEffect):
@@ -17018,9 +17064,9 @@ class Effect5016(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Sensor Dampener',
-                                      'scanResolutionBonus', ship.getModifiedItemAttr('rookieDampStrengthBonus'))
+                                      'scanResolutionBonus', ship.getModifiedItemAttr('rookieDampStrengthBonus'), **kwargs)
 
 
 class Effect5017(BaseEffect):
@@ -17034,9 +17080,9 @@ class Effect5017(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Repair Systems'),
-                                      'armorDamageAmount', ship.getModifiedItemAttr('rookieArmorRepBonus'))
+                                      'armorDamageAmount', ship.getModifiedItemAttr('rookieArmorRepBonus'), **kwargs)
 
 
 class Effect5018(BaseEffect):
@@ -17050,8 +17096,8 @@ class Effect5018(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
-        fit.ship.boostItemAttr('maxVelocity', ship.getModifiedItemAttr('rookieShipVelocityBonus'))
+    def handler(fit, ship, context, **kwargs):
+        fit.ship.boostItemAttr('maxVelocity', ship.getModifiedItemAttr('rookieShipVelocityBonus'), **kwargs)
 
 
 class Effect5019(BaseEffect):
@@ -17065,9 +17111,9 @@ class Effect5019(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Target Painter',
-                                      'signatureRadiusBonus', ship.getModifiedItemAttr('rookieTargetPainterStrengthBonus'))
+                                      'signatureRadiusBonus', ship.getModifiedItemAttr('rookieTargetPainterStrengthBonus'), **kwargs)
 
 
 class Effect5020(BaseEffect):
@@ -17082,9 +17128,9 @@ class Effect5020(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Projectile Turret'),
-                                      'damageMultiplier', ship.getModifiedItemAttr('rookieSPTDamageBonus'))
+                                      'damageMultiplier', ship.getModifiedItemAttr('rookieSPTDamageBonus'), **kwargs)
 
 
 class Effect5021(BaseEffect):
@@ -17099,9 +17145,9 @@ class Effect5021(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Operation'),
-                                      'shieldBonus', ship.getModifiedItemAttr('rookieShieldBoostBonus'))
+                                      'shieldBonus', ship.getModifiedItemAttr('rookieShieldBoostBonus'), **kwargs)
 
 
 class Effect5028(BaseEffect):
@@ -17115,11 +17161,11 @@ class Effect5028(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         for type in ('Gravimetric', 'Ladar', 'Radar', 'Magnetometric'):
             fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'ECM',
                                           'scan{0}StrengthBonus'.format(type),
-                                          ship.getModifiedItemAttr('rookieECMStrengthBonus'))
+                                          ship.getModifiedItemAttr('rookieECMStrengthBonus'), **kwargs)
 
 
 class Effect5029(BaseEffect):
@@ -17133,11 +17179,9 @@ class Effect5029(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Mining Drone Operation'),
-                                     'miningAmount',
-                                     src.getModifiedItemAttr('roleBonusDroneMiningYield'),
-                                     )
+                                     'miningAmount', src.getModifiedItemAttr('roleBonusDroneMiningYield'), **kwargs)
 
 
 class Effect5030(BaseEffect):
@@ -17154,9 +17198,9 @@ class Effect5030(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, container, context):
+    def handler(fit, container, context, **kwargs):
         fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Mining Drone Operation'),
-                                     'miningAmount', container.getModifiedItemAttr('rookieDroneBonus'))
+                                     'miningAmount', container.getModifiedItemAttr('rookieDroneBonus'), **kwargs)
 
 
 class Effect5035(BaseEffect):
@@ -17175,10 +17219,10 @@ class Effect5035(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         for type in ('shieldCapacity', 'armorHP', 'hp'):
             fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Drones'),
-                                         type, ship.getModifiedItemAttr('rookieDroneBonus'))
+                                         type, ship.getModifiedItemAttr('rookieDroneBonus'), **kwargs)
 
 
 class Effect5036(BaseEffect):
@@ -17192,9 +17236,9 @@ class Effect5036(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Salvaging'),
-                                      'duration', ship.getModifiedItemAttr('shipBonusAF'), skill='Amarr Frigate')
+                                      'duration', ship.getModifiedItemAttr('shipBonusAF'), skill='Amarr Frigate', **kwargs)
 
 
 class Effect5045(BaseEffect):
@@ -17208,9 +17252,9 @@ class Effect5045(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Salvaging'),
-                                      'duration', ship.getModifiedItemAttr('shipBonusCF'), skill='Caldari Frigate')
+                                      'duration', ship.getModifiedItemAttr('shipBonusCF'), skill='Caldari Frigate', **kwargs)
 
 
 class Effect5048(BaseEffect):
@@ -17224,9 +17268,9 @@ class Effect5048(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Salvaging'),
-                                      'duration', ship.getModifiedItemAttr('shipBonusGF'), skill='Amarr Frigate')
+                                      'duration', ship.getModifiedItemAttr('shipBonusGF'), skill='Amarr Frigate', **kwargs)
 
 
 class Effect5051(BaseEffect):
@@ -17240,9 +17284,9 @@ class Effect5051(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Salvaging'),
-                                      'duration', ship.getModifiedItemAttr('shipBonusMF'), skill='Minmatar Frigate')
+                                      'duration', ship.getModifiedItemAttr('shipBonusMF'), skill='Minmatar Frigate', **kwargs)
 
 
 class Effect5055(BaseEffect):
@@ -17256,9 +17300,9 @@ class Effect5055(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill('Ice Harvesting'),
-                                         'duration', ship.getModifiedItemAttr('iceHarvestCycleBonus'))
+                                         'duration', ship.getModifiedItemAttr('iceHarvestCycleBonus'), **kwargs)
 
 
 class Effect5058(BaseEffect):
@@ -17272,9 +17316,9 @@ class Effect5058(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill('Mining'),
-                                         'miningAmount', module.getModifiedItemAttr('miningAmountMultiplier'))
+                                         'miningAmount', module.getModifiedItemAttr('miningAmountMultiplier'), **kwargs)
 
 
 class Effect5059(BaseEffect):
@@ -17289,9 +17333,9 @@ class Effect5059(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, container, context):
+    def handler(fit, container, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Ice Harvesting'),
-                                      'duration', container.getModifiedItemAttr('shipBonusORE3'), skill='Mining Barge')
+                                      'duration', container.getModifiedItemAttr('shipBonusORE3'), skill='Mining Barge', **kwargs)
 
 
 class Effect5066(BaseEffect):
@@ -17306,9 +17350,9 @@ class Effect5066(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Target Painting'),
-                                      'maxRange', ship.getModifiedItemAttr('shipBonusMF'), skill='Minmatar Frigate')
+                                      'maxRange', ship.getModifiedItemAttr('shipBonusMF'), skill='Minmatar Frigate', **kwargs)
 
 
 class Effect5067(BaseEffect):
@@ -17322,8 +17366,8 @@ class Effect5067(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
-        fit.ship.boostItemAttr('specialOreHoldCapacity', ship.getModifiedItemAttr('shipBonusORE2'), skill='Mining Barge')
+    def handler(fit, ship, context, **kwargs):
+        fit.ship.boostItemAttr('specialOreHoldCapacity', ship.getModifiedItemAttr('shipBonusORE2'), skill='Mining Barge', **kwargs)
 
 
 class Effect5068(BaseEffect):
@@ -17337,8 +17381,8 @@ class Effect5068(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
-        fit.ship.boostItemAttr('shieldCapacity', ship.getModifiedItemAttr('shipBonusORE2'), skill='Mining Barge')
+    def handler(fit, ship, context, **kwargs):
+        fit.ship.boostItemAttr('shieldCapacity', ship.getModifiedItemAttr('shipBonusORE2'), skill='Mining Barge', **kwargs)
 
 
 class Effect5069(BaseEffect):
@@ -17353,10 +17397,10 @@ class Effect5069(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Mercoxit Processing'),
                                         'specialisationAsteroidYieldMultiplier',
-                                        module.getModifiedItemAttr('miningAmountBonus'))
+                                        module.getModifiedItemAttr('miningAmountBonus'), **kwargs)
 
 
 class Effect5079(BaseEffect):
@@ -17370,9 +17414,9 @@ class Effect5079(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
-                                        'kineticDamage', ship.getModifiedItemAttr('shipBonusCF2'), skill='Caldari Frigate')
+                                        'kineticDamage', ship.getModifiedItemAttr('shipBonusCF2'), skill='Caldari Frigate', **kwargs)
 
 
 class Effect5080(BaseEffect):
@@ -17388,9 +17432,9 @@ class Effect5080(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
-                                        'maxVelocity', ship.getModifiedItemAttr('shipBonusCF'), skill='Caldari Frigate')
+                                        'maxVelocity', ship.getModifiedItemAttr('shipBonusCF'), skill='Caldari Frigate', **kwargs)
 
 
 class Effect5081(BaseEffect):
@@ -17404,9 +17448,9 @@ class Effect5081(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         fit.ship.boostItemAttr('maxTargetRange', module.getModifiedItemAttr('maxTargetRangeBonus'),
-                               stackingPenalties=True)
+                               stackingPenalties=True, **kwargs)
 
 
 class Effect5087(BaseEffect):
@@ -17422,10 +17466,10 @@ class Effect5087(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         for layer in ('shieldCapacity', 'armorHP', 'hp'):
             fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Drones'),
-                                         layer, ship.getModifiedItemAttr('shipBonusGF'), skill='Gallente Frigate')
+                                         layer, ship.getModifiedItemAttr('shipBonusGF'), skill='Gallente Frigate', **kwargs)
 
 
 class Effect5090(BaseEffect):
@@ -17440,9 +17484,9 @@ class Effect5090(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Operation'),
-                                      'shieldBonus', ship.getModifiedItemAttr('shipBonusMF'), skill='Minmatar Frigate')
+                                      'shieldBonus', ship.getModifiedItemAttr('shipBonusMF'), skill='Minmatar Frigate', **kwargs)
 
 
 class Effect5103(BaseEffect):
@@ -17456,9 +17500,9 @@ class Effect5103(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Emission Systems'),
-                                      'capacitorNeed', ship.getModifiedItemAttr('shipBonusCF'), skill='Caldari Frigate')
+                                      'capacitorNeed', ship.getModifiedItemAttr('shipBonusCF'), skill='Caldari Frigate', **kwargs)
 
 
 class Effect5104(BaseEffect):
@@ -17472,9 +17516,9 @@ class Effect5104(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Emission Systems'),
-                                      'shieldBonus', ship.getModifiedItemAttr('shipBonusCF2'), skill='Caldari Frigate')
+                                      'shieldBonus', ship.getModifiedItemAttr('shipBonusCF2'), skill='Caldari Frigate', **kwargs)
 
 
 class Effect5105(BaseEffect):
@@ -17488,9 +17532,9 @@ class Effect5105(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Emission Systems'),
-                                      'capacitorNeed', ship.getModifiedItemAttr('shipBonusMF'), skill='Minmatar Frigate')
+                                      'capacitorNeed', ship.getModifiedItemAttr('shipBonusMF'), skill='Minmatar Frigate', **kwargs)
 
 
 class Effect5106(BaseEffect):
@@ -17504,9 +17548,9 @@ class Effect5106(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Emission Systems'),
-                                      'shieldBonus', ship.getModifiedItemAttr('shipBonusMF2'), skill='Minmatar Frigate')
+                                      'shieldBonus', ship.getModifiedItemAttr('shipBonusMF2'), skill='Minmatar Frigate', **kwargs)
 
 
 class Effect5107(BaseEffect):
@@ -17520,9 +17564,9 @@ class Effect5107(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Remote Armor Repair Systems'), 'capacitorNeed',
-                                      src.getModifiedItemAttr('shipBonusGF'), skill='Gallente Frigate')
+                                      src.getModifiedItemAttr('shipBonusGF'), skill='Gallente Frigate', **kwargs)
 
 
 class Effect5108(BaseEffect):
@@ -17536,10 +17580,10 @@ class Effect5108(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Remote Armor Repair Systems'),
                                       'armorDamageAmount', src.getModifiedItemAttr('shipBonusGF2'),
-                                      skill='Gallente Frigate')
+                                      skill='Gallente Frigate', **kwargs)
 
 
 class Effect5109(BaseEffect):
@@ -17554,9 +17598,9 @@ class Effect5109(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Remote Armor Repair Systems'), 'capacitorNeed',
-                                      src.getModifiedItemAttr('shipBonusAF'), skill='Amarr Frigate')
+                                      src.getModifiedItemAttr('shipBonusAF'), skill='Amarr Frigate', **kwargs)
 
 
 class Effect5110(BaseEffect):
@@ -17571,9 +17615,9 @@ class Effect5110(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Remote Armor Repair Systems'),
-                                      'armorDamageAmount', src.getModifiedItemAttr('shipBonus2AF'), skill='Amarr Frigate')
+                                      'armorDamageAmount', src.getModifiedItemAttr('shipBonus2AF'), skill='Amarr Frigate', **kwargs)
 
 
 class Effect5111(BaseEffect):
@@ -17588,9 +17632,9 @@ class Effect5111(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Drones'),
-                                     'trackingSpeed', ship.getModifiedItemAttr('shipBonusGF'), skill='Gallente Frigate')
+                                     'trackingSpeed', ship.getModifiedItemAttr('shipBonusGF'), skill='Gallente Frigate', **kwargs)
 
 
 class Effect5119(BaseEffect):
@@ -17604,10 +17648,10 @@ class Effect5119(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.group.name == 'Scanner Probe',
                                         'baseSensorStrength', ship.getModifiedItemAttr('shipBonus2AF'),
-                                        skill='Amarr Frigate')
+                                        skill='Amarr Frigate', **kwargs)
 
 
 class Effect5121(BaseEffect):
@@ -17622,9 +17666,9 @@ class Effect5121(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Remote Capacitor Transmitter',
-                                      'powerTransferAmount', ship.getModifiedItemAttr('energyTransferAmountBonus'))
+                                      'powerTransferAmount', ship.getModifiedItemAttr('energyTransferAmountBonus'), **kwargs)
 
 
 class Effect5122(BaseEffect):
@@ -17638,9 +17682,9 @@ class Effect5122(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Emission Systems'),
-                                      'capacitorNeed', ship.getModifiedItemAttr('shipBonusMC'), skill='Minmatar Cruiser')
+                                      'capacitorNeed', ship.getModifiedItemAttr('shipBonusMC'), skill='Minmatar Cruiser', **kwargs)
 
 
 class Effect5123(BaseEffect):
@@ -17654,9 +17698,9 @@ class Effect5123(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Remote Armor Repair Systems'), 'capacitorNeed',
-                                      src.getModifiedItemAttr('shipBonusAC'), skill='Amarr Cruiser')
+                                      src.getModifiedItemAttr('shipBonusAC'), skill='Amarr Cruiser', **kwargs)
 
 
 class Effect5124(BaseEffect):
@@ -17670,9 +17714,9 @@ class Effect5124(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Remote Armor Repair Systems'),
-                                      'armorDamageAmount', src.getModifiedItemAttr('shipBonusAC2'), skill='Amarr Cruiser')
+                                      'armorDamageAmount', src.getModifiedItemAttr('shipBonusAC2'), skill='Amarr Cruiser', **kwargs)
 
 
 class Effect5125(BaseEffect):
@@ -17686,10 +17730,10 @@ class Effect5125(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Remote Armor Repair Systems'),
                                       'armorDamageAmount', src.getModifiedItemAttr('shipBonusGC2'),
-                                      skill='Gallente Cruiser')
+                                      skill='Gallente Cruiser', **kwargs)
 
 
 class Effect5126(BaseEffect):
@@ -17703,9 +17747,9 @@ class Effect5126(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Emission Systems'),
-                                      'shieldBonus', ship.getModifiedItemAttr('shipBonusCC2'), skill='Caldari Cruiser')
+                                      'shieldBonus', ship.getModifiedItemAttr('shipBonusCC2'), skill='Caldari Cruiser', **kwargs)
 
 
 class Effect5127(BaseEffect):
@@ -17719,9 +17763,9 @@ class Effect5127(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Emission Systems'),
-                                      'shieldBonus', ship.getModifiedItemAttr('shipBonusMC2'), skill='Minmatar Cruiser')
+                                      'shieldBonus', ship.getModifiedItemAttr('shipBonusMC2'), skill='Minmatar Cruiser', **kwargs)
 
 
 class Effect5128(BaseEffect):
@@ -17735,9 +17779,9 @@ class Effect5128(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Sensor Dampener',
-                                      'maxRange', ship.getModifiedItemAttr('shipBonusGC'), skill='Gallente Cruiser')
+                                      'maxRange', ship.getModifiedItemAttr('shipBonusGC'), skill='Gallente Cruiser', **kwargs)
 
 
 class Effect5129(BaseEffect):
@@ -17752,10 +17796,10 @@ class Effect5129(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Target Painter',
                                       'signatureRadiusBonus', ship.getModifiedItemAttr('shipBonusMC'),
-                                      skill='Minmatar Cruiser')
+                                      skill='Minmatar Cruiser', **kwargs)
 
 
 class Effect5131(BaseEffect):
@@ -17770,10 +17814,10 @@ class Effect5131(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         groups = ('Missile Launcher Heavy', 'Missile Launcher Rapid Light', 'Missile Launcher Heavy Assault')
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in groups,
-                                      'speed', ship.getModifiedItemAttr('shipBonusCC'), skill='Caldari Cruiser')
+                                      'speed', ship.getModifiedItemAttr('shipBonusCC'), skill='Caldari Cruiser', **kwargs)
 
 
 class Effect5132(BaseEffect):
@@ -17788,9 +17832,9 @@ class Effect5132(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Projectile Turret'),
-                                      'falloff', ship.getModifiedItemAttr('shipBonusMC2'), skill='Minmatar Cruiser')
+                                      'falloff', ship.getModifiedItemAttr('shipBonusMC2'), skill='Minmatar Cruiser', **kwargs)
 
 
 class Effect5133(BaseEffect):
@@ -17804,9 +17848,9 @@ class Effect5133(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Hybrid Turret'),
-                                      'damageMultiplier', ship.getModifiedItemAttr('shipBonusCC'), skill='Caldari Cruiser')
+                                      'damageMultiplier', ship.getModifiedItemAttr('shipBonusCC'), skill='Caldari Cruiser', **kwargs)
 
 
 class Effect5136(BaseEffect):
@@ -17823,9 +17867,9 @@ class Effect5136(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Energy Turret'),
-                                      'damageMultiplier', ship.getModifiedItemAttr('shipBonusAC'), skill='Amarr Cruiser')
+                                      'damageMultiplier', ship.getModifiedItemAttr('shipBonusAC'), skill='Amarr Cruiser', **kwargs)
 
 
 class Effect5139(BaseEffect):
@@ -17839,10 +17883,10 @@ class Effect5139(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Mining'),
                                       'miningAmount', module.getModifiedItemAttr('shipBonusOREfrig1'),
-                                      skill='Mining Frigate')
+                                      skill='Mining Frigate', **kwargs)
 
 
 class Effect5142(BaseEffect):
@@ -17857,9 +17901,9 @@ class Effect5142(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == 'Gas Cloud Harvester',
-                                         'miningAmount', module.getModifiedItemAttr('miningAmountMultiplier'))
+                                         'miningAmount', module.getModifiedItemAttr('miningAmountMultiplier'), **kwargs)
 
 
 class Effect5153(BaseEffect):
@@ -17874,9 +17918,9 @@ class Effect5153(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Rockets'),
-                                        'maxVelocity', ship.getModifiedItemAttr('shipBonusRole7'))
+                                        'maxVelocity', ship.getModifiedItemAttr('shipBonusRole7'), **kwargs)
 
 
 class Effect5156(BaseEffect):
@@ -17891,9 +17935,9 @@ class Effect5156(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Gas Cloud Harvester',
-                                      'duration', module.getModifiedItemAttr('shipBonusOREfrig2'), skill='Mining Frigate')
+                                      'duration', module.getModifiedItemAttr('shipBonusOREfrig2'), skill='Mining Frigate', **kwargs)
 
 
 class Effect5162(BaseEffect):
@@ -17907,12 +17951,12 @@ class Effect5162(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         lvl = src.level
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Armor Resistance Shift Hardener', 'capacitorNeed',
-                                      src.getModifiedItemAttr('capNeedBonus') * lvl)
+                                      src.getModifiedItemAttr('capNeedBonus') * lvl, **kwargs)
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Resistance Phasing'), 'capacitorNeed',
-                                      src.getModifiedItemAttr('capNeedBonus') * lvl)
+                                      src.getModifiedItemAttr('capNeedBonus') * lvl, **kwargs)
 
 
 class Effect5165(BaseEffect):
@@ -17927,9 +17971,9 @@ class Effect5165(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Drones'),
-                                     'maxVelocity', ship.getModifiedItemAttr('shipBonusRole7'))
+                                     'maxVelocity', ship.getModifiedItemAttr('shipBonusRole7'), **kwargs)
 
 
 class Effect5168(BaseEffect):
@@ -17943,10 +17987,10 @@ class Effect5168(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, container, context):
+    def handler(fit, container, context, **kwargs):
         fit.drones.filteredItemIncrease(lambda drone: drone.item.requiresSkill('Salvage Drone Operation'),
                                         'accessDifficultyBonus',
-                                        container.getModifiedItemAttr('accessDifficultyBonus') * container.level)
+                                        container.getModifiedItemAttr('accessDifficultyBonus') * container.level, **kwargs)
 
 
 class Effect5180(BaseEffect):
@@ -17960,9 +18004,9 @@ class Effect5180(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, container, context):
+    def handler(fit, container, context, **kwargs):
         fit.ship.boostItemAttr('scanGravimetricStrength',
-                               container.getModifiedItemAttr('sensorStrengthBonus') * container.level)
+                               container.getModifiedItemAttr('sensorStrengthBonus') * container.level, **kwargs)
 
 
 class Effect5181(BaseEffect):
@@ -17976,8 +18020,8 @@ class Effect5181(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, container, context):
-        fit.ship.boostItemAttr('scanLadarStrength', container.getModifiedItemAttr('sensorStrengthBonus') * container.level)
+    def handler(fit, container, context, **kwargs):
+        fit.ship.boostItemAttr('scanLadarStrength', container.getModifiedItemAttr('sensorStrengthBonus') * container.level, **kwargs)
 
 
 class Effect5182(BaseEffect):
@@ -17991,9 +18035,9 @@ class Effect5182(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, container, context):
+    def handler(fit, container, context, **kwargs):
         fit.ship.boostItemAttr('scanMagnetometricStrength',
-                               container.getModifiedItemAttr('sensorStrengthBonus') * container.level)
+                               container.getModifiedItemAttr('sensorStrengthBonus') * container.level, **kwargs)
 
 
 class Effect5183(BaseEffect):
@@ -18007,8 +18051,8 @@ class Effect5183(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, container, context):
-        fit.ship.boostItemAttr('scanRadarStrength', container.getModifiedItemAttr('sensorStrengthBonus') * container.level)
+    def handler(fit, container, context, **kwargs):
+        fit.ship.boostItemAttr('scanRadarStrength', container.getModifiedItemAttr('sensorStrengthBonus') * container.level, **kwargs)
 
 
 class Effect5185(BaseEffect):
@@ -18022,10 +18066,10 @@ class Effect5185(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Energy Nosferatu',
                                       'powerTransferAmount', ship.getModifiedItemAttr('shipBonus2AF'),
-                                      skill='Amarr Frigate')
+                                      skill='Amarr Frigate', **kwargs)
 
 
 class Effect5187(BaseEffect):
@@ -18039,10 +18083,10 @@ class Effect5187(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Sensor Dampener',
                                       'falloffEffectiveness', ship.getModifiedItemAttr('shipBonusGC'),
-                                      skill='Gallente Cruiser')
+                                      skill='Gallente Cruiser', **kwargs)
 
 
 class Effect5188(BaseEffect):
@@ -18056,10 +18100,10 @@ class Effect5188(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Hybrid Weapon',
                                       'trackingSpeed', module.getModifiedItemAttr('trackingSpeedBonus'),
-                                      stackingPenalties=True)
+                                      stackingPenalties=True, **kwargs)
 
 
 class Effect5189(BaseEffect):
@@ -18073,10 +18117,10 @@ class Effect5189(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Energy Weapon',
                                       'trackingSpeed', module.getModifiedItemAttr('trackingSpeedBonus'),
-                                      stackingPenalties=True)
+                                      stackingPenalties=True, **kwargs)
 
 
 class Effect5190(BaseEffect):
@@ -18090,10 +18134,10 @@ class Effect5190(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Projectile Weapon',
                                       'trackingSpeed', module.getModifiedItemAttr('trackingSpeedBonus'),
-                                      stackingPenalties=True)
+                                      stackingPenalties=True, **kwargs)
 
 
 class Effect5201(BaseEffect):
@@ -18107,10 +18151,10 @@ class Effect5201(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, container, context):
+    def handler(fit, container, context, **kwargs):
         level = container.level
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Armor Reinforcer',
-                                      'massAddition', container.getModifiedItemAttr('massPenaltyReduction') * level)
+                                      'massAddition', container.getModifiedItemAttr('massPenaltyReduction') * level, **kwargs)
 
 
 class Effect5205(BaseEffect):
@@ -18124,9 +18168,9 @@ class Effect5205(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Energy Turret'),
-                                      'trackingSpeed', ship.getModifiedItemAttr('rookieSETTracking'))
+                                      'trackingSpeed', ship.getModifiedItemAttr('rookieSETTracking'), **kwargs)
 
 
 class Effect5206(BaseEffect):
@@ -18140,9 +18184,9 @@ class Effect5206(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Energy Turret'),
-                                      'maxRange', ship.getModifiedItemAttr('rookieSETOptimal'))
+                                      'maxRange', ship.getModifiedItemAttr('rookieSETOptimal'), **kwargs)
 
 
 class Effect5207(BaseEffect):
@@ -18156,9 +18200,9 @@ class Effect5207(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Energy Nosferatu',
-                                      'powerTransferAmount', ship.getModifiedItemAttr('rookieNosDrain'))
+                                      'powerTransferAmount', ship.getModifiedItemAttr('rookieNosDrain'), **kwargs)
 
 
 class Effect5208(BaseEffect):
@@ -18172,9 +18216,9 @@ class Effect5208(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Energy Neutralizer',
-                                      'energyNeutralizerAmount', ship.getModifiedItemAttr('rookieNeutDrain'))
+                                      'energyNeutralizerAmount', ship.getModifiedItemAttr('rookieNeutDrain'), **kwargs)
 
 
 class Effect5209(BaseEffect):
@@ -18189,9 +18233,9 @@ class Effect5209(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Stasis Web',
-                                      'speedFactor', ship.getModifiedItemAttr('rookieWebAmount'))
+                                      'speedFactor', ship.getModifiedItemAttr('rookieWebAmount'), **kwargs)
 
 
 class Effect5212(BaseEffect):
@@ -18205,9 +18249,9 @@ class Effect5212(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.drones.filteredItemBoost(lambda mod: True,
-                                     'maxVelocity', ship.getModifiedItemAttr('rookieDroneMWDspeed'))
+                                     'maxVelocity', ship.getModifiedItemAttr('rookieDroneMWDspeed'), **kwargs)
 
 
 class Effect5213(BaseEffect):
@@ -18221,9 +18265,9 @@ class Effect5213(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Rockets'),
-                                        'maxVelocity', ship.getModifiedItemAttr('rookieRocketVelocity'))
+                                        'maxVelocity', ship.getModifiedItemAttr('rookieRocketVelocity'), **kwargs)
 
 
 class Effect5214(BaseEffect):
@@ -18237,9 +18281,9 @@ class Effect5214(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Light Missiles'),
-                                        'maxVelocity', ship.getModifiedItemAttr('rookieLightMissileVelocity'))
+                                        'maxVelocity', ship.getModifiedItemAttr('rookieLightMissileVelocity'), **kwargs)
 
 
 class Effect5215(BaseEffect):
@@ -18253,9 +18297,9 @@ class Effect5215(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Hybrid Turret'),
-                                      'trackingSpeed', ship.getModifiedItemAttr('rookieSHTTracking'))
+                                      'trackingSpeed', ship.getModifiedItemAttr('rookieSHTTracking'), **kwargs)
 
 
 class Effect5216(BaseEffect):
@@ -18269,9 +18313,9 @@ class Effect5216(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Hybrid Turret'),
-                                      'falloff', ship.getModifiedItemAttr('rookieSHTFalloff'))
+                                      'falloff', ship.getModifiedItemAttr('rookieSHTFalloff'), **kwargs)
 
 
 class Effect5217(BaseEffect):
@@ -18285,9 +18329,9 @@ class Effect5217(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Projectile Turret'),
-                                      'trackingSpeed', ship.getModifiedItemAttr('rookieSPTTracking'))
+                                      'trackingSpeed', ship.getModifiedItemAttr('rookieSPTTracking'), **kwargs)
 
 
 class Effect5218(BaseEffect):
@@ -18301,9 +18345,9 @@ class Effect5218(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Projectile Turret'),
-                                      'falloff', ship.getModifiedItemAttr('rookieSPTFalloff'))
+                                      'falloff', ship.getModifiedItemAttr('rookieSPTFalloff'), **kwargs)
 
 
 class Effect5219(BaseEffect):
@@ -18317,9 +18361,9 @@ class Effect5219(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Projectile Turret'),
-                                      'maxRange', ship.getModifiedItemAttr('rookieSPTOptimal'))
+                                      'maxRange', ship.getModifiedItemAttr('rookieSPTOptimal'), **kwargs)
 
 
 class Effect5220(BaseEffect):
@@ -18333,9 +18377,9 @@ class Effect5220(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Projectile Turret'),
-                                      'damageMultiplier', ship.getModifiedItemAttr('shipBonusRole7'))
+                                      'damageMultiplier', ship.getModifiedItemAttr('shipBonusRole7'), **kwargs)
 
 
 class Effect5221(BaseEffect):
@@ -18349,9 +18393,9 @@ class Effect5221(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Assault Missiles'),
-                                        'emDamage', ship.getModifiedItemAttr('shipBonusRole7'))
+                                        'emDamage', ship.getModifiedItemAttr('shipBonusRole7'), **kwargs)
 
 
 class Effect5222(BaseEffect):
@@ -18365,9 +18409,9 @@ class Effect5222(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Assault Missiles'),
-                                        'kineticDamage', ship.getModifiedItemAttr('shipBonusRole7'))
+                                        'kineticDamage', ship.getModifiedItemAttr('shipBonusRole7'), **kwargs)
 
 
 class Effect5223(BaseEffect):
@@ -18381,9 +18425,9 @@ class Effect5223(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Assault Missiles'),
-                                        'thermalDamage', ship.getModifiedItemAttr('shipBonusRole7'))
+                                        'thermalDamage', ship.getModifiedItemAttr('shipBonusRole7'), **kwargs)
 
 
 class Effect5224(BaseEffect):
@@ -18397,9 +18441,9 @@ class Effect5224(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Assault Missiles'),
-                                        'explosiveDamage', ship.getModifiedItemAttr('shipBonusRole7'))
+                                        'explosiveDamage', ship.getModifiedItemAttr('shipBonusRole7'), **kwargs)
 
 
 class Effect5225(BaseEffect):
@@ -18413,9 +18457,9 @@ class Effect5225(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Missiles'),
-                                        'emDamage', ship.getModifiedItemAttr('shipBonusRole7'))
+                                        'emDamage', ship.getModifiedItemAttr('shipBonusRole7'), **kwargs)
 
 
 class Effect5226(BaseEffect):
@@ -18429,9 +18473,9 @@ class Effect5226(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Missiles'),
-                                        'explosiveDamage', ship.getModifiedItemAttr('shipBonusRole7'))
+                                        'explosiveDamage', ship.getModifiedItemAttr('shipBonusRole7'), **kwargs)
 
 
 class Effect5227(BaseEffect):
@@ -18445,9 +18489,9 @@ class Effect5227(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Missiles'),
-                                        'kineticDamage', ship.getModifiedItemAttr('shipBonusRole7'))
+                                        'kineticDamage', ship.getModifiedItemAttr('shipBonusRole7'), **kwargs)
 
 
 class Effect5228(BaseEffect):
@@ -18461,9 +18505,9 @@ class Effect5228(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Missiles'),
-                                        'thermalDamage', ship.getModifiedItemAttr('shipBonusRole7'))
+                                        'thermalDamage', ship.getModifiedItemAttr('shipBonusRole7'), **kwargs)
 
 
 class Effect5229(BaseEffect):
@@ -18481,9 +18525,9 @@ class Effect5229(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, container, context):
+    def handler(fit, container, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Astrometrics'),
-                                        'baseSensorStrength', container.getModifiedItemAttr('shipBonusRole8'))
+                                        'baseSensorStrength', container.getModifiedItemAttr('shipBonusRole8'), **kwargs)
 
 
 class Effect5230(BaseEffect):
@@ -18498,11 +18542,11 @@ class Effect5230(BaseEffect):
     type = 'active'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         for damageType in ('kinetic', 'thermal', 'explosive', 'em'):
             fit.ship.boostItemAttr('shield' + damageType.capitalize() + 'DamageResonance',
                                    module.getModifiedItemAttr(damageType + 'DamageResistanceBonus'),
-                                   stackingPenalties=True)
+                                   stackingPenalties=True, **kwargs)
 
 
 class Effect5231(BaseEffect):
@@ -18517,11 +18561,11 @@ class Effect5231(BaseEffect):
     type = 'active'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         for damageType in ('kinetic', 'thermal', 'explosive', 'em'):
             fit.ship.boostItemAttr('armor%sDamageResonance' % damageType.capitalize(),
                                    module.getModifiedItemAttr('%sDamageResistanceBonus' % damageType),
-                                   stackingPenalties=True)
+                                   stackingPenalties=True, **kwargs)
 
 
 class Effect5234(BaseEffect):
@@ -18536,10 +18580,10 @@ class Effect5234(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredChargeBoost(
             lambda mod: mod.charge.requiresSkill('Rockets') or mod.charge.requiresSkill('Light Missiles'),
-            'explosiveDamage', ship.getModifiedItemAttr('shipBonusCF2'), skill='Caldari Frigate')
+            'explosiveDamage', ship.getModifiedItemAttr('shipBonusCF2'), skill='Caldari Frigate', **kwargs)
 
 
 class Effect5237(BaseEffect):
@@ -18553,10 +18597,10 @@ class Effect5237(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredChargeBoost(
             lambda mod: mod.charge.requiresSkill('Rockets') or mod.charge.requiresSkill('Light Missiles'),
-            'kineticDamage', ship.getModifiedItemAttr('shipBonusCF2'), skill='Caldari Frigate')
+            'kineticDamage', ship.getModifiedItemAttr('shipBonusCF2'), skill='Caldari Frigate', **kwargs)
 
 
 class Effect5240(BaseEffect):
@@ -18571,10 +18615,10 @@ class Effect5240(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredChargeBoost(
             lambda mod: mod.charge.requiresSkill('Rockets') or mod.charge.requiresSkill('Light Missiles'),
-            'thermalDamage', ship.getModifiedItemAttr('shipBonusCF2'), skill='Caldari Frigate')
+            'thermalDamage', ship.getModifiedItemAttr('shipBonusCF2'), skill='Caldari Frigate', **kwargs)
 
 
 class Effect5243(BaseEffect):
@@ -18589,10 +18633,10 @@ class Effect5243(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredChargeBoost(
             lambda mod: mod.charge.requiresSkill('Rockets') or mod.charge.requiresSkill('Light Missiles'),
-            'emDamage', ship.getModifiedItemAttr('shipBonusCF2'), skill='Caldari Frigate')
+            'emDamage', ship.getModifiedItemAttr('shipBonusCF2'), skill='Caldari Frigate', **kwargs)
 
 
 class Effect5259(BaseEffect):
@@ -18607,9 +18651,9 @@ class Effect5259(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Cloaking Device',
-                                      'cpu', ship.getModifiedItemAttr('eliteBonusReconShip1'), skill='Recon Ships')
+                                      'cpu', ship.getModifiedItemAttr('eliteBonusReconShip1'), skill='Recon Ships', **kwargs)
 
 
 class Effect5260(BaseEffect):
@@ -18624,9 +18668,9 @@ class Effect5260(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Cloaking'),
-                                      'cpu', ship.getModifiedItemAttr('eliteBonusCovertOps1'), skill='Covert Ops')
+                                      'cpu', ship.getModifiedItemAttr('eliteBonusCovertOps1'), skill='Covert Ops', **kwargs)
 
 
 class Effect5261(BaseEffect):
@@ -18641,8 +18685,8 @@ class Effect5261(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
-        module.increaseItemAttr('cpu', module.getModifiedItemAttr('covertCloakCPUAdd') or 0)
+    def handler(fit, module, context, **kwargs):
+        module.increaseItemAttr('cpu', module.getModifiedItemAttr('covertCloakCPUAdd') or 0, **kwargs)
 
 
 class Effect5262(BaseEffect):
@@ -18656,9 +18700,9 @@ class Effect5262(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         fit.modules.filteredItemIncrease(lambda mod: mod.item.requiresSkill('Cloaking'),
-                                         'covertCloakCPUAdd', module.getModifiedItemAttr('covertCloakCPUPenalty'))
+                                         'covertCloakCPUAdd', module.getModifiedItemAttr('covertCloakCPUPenalty'), **kwargs)
 
 
 class Effect5263(BaseEffect):
@@ -18672,9 +18716,9 @@ class Effect5263(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         fit.modules.filteredItemIncrease(lambda mod: mod.item.requiresSkill('Cynosural Field Theory'),
-                                         'covertCloakCPUAdd', module.getModifiedItemAttr('covertCloakCPUPenalty'))
+                                         'covertCloakCPUAdd', module.getModifiedItemAttr('covertCloakCPUPenalty'), **kwargs)
 
 
 class Effect5264(BaseEffect):
@@ -18689,8 +18733,8 @@ class Effect5264(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
-        module.increaseItemAttr('cpu', module.getModifiedItemAttr('warfareLinkCPUAdd') or 0)
+    def handler(fit, module, context, **kwargs):
+        module.increaseItemAttr('cpu', module.getModifiedItemAttr('warfareLinkCPUAdd') or 0, **kwargs)
 
 
 class Effect5265(BaseEffect):
@@ -18704,9 +18748,9 @@ class Effect5265(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         fit.modules.filteredItemIncrease(lambda mod: mod.item.requiresSkill('Leadership'),
-                                         'warfareLinkCPUAdd', module.getModifiedItemAttr('warfareLinkCPUPenalty'))
+                                         'warfareLinkCPUAdd', module.getModifiedItemAttr('warfareLinkCPUPenalty'), **kwargs)
 
 
 class Effect5266(BaseEffect):
@@ -18721,10 +18765,10 @@ class Effect5266(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Cloaking Device',
                                       'cpu', ship.getModifiedItemAttr('eliteIndustrialCovertCloakBonus'),
-                                      skill='Transport Ships')
+                                      skill='Transport Ships', **kwargs)
 
 
 class Effect5267(BaseEffect):
@@ -18739,9 +18783,9 @@ class Effect5267(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Repair Systems'),
-                                      'power', module.getModifiedItemAttr('drawback'))
+                                      'power', module.getModifiedItemAttr('drawback'), **kwargs)
 
 
 class Effect5268(BaseEffect):
@@ -18756,9 +18800,9 @@ class Effect5268(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Capital Repair Systems'),
-                                      'power', module.getModifiedItemAttr('drawback'))
+                                      'power', module.getModifiedItemAttr('drawback'), **kwargs)
 
 
 class Effect5275(BaseEffect):
@@ -18773,7 +18817,7 @@ class Effect5275(BaseEffect):
     type = 'active'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         if module.charge and module.charge.name == 'Nanite Repair Paste':
             multiplier = 3
         else:
@@ -18782,9 +18826,9 @@ class Effect5275(BaseEffect):
         amount = module.getModifiedItemAttr('armorDamageAmount') * multiplier
         speed = module.getModifiedItemAttr('duration') / 1000.0
         rps = amount / speed
-        fit.extraAttributes.increase('armorRepair', rps)
-        fit.extraAttributes.increase('armorRepairPreSpool', rps)
-        fit.extraAttributes.increase('armorRepairFullSpool', rps)
+        fit.extraAttributes.increase('armorRepair', rps, **kwargs)
+        fit.extraAttributes.increase('armorRepairPreSpool', rps, **kwargs)
+        fit.extraAttributes.increase('armorRepairFullSpool', rps, **kwargs)
 
 
 class Effect5293(BaseEffect):
@@ -18798,9 +18842,9 @@ class Effect5293(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Energy Turret'),
-                                      'capacitorNeed', ship.getModifiedItemAttr('shipBonusAD1'), skill='Amarr Destroyer')
+                                      'capacitorNeed', ship.getModifiedItemAttr('shipBonusAD1'), skill='Amarr Destroyer', **kwargs)
 
 
 class Effect5294(BaseEffect):
@@ -18814,9 +18858,9 @@ class Effect5294(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Energy Turret'),
-                                      'trackingSpeed', ship.getModifiedItemAttr('shipBonusAD2'), skill='Amarr Destroyer')
+                                      'trackingSpeed', ship.getModifiedItemAttr('shipBonusAD2'), skill='Amarr Destroyer', **kwargs)
 
 
 class Effect5295(BaseEffect):
@@ -18830,9 +18874,9 @@ class Effect5295(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Drones'), 'damageMultiplier',
-                                     src.getModifiedItemAttr('shipBonusAD1'), skill='Amarr Destroyer')
+                                     src.getModifiedItemAttr('shipBonusAD1'), skill='Amarr Destroyer', **kwargs)
 
 
 class Effect5300(BaseEffect):
@@ -18846,13 +18890,13 @@ class Effect5300(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Drones'), 'shieldCapacity',
-                                     src.getModifiedItemAttr('shipBonusAD1'), skill='Amarr Destroyer')
+                                     src.getModifiedItemAttr('shipBonusAD1'), skill='Amarr Destroyer', **kwargs)
         fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Drones'), 'hp',
-                                     src.getModifiedItemAttr('shipBonusAD1'), skill='Amarr Destroyer')
+                                     src.getModifiedItemAttr('shipBonusAD1'), skill='Amarr Destroyer', **kwargs)
         fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Drones'), 'armorHP',
-                                     src.getModifiedItemAttr('shipBonusAD1'), skill='Amarr Destroyer')
+                                     src.getModifiedItemAttr('shipBonusAD1'), skill='Amarr Destroyer', **kwargs)
 
 
 class Effect5303(BaseEffect):
@@ -18866,9 +18910,9 @@ class Effect5303(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Hybrid Turret'),
-                                      'maxRange', ship.getModifiedItemAttr('shipBonusCD1'), skill='Caldari Destroyer')
+                                      'maxRange', ship.getModifiedItemAttr('shipBonusCD1'), skill='Caldari Destroyer', **kwargs)
 
 
 class Effect5304(BaseEffect):
@@ -18882,9 +18926,9 @@ class Effect5304(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Hybrid Turret'),
-                                      'trackingSpeed', ship.getModifiedItemAttr('shipBonusCD2'), skill='Caldari Destroyer')
+                                      'trackingSpeed', ship.getModifiedItemAttr('shipBonusCD2'), skill='Caldari Destroyer', **kwargs)
 
 
 class Effect5305(BaseEffect):
@@ -18898,10 +18942,10 @@ class Effect5305(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Light Missiles'),
                                         'kineticDamage', ship.getModifiedItemAttr('shipBonusCD1'),
-                                        skill='Caldari Destroyer')
+                                        skill='Caldari Destroyer', **kwargs)
 
 
 class Effect5306(BaseEffect):
@@ -18915,10 +18959,10 @@ class Effect5306(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Rockets'),
                                         'kineticDamage', ship.getModifiedItemAttr('shipBonusCD1'),
-                                        skill='Caldari Destroyer')
+                                        skill='Caldari Destroyer', **kwargs)
 
 
 class Effect5307(BaseEffect):
@@ -18932,9 +18976,9 @@ class Effect5307(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Rockets'),
-                                        'aoeVelocity', ship.getModifiedItemAttr('shipBonusCD2'), skill='Caldari Destroyer')
+                                        'aoeVelocity', ship.getModifiedItemAttr('shipBonusCD2'), skill='Caldari Destroyer', **kwargs)
 
 
 class Effect5308(BaseEffect):
@@ -18948,9 +18992,9 @@ class Effect5308(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Light Missiles'),
-                                        'aoeVelocity', ship.getModifiedItemAttr('shipBonusCD2'), skill='Caldari Destroyer')
+                                        'aoeVelocity', ship.getModifiedItemAttr('shipBonusCD2'), skill='Caldari Destroyer', **kwargs)
 
 
 class Effect5309(BaseEffect):
@@ -18964,9 +19008,9 @@ class Effect5309(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Hybrid Turret'),
-                                      'falloff', ship.getModifiedItemAttr('shipBonusGD1'), skill='Gallente Destroyer')
+                                      'falloff', ship.getModifiedItemAttr('shipBonusGD1'), skill='Gallente Destroyer', **kwargs)
 
 
 class Effect5310(BaseEffect):
@@ -18981,9 +19025,9 @@ class Effect5310(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Hybrid Turret'),
-                                      'trackingSpeed', ship.getModifiedItemAttr('shipBonusGD2'), skill='Gallente Destroyer')
+                                      'trackingSpeed', ship.getModifiedItemAttr('shipBonusGD2'), skill='Gallente Destroyer', **kwargs)
 
 
 class Effect5311(BaseEffect):
@@ -18997,9 +19041,9 @@ class Effect5311(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Drones'), 'damageMultiplier',
-                                     src.getModifiedItemAttr('shipBonusGD1'), skill='Gallente Destroyer')
+                                     src.getModifiedItemAttr('shipBonusGD1'), skill='Gallente Destroyer', **kwargs)
 
 
 class Effect5316(BaseEffect):
@@ -19013,13 +19057,13 @@ class Effect5316(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Drones'), 'shieldCapacity',
-                                     src.getModifiedItemAttr('shipBonusGD1'), skill='Gallente Destroyer')
+                                     src.getModifiedItemAttr('shipBonusGD1'), skill='Gallente Destroyer', **kwargs)
         fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Drones'), 'armorHP',
-                                     src.getModifiedItemAttr('shipBonusGD1'), skill='Gallente Destroyer')
+                                     src.getModifiedItemAttr('shipBonusGD1'), skill='Gallente Destroyer', **kwargs)
         fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Drones'), 'hp',
-                                     src.getModifiedItemAttr('shipBonusGD1'), skill='Gallente Destroyer')
+                                     src.getModifiedItemAttr('shipBonusGD1'), skill='Gallente Destroyer', **kwargs)
 
 
 class Effect5317(BaseEffect):
@@ -19033,10 +19077,10 @@ class Effect5317(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Projectile Turret'),
                                       'damageMultiplier', ship.getModifiedItemAttr('shipBonusMD1'),
-                                      skill='Minmatar Destroyer')
+                                      skill='Minmatar Destroyer', **kwargs)
 
 
 class Effect5318(BaseEffect):
@@ -19050,9 +19094,9 @@ class Effect5318(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Projectile Turret'),
-                                      'trackingSpeed', ship.getModifiedItemAttr('shipBonusMD2'), skill='Minmatar Destroyer')
+                                      'trackingSpeed', ship.getModifiedItemAttr('shipBonusMD2'), skill='Minmatar Destroyer', **kwargs)
 
 
 class Effect5319(BaseEffect):
@@ -19066,10 +19110,10 @@ class Effect5319(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Light Missiles'),
                                         'explosiveDamage', ship.getModifiedItemAttr('shipBonusMD1'),
-                                        skill='Minmatar Destroyer')
+                                        skill='Minmatar Destroyer', **kwargs)
 
 
 class Effect5320(BaseEffect):
@@ -19083,10 +19127,10 @@ class Effect5320(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Rockets'),
                                         'explosiveDamage', ship.getModifiedItemAttr('shipBonusMD1'),
-                                        skill='Minmatar Destroyer')
+                                        skill='Minmatar Destroyer', **kwargs)
 
 
 class Effect5321(BaseEffect):
@@ -19100,10 +19144,10 @@ class Effect5321(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('High Speed Maneuvering'),
                                       'signatureRadiusBonus', ship.getModifiedItemAttr('shipBonusMD2'),
-                                      skill='Minmatar Destroyer')
+                                      skill='Minmatar Destroyer', **kwargs)
 
 
 class Effect5322(BaseEffect):
@@ -19118,9 +19162,9 @@ class Effect5322(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.ship.boostItemAttr('armorEmDamageResonance', ship.getModifiedItemAttr('shipBonusABC1'),
-                               skill='Amarr Battlecruiser')
+                               skill='Amarr Battlecruiser', **kwargs)
 
 
 class Effect5323(BaseEffect):
@@ -19135,9 +19179,9 @@ class Effect5323(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.ship.boostItemAttr('armorExplosiveDamageResonance', ship.getModifiedItemAttr('shipBonusABC1'),
-                               skill='Amarr Battlecruiser')
+                               skill='Amarr Battlecruiser', **kwargs)
 
 
 class Effect5324(BaseEffect):
@@ -19152,9 +19196,9 @@ class Effect5324(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.ship.boostItemAttr('armorKineticDamageResonance', ship.getModifiedItemAttr('shipBonusABC1'),
-                               skill='Amarr Battlecruiser')
+                               skill='Amarr Battlecruiser', **kwargs)
 
 
 class Effect5325(BaseEffect):
@@ -19169,9 +19213,9 @@ class Effect5325(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.ship.boostItemAttr('armorThermalDamageResonance', ship.getModifiedItemAttr('shipBonusABC1'),
-                               skill='Amarr Battlecruiser')
+                               skill='Amarr Battlecruiser', **kwargs)
 
 
 class Effect5326(BaseEffect):
@@ -19185,10 +19229,10 @@ class Effect5326(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Drones'),
                                      'damageMultiplier', ship.getModifiedItemAttr('shipBonusABC2'),
-                                     skill='Amarr Battlecruiser')
+                                     skill='Amarr Battlecruiser', **kwargs)
 
 
 class Effect5331(BaseEffect):
@@ -19202,10 +19246,10 @@ class Effect5331(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         for layer in ('shieldCapacity', 'armorHP', 'hp'):
             fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Drones'),
-                                         layer, ship.getModifiedItemAttr('shipBonusABC2'), skill='Amarr Battlecruiser')
+                                         layer, ship.getModifiedItemAttr('shipBonusABC2'), skill='Amarr Battlecruiser', **kwargs)
 
 
 class Effect5332(BaseEffect):
@@ -19219,10 +19263,10 @@ class Effect5332(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Energy Turret'),
                                       'capacitorNeed', ship.getModifiedItemAttr('shipBonusABC1'),
-                                      skill='Amarr Battlecruiser')
+                                      skill='Amarr Battlecruiser', **kwargs)
 
 
 class Effect5333(BaseEffect):
@@ -19236,10 +19280,10 @@ class Effect5333(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Energy Turret'),
                                       'damageMultiplier', ship.getModifiedItemAttr('shipBonusABC2'),
-                                      skill='Amarr Battlecruiser')
+                                      skill='Amarr Battlecruiser', **kwargs)
 
 
 class Effect5334(BaseEffect):
@@ -19253,9 +19297,9 @@ class Effect5334(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Hybrid Turret'),
-                                      'maxRange', ship.getModifiedItemAttr('shipBonusCBC1'), skill='Caldari Battlecruiser')
+                                      'maxRange', ship.getModifiedItemAttr('shipBonusCBC1'), skill='Caldari Battlecruiser', **kwargs)
 
 
 class Effect5335(BaseEffect):
@@ -19271,9 +19315,9 @@ class Effect5335(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.ship.boostItemAttr('shieldEmDamageResonance', ship.getModifiedItemAttr('shipBonusCBC2'),
-                               skill='Caldari Battlecruiser')
+                               skill='Caldari Battlecruiser', **kwargs)
 
 
 class Effect5336(BaseEffect):
@@ -19289,9 +19333,9 @@ class Effect5336(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.ship.boostItemAttr('shieldExplosiveDamageResonance', ship.getModifiedItemAttr('shipBonusCBC2'),
-                               skill='Caldari Battlecruiser')
+                               skill='Caldari Battlecruiser', **kwargs)
 
 
 class Effect5337(BaseEffect):
@@ -19307,9 +19351,9 @@ class Effect5337(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.ship.boostItemAttr('shieldKineticDamageResonance', ship.getModifiedItemAttr('shipBonusCBC2'),
-                               skill='Caldari Battlecruiser')
+                               skill='Caldari Battlecruiser', **kwargs)
 
 
 class Effect5338(BaseEffect):
@@ -19325,9 +19369,9 @@ class Effect5338(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.ship.boostItemAttr('shieldThermalDamageResonance', ship.getModifiedItemAttr('shipBonusCBC2'),
-                               skill='Caldari Battlecruiser')
+                               skill='Caldari Battlecruiser', **kwargs)
 
 
 class Effect5339(BaseEffect):
@@ -19342,10 +19386,10 @@ class Effect5339(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Assault Missiles'),
                                         'kineticDamage', ship.getModifiedItemAttr('shipBonusCBC1'),
-                                        skill='Caldari Battlecruiser')
+                                        skill='Caldari Battlecruiser', **kwargs)
 
 
 class Effect5340(BaseEffect):
@@ -19360,10 +19404,10 @@ class Effect5340(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Missiles'),
                                         'kineticDamage', ship.getModifiedItemAttr('shipBonusCBC1'),
-                                        skill='Caldari Battlecruiser')
+                                        skill='Caldari Battlecruiser', **kwargs)
 
 
 class Effect5341(BaseEffect):
@@ -19377,10 +19421,10 @@ class Effect5341(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Hybrid Turret'),
                                       'damageMultiplier', ship.getModifiedItemAttr('shipBonusGBC1'),
-                                      skill='Gallente Battlecruiser')
+                                      skill='Gallente Battlecruiser', **kwargs)
 
 
 class Effect5342(BaseEffect):
@@ -19396,10 +19440,10 @@ class Effect5342(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Repair Systems'),
                                       'armorDamageAmount', ship.getModifiedItemAttr('shipBonusGBC2'),
-                                      skill='Gallente Battlecruiser')
+                                      skill='Gallente Battlecruiser', **kwargs)
 
 
 class Effect5343(BaseEffect):
@@ -19413,10 +19457,10 @@ class Effect5343(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Drones'),
                                      'damageMultiplier', ship.getModifiedItemAttr('shipBonusGBC1'),
-                                     skill='Gallente Battlecruiser')
+                                     skill='Gallente Battlecruiser', **kwargs)
 
 
 class Effect5348(BaseEffect):
@@ -19430,10 +19474,10 @@ class Effect5348(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         for layer in ('shieldCapacity', 'armorHP', 'hp'):
             fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Drones'),
-                                         layer, ship.getModifiedItemAttr('shipBonusGBC1'), skill='Gallente Battlecruiser')
+                                         layer, ship.getModifiedItemAttr('shipBonusGBC1'), skill='Gallente Battlecruiser', **kwargs)
 
 
 class Effect5349(BaseEffect):
@@ -19447,9 +19491,9 @@ class Effect5349(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Missile Launcher Heavy',
-                                      'speed', ship.getModifiedItemAttr('shipBonusMBC2'), skill='Minmatar Battlecruiser')
+                                      'speed', ship.getModifiedItemAttr('shipBonusMBC2'), skill='Minmatar Battlecruiser', **kwargs)
 
 
 class Effect5350(BaseEffect):
@@ -19463,9 +19507,9 @@ class Effect5350(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Missile Launcher Heavy Assault',
-                                      'speed', ship.getModifiedItemAttr('shipBonusMBC2'), skill='Minmatar Battlecruiser')
+                                      'speed', ship.getModifiedItemAttr('shipBonusMBC2'), skill='Minmatar Battlecruiser', **kwargs)
 
 
 class Effect5351(BaseEffect):
@@ -19480,10 +19524,10 @@ class Effect5351(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Operation'),
                                       'shieldBonus', ship.getModifiedItemAttr('shipBonusMBC1'),
-                                      skill='Minmatar Battlecruiser')
+                                      skill='Minmatar Battlecruiser', **kwargs)
 
 
 class Effect5352(BaseEffect):
@@ -19497,10 +19541,10 @@ class Effect5352(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Projectile Turret'),
                                       'damageMultiplier', ship.getModifiedItemAttr('shipBonusMBC1'),
-                                      skill='Minmatar Battlecruiser')
+                                      skill='Minmatar Battlecruiser', **kwargs)
 
 
 class Effect5353(BaseEffect):
@@ -19514,9 +19558,9 @@ class Effect5353(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Projectile Turret'),
-                                      'speed', ship.getModifiedItemAttr('shipBonusMBC2'), skill='Minmatar Battlecruiser')
+                                      'speed', ship.getModifiedItemAttr('shipBonusMBC2'), skill='Minmatar Battlecruiser', **kwargs)
 
 
 class Effect5354(BaseEffect):
@@ -19530,10 +19574,10 @@ class Effect5354(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Large Energy Turret'),
                                       'capacitorNeed', ship.getModifiedItemAttr('shipBonusABC1'),
-                                      skill='Amarr Battlecruiser')
+                                      skill='Amarr Battlecruiser', **kwargs)
 
 
 class Effect5355(BaseEffect):
@@ -19547,10 +19591,10 @@ class Effect5355(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Large Energy Turret'),
                                       'damageMultiplier', ship.getModifiedItemAttr('shipBonusABC2'),
-                                      skill='Amarr Battlecruiser')
+                                      skill='Amarr Battlecruiser', **kwargs)
 
 
 class Effect5356(BaseEffect):
@@ -19564,9 +19608,9 @@ class Effect5356(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Large Hybrid Turret'),
-                                      'maxRange', ship.getModifiedItemAttr('shipBonusCBC1'), skill='Caldari Battlecruiser')
+                                      'maxRange', ship.getModifiedItemAttr('shipBonusCBC1'), skill='Caldari Battlecruiser', **kwargs)
 
 
 class Effect5357(BaseEffect):
@@ -19580,10 +19624,10 @@ class Effect5357(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Large Hybrid Turret'),
                                       'damageMultiplier', ship.getModifiedItemAttr('shipBonusCBC2'),
-                                      skill='Caldari Battlecruiser')
+                                      skill='Caldari Battlecruiser', **kwargs)
 
 
 class Effect5358(BaseEffect):
@@ -19597,10 +19641,10 @@ class Effect5358(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Large Hybrid Turret'),
                                       'trackingSpeed', ship.getModifiedItemAttr('shipBonusGBC1'),
-                                      skill='Gallente Battlecruiser')
+                                      skill='Gallente Battlecruiser', **kwargs)
 
 
 class Effect5359(BaseEffect):
@@ -19614,10 +19658,10 @@ class Effect5359(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Large Hybrid Turret'),
                                       'damageMultiplier', ship.getModifiedItemAttr('shipBonusGBC2'),
-                                      skill='Gallente Battlecruiser')
+                                      skill='Gallente Battlecruiser', **kwargs)
 
 
 class Effect5360(BaseEffect):
@@ -19631,9 +19675,9 @@ class Effect5360(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Large Projectile Turret'),
-                                      'speed', ship.getModifiedItemAttr('shipBonusMBC1'), skill='Minmatar Battlecruiser')
+                                      'speed', ship.getModifiedItemAttr('shipBonusMBC1'), skill='Minmatar Battlecruiser', **kwargs)
 
 
 class Effect5361(BaseEffect):
@@ -19647,9 +19691,9 @@ class Effect5361(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Large Projectile Turret'),
-                                      'falloff', ship.getModifiedItemAttr('shipBonusMBC2'), skill='Minmatar Battlecruiser')
+                                      'falloff', ship.getModifiedItemAttr('shipBonusMBC2'), skill='Minmatar Battlecruiser', **kwargs)
 
 
 class Effect5364(BaseEffect):
@@ -19665,10 +19709,10 @@ class Effect5364(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, booster, context):
+    def handler(fit, booster, context, **kwargs):
         fit.modules.filteredItemBoost(
             lambda mod: mod.item.requiresSkill('Repair Systems') or mod.item.requiresSkill('Capital Repair Systems'),
-            'armorDamageAmount', booster.getModifiedItemAttr('armorDamageAmountBonus') or 0)
+            'armorDamageAmount', booster.getModifiedItemAttr('armorDamageAmountBonus') or 0, **kwargs)
 
 
 class Effect5365(BaseEffect):
@@ -19683,10 +19727,10 @@ class Effect5365(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Repair Systems'),
                                       'armorDamageAmount', ship.getModifiedItemAttr('eliteBonusViolators2'),
-                                      skill='Marauders')
+                                      skill='Marauders', **kwargs)
 
 
 class Effect5366(BaseEffect):
@@ -19700,9 +19744,9 @@ class Effect5366(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Repair Systems'),
-                                      'armorDamageAmount', ship.getModifiedItemAttr('shipBonusATC2'))
+                                      'armorDamageAmount', ship.getModifiedItemAttr('shipBonusATC2'), **kwargs)
 
 
 class Effect5367(BaseEffect):
@@ -19716,10 +19760,10 @@ class Effect5367(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Repair Systems'),
                                       'armorDamageAmount', ship.getModifiedItemAttr('shipBonusGB2'),
-                                      skill='Gallente Battleship')
+                                      skill='Gallente Battleship', **kwargs)
 
 
 class Effect5378(BaseEffect):
@@ -19733,10 +19777,10 @@ class Effect5378(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Missiles'),
                                         'aoeCloudSize', ship.getModifiedItemAttr('shipBonusCBC1'),
-                                        skill='Caldari Battlecruiser')
+                                        skill='Caldari Battlecruiser', **kwargs)
 
 
 class Effect5379(BaseEffect):
@@ -19750,10 +19794,10 @@ class Effect5379(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Assault Missiles'),
                                         'aoeCloudSize', ship.getModifiedItemAttr('shipBonusCBC1'),
-                                        skill='Caldari Battlecruiser')
+                                        skill='Caldari Battlecruiser', **kwargs)
 
 
 class Effect5380(BaseEffect):
@@ -19767,10 +19811,10 @@ class Effect5380(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Hybrid Turret'),
                                       'trackingSpeed', ship.getModifiedItemAttr('shipBonusGBC2'),
-                                      skill='Gallente Battlecruiser')
+                                      skill='Gallente Battlecruiser', **kwargs)
 
 
 class Effect5381(BaseEffect):
@@ -19784,10 +19828,10 @@ class Effect5381(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Energy Turret'),
                                       'trackingSpeed', ship.getModifiedItemAttr('shipBonusABC1'),
-                                      skill='Amarr Battlecruiser')
+                                      skill='Amarr Battlecruiser', **kwargs)
 
 
 class Effect5382(BaseEffect):
@@ -19802,9 +19846,9 @@ class Effect5382(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Energy Turret'),
-                                      'maxRange', ship.getModifiedItemAttr('shipBonusAC2'), skill='Amarr Cruiser')
+                                      'maxRange', ship.getModifiedItemAttr('shipBonusAC2'), skill='Amarr Cruiser', **kwargs)
 
 
 class Effect5383(BaseEffect):
@@ -19819,9 +19863,9 @@ class Effect5383(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
-                                        'emDamage', ship.getModifiedItemAttr('shipBonusCC'), skill='Caldari Cruiser')
+                                        'emDamage', ship.getModifiedItemAttr('shipBonusCC'), skill='Caldari Cruiser', **kwargs)
 
 
 class Effect5384(BaseEffect):
@@ -19836,9 +19880,9 @@ class Effect5384(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
-                                        'thermalDamage', ship.getModifiedItemAttr('shipBonusCC'), skill='Caldari Cruiser')
+                                        'thermalDamage', ship.getModifiedItemAttr('shipBonusCC'), skill='Caldari Cruiser', **kwargs)
 
 
 class Effect5385(BaseEffect):
@@ -19853,9 +19897,9 @@ class Effect5385(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
-                                        'explosiveDamage', ship.getModifiedItemAttr('shipBonusCC'), skill='Caldari Cruiser')
+                                        'explosiveDamage', ship.getModifiedItemAttr('shipBonusCC'), skill='Caldari Cruiser', **kwargs)
 
 
 class Effect5386(BaseEffect):
@@ -19869,9 +19913,9 @@ class Effect5386(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
-                                        'kineticDamage', ship.getModifiedItemAttr('shipBonusCC2'), skill='Caldari Cruiser')
+                                        'kineticDamage', ship.getModifiedItemAttr('shipBonusCC2'), skill='Caldari Cruiser', **kwargs)
 
 
 class Effect5387(BaseEffect):
@@ -19885,9 +19929,9 @@ class Effect5387(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Assault Missiles'),
-                                        'aoeCloudSize', ship.getModifiedItemAttr('shipBonusCC2'), skill='Caldari Cruiser')
+                                        'aoeCloudSize', ship.getModifiedItemAttr('shipBonusCC2'), skill='Caldari Cruiser', **kwargs)
 
 
 class Effect5388(BaseEffect):
@@ -19901,9 +19945,9 @@ class Effect5388(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Missiles'),
-                                        'aoeCloudSize', ship.getModifiedItemAttr('shipBonusCC2'), skill='Caldari Cruiser')
+                                        'aoeCloudSize', ship.getModifiedItemAttr('shipBonusCC2'), skill='Caldari Cruiser', **kwargs)
 
 
 class Effect5389(BaseEffect):
@@ -19917,9 +19961,9 @@ class Effect5389(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Drones'),
-                                     'trackingSpeed', ship.getModifiedItemAttr('shipBonusGC'), skill='Gallente Cruiser')
+                                     'trackingSpeed', ship.getModifiedItemAttr('shipBonusGC'), skill='Gallente Cruiser', **kwargs)
 
 
 class Effect5397(BaseEffect):
@@ -19933,11 +19977,11 @@ class Effect5397(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Astrometrics'),
                                         'baseMaxScanDeviation',
                                         module.getModifiedItemAttr('maxScanDeviationModifierModule'),
-                                        stackingPenalties=True)
+                                        stackingPenalties=True, **kwargs)
 
 
 class Effect5398(BaseEffect):
@@ -19951,9 +19995,9 @@ class Effect5398(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Astrometrics'),
-                                      'duration', module.getModifiedItemAttr('scanDurationBonus'))
+                                      'duration', module.getModifiedItemAttr('scanDurationBonus'), **kwargs)
 
 
 class Effect5399(BaseEffect):
@@ -19967,10 +20011,10 @@ class Effect5399(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Astrometrics'),
                                         'baseSensorStrength', module.getModifiedItemAttr('scanStrengthBonusModule'),
-                                        stackingPenalties=True)
+                                        stackingPenalties=True, **kwargs)
 
 
 class Effect5402(BaseEffect):
@@ -19984,10 +20028,10 @@ class Effect5402(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Assault Missiles'),
                                         'maxVelocity', ship.getModifiedItemAttr('shipBonusABC2'),
-                                        skill='Amarr Battlecruiser')
+                                        skill='Amarr Battlecruiser', **kwargs)
 
 
 class Effect5403(BaseEffect):
@@ -20001,10 +20045,10 @@ class Effect5403(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Missiles'),
                                         'maxVelocity', ship.getModifiedItemAttr('shipBonusABC2'),
-                                        skill='Amarr Battlecruiser')
+                                        skill='Amarr Battlecruiser', **kwargs)
 
 
 class Effect5410(BaseEffect):
@@ -20018,10 +20062,10 @@ class Effect5410(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Energy Turret'),
                                       'capacitorNeed', ship.getModifiedItemAttr('shipBonusABC2'),
-                                      skill='Amarr Battlecruiser')
+                                      skill='Amarr Battlecruiser', **kwargs)
 
 
 class Effect5411(BaseEffect):
@@ -20035,9 +20079,9 @@ class Effect5411(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
-                                        'maxVelocity', ship.getModifiedItemAttr('shipBonusCD1'), skill='Caldari Destroyer')
+                                        'maxVelocity', ship.getModifiedItemAttr('shipBonusCD1'), skill='Caldari Destroyer', **kwargs)
 
 
 class Effect5417(BaseEffect):
@@ -20051,9 +20095,9 @@ class Effect5417(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Drones'),
-                                     'damageMultiplier', ship.getModifiedItemAttr('shipBonusAB'), skill='Amarr Battleship')
+                                     'damageMultiplier', ship.getModifiedItemAttr('shipBonusAB'), skill='Amarr Battleship', **kwargs)
 
 
 class Effect5418(BaseEffect):
@@ -20067,9 +20111,9 @@ class Effect5418(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Drones'),
-                                     'armorHP', ship.getModifiedItemAttr('shipBonusAB'), skill='Amarr Battleship')
+                                     'armorHP', ship.getModifiedItemAttr('shipBonusAB'), skill='Amarr Battleship', **kwargs)
 
 
 class Effect5419(BaseEffect):
@@ -20083,9 +20127,9 @@ class Effect5419(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Drones'),
-                                     'shieldCapacity', ship.getModifiedItemAttr('shipBonusAB'), skill='Amarr Battleship')
+                                     'shieldCapacity', ship.getModifiedItemAttr('shipBonusAB'), skill='Amarr Battleship', **kwargs)
 
 
 class Effect5420(BaseEffect):
@@ -20099,9 +20143,9 @@ class Effect5420(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Drones'),
-                                     'hp', ship.getModifiedItemAttr('shipBonusAB'), skill='Amarr Battleship')
+                                     'hp', ship.getModifiedItemAttr('shipBonusAB'), skill='Amarr Battleship', **kwargs)
 
 
 class Effect5424(BaseEffect):
@@ -20116,9 +20160,9 @@ class Effect5424(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Large Hybrid Turret'),
-                                      'speed', ship.getModifiedItemAttr('shipBonusGB'), skill='Gallente Battleship')
+                                      'speed', ship.getModifiedItemAttr('shipBonusGB'), skill='Gallente Battleship', **kwargs)
 
 
 class Effect5427(BaseEffect):
@@ -20132,9 +20176,9 @@ class Effect5427(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Drones'),
-                                     'trackingSpeed', ship.getModifiedItemAttr('shipBonusGB'), skill='Gallente Battleship')
+                                     'trackingSpeed', ship.getModifiedItemAttr('shipBonusGB'), skill='Gallente Battleship', **kwargs)
 
 
 class Effect5428(BaseEffect):
@@ -20148,9 +20192,9 @@ class Effect5428(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Drones'),
-                                     'maxRange', ship.getModifiedItemAttr('shipBonusGB'), skill='Gallente Battleship')
+                                     'maxRange', ship.getModifiedItemAttr('shipBonusGB'), skill='Gallente Battleship', **kwargs)
 
 
 class Effect5429(BaseEffect):
@@ -20164,10 +20208,10 @@ class Effect5429(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Torpedoes'),
                                         'aoeVelocity', ship.getModifiedItemAttr('shipBonusMB2'),
-                                        skill='Minmatar Battleship')
+                                        skill='Minmatar Battleship', **kwargs)
 
 
 class Effect5430(BaseEffect):
@@ -20181,10 +20225,10 @@ class Effect5430(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Cruise Missiles'),
                                         'aoeVelocity', ship.getModifiedItemAttr('shipBonusMB2'),
-                                        skill='Minmatar Battleship')
+                                        skill='Minmatar Battleship', **kwargs)
 
 
 class Effect5431(BaseEffect):
@@ -20199,9 +20243,9 @@ class Effect5431(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Large Energy Turret'),
-                                      'trackingSpeed', ship.getModifiedItemAttr('shipBonusAB'), skill='Amarr Battleship')
+                                      'trackingSpeed', ship.getModifiedItemAttr('shipBonusAB'), skill='Amarr Battleship', **kwargs)
 
 
 class Effect5433(BaseEffect):
@@ -20219,10 +20263,10 @@ class Effect5433(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, container, context):
+    def handler(fit, container, context, **kwargs):
         level = container.level if 'skill' in context else 1
         fit.modules.filteredItemIncrease(lambda mod: mod.item.requiresSkill('Hacking'),
-                                         'virusCoherence', container.getModifiedItemAttr('virusCoherenceBonus') * level)
+                                         'virusCoherence', container.getModifiedItemAttr('virusCoherenceBonus') * level, **kwargs)
 
 
 class Effect5437(BaseEffect):
@@ -20239,10 +20283,10 @@ class Effect5437(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, container, context):
+    def handler(fit, container, context, **kwargs):
         level = container.level if 'skill' in context else 1
         fit.modules.filteredItemIncrease(lambda mod: mod.item.requiresSkill('Archaeology'),
-                                         'virusCoherence', container.getModifiedItemAttr('virusCoherenceBonus') * level)
+                                         'virusCoherence', container.getModifiedItemAttr('virusCoherenceBonus') * level, **kwargs)
 
 
 class Effect5440(BaseEffect):
@@ -20257,10 +20301,10 @@ class Effect5440(BaseEffect):
     type = ('projected', 'passive')
 
     @staticmethod
-    def handler(fit, beacon, context):
+    def handler(fit, beacon, context, **kwargs):
         fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill('Light Missiles'),
                                            'kineticDamage', beacon.getModifiedItemAttr('smallWeaponDamageMultiplier'),
-                                           stackingPenalties=True, penaltyGroup='postMul')
+                                           stackingPenalties=True, penaltyGroup='postMul', **kwargs)
 
 
 class Effect5444(BaseEffect):
@@ -20274,9 +20318,9 @@ class Effect5444(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Torpedoes'),
-                                        'aoeCloudSize', ship.getModifiedItemAttr('shipBonusCB'), skill='Caldari Battleship')
+                                        'aoeCloudSize', ship.getModifiedItemAttr('shipBonusCB'), skill='Caldari Battleship', **kwargs)
 
 
 class Effect5445(BaseEffect):
@@ -20290,9 +20334,9 @@ class Effect5445(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Cruise Missiles'),
-                                        'aoeCloudSize', ship.getModifiedItemAttr('shipBonusCB'), skill='Caldari Battleship')
+                                        'aoeCloudSize', ship.getModifiedItemAttr('shipBonusCB'), skill='Caldari Battleship', **kwargs)
 
 
 class Effect5456(BaseEffect):
@@ -20306,9 +20350,9 @@ class Effect5456(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Missile Launcher Cruise',
-                                      'speed', ship.getModifiedItemAttr('shipBonusCB'), skill='Caldari Battleship')
+                                      'speed', ship.getModifiedItemAttr('shipBonusCB'), skill='Caldari Battleship', **kwargs)
 
 
 class Effect5457(BaseEffect):
@@ -20322,9 +20366,9 @@ class Effect5457(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Missile Launcher Torpedo',
-                                      'speed', ship.getModifiedItemAttr('shipBonusCB'), skill='Caldari Battleship')
+                                      'speed', ship.getModifiedItemAttr('shipBonusCB'), skill='Caldari Battleship', **kwargs)
 
 
 class Effect5459(BaseEffect):
@@ -20338,8 +20382,8 @@ class Effect5459(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
-        fit.modules.filteredItemIncrease(lambda mod: mod.item.requiresSkill('Hacking'), 'virusStrength', src.getModifiedItemAttr('virusStrengthBonus'))
+    def handler(fit, src, context, **kwargs):
+        fit.modules.filteredItemIncrease(lambda mod: mod.item.requiresSkill('Hacking'), 'virusStrength', src.getModifiedItemAttr('virusStrengthBonus'), **kwargs)
 
 
 class Effect5460(BaseEffect):
@@ -20361,11 +20405,11 @@ class Effect5460(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, container, context):
+    def handler(fit, container, context, **kwargs):
         level = container.level if 'skill' in context else 1
         fit.modules.filteredItemIncrease(
             lambda mod: (mod.item.requiresSkill('Hacking') or mod.item.requiresSkill('Archaeology')),
-            'virusStrength', container.getModifiedItemAttr('virusStrengthBonus') * level)
+            'virusStrength', container.getModifiedItemAttr('virusStrengthBonus') * level, **kwargs)
 
 
 class Effect5461(BaseEffect):
@@ -20379,8 +20423,8 @@ class Effect5461(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
-        fit.ship.boostItemAttr('shieldRechargeRate', module.getModifiedItemAttr('rechargeratebonus') or 0)
+    def handler(fit, module, context, **kwargs):
+        fit.ship.boostItemAttr('shieldRechargeRate', module.getModifiedItemAttr('rechargeratebonus') or 0, **kwargs)
 
 
 class Effect5468(BaseEffect):
@@ -20394,8 +20438,8 @@ class Effect5468(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
-        fit.ship.boostItemAttr('agility', ship.getModifiedItemAttr('shipBonusCI2'), skill='Caldari Industrial')
+    def handler(fit, ship, context, **kwargs):
+        fit.ship.boostItemAttr('agility', ship.getModifiedItemAttr('shipBonusCI2'), skill='Caldari Industrial', **kwargs)
 
 
 class Effect5469(BaseEffect):
@@ -20409,8 +20453,8 @@ class Effect5469(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
-        fit.ship.boostItemAttr('agility', ship.getModifiedItemAttr('shipBonusMI2'), skill='Minmatar Industrial')
+    def handler(fit, ship, context, **kwargs):
+        fit.ship.boostItemAttr('agility', ship.getModifiedItemAttr('shipBonusMI2'), skill='Minmatar Industrial', **kwargs)
 
 
 class Effect5470(BaseEffect):
@@ -20424,8 +20468,8 @@ class Effect5470(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
-        fit.ship.boostItemAttr('agility', ship.getModifiedItemAttr('shipBonusGI2'), skill='Gallente Industrial')
+    def handler(fit, ship, context, **kwargs):
+        fit.ship.boostItemAttr('agility', ship.getModifiedItemAttr('shipBonusGI2'), skill='Gallente Industrial', **kwargs)
 
 
 class Effect5471(BaseEffect):
@@ -20439,8 +20483,8 @@ class Effect5471(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
-        fit.ship.boostItemAttr('agility', ship.getModifiedItemAttr('shipBonusAI2'), skill='Amarr Industrial')
+    def handler(fit, ship, context, **kwargs):
+        fit.ship.boostItemAttr('agility', ship.getModifiedItemAttr('shipBonusAI2'), skill='Amarr Industrial', **kwargs)
 
 
 class Effect5476(BaseEffect):
@@ -20454,9 +20498,9 @@ class Effect5476(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.ship.boostItemAttr('specialOreHoldCapacity', ship.getModifiedItemAttr('shipBonusGI2'),
-                               skill='Gallente Industrial')
+                               skill='Gallente Industrial', **kwargs)
 
 
 class Effect5477(BaseEffect):
@@ -20470,9 +20514,9 @@ class Effect5477(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.ship.boostItemAttr('specialAmmoHoldCapacity', ship.getModifiedItemAttr('shipBonusMI2'),
-                               skill='Minmatar Industrial')
+                               skill='Minmatar Industrial', **kwargs)
 
 
 class Effect5478(BaseEffect):
@@ -20486,9 +20530,9 @@ class Effect5478(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.ship.boostItemAttr('specialPlanetaryCommoditiesHoldCapacity', ship.getModifiedItemAttr('shipBonusGI2'),
-                               skill='Gallente Industrial')
+                               skill='Gallente Industrial', **kwargs)
 
 
 class Effect5479(BaseEffect):
@@ -20502,9 +20546,9 @@ class Effect5479(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.ship.boostItemAttr('specialMineralHoldCapacity', ship.getModifiedItemAttr('shipBonusGI2'),
-                               skill='Gallente Industrial')
+                               skill='Gallente Industrial', **kwargs)
 
 
 class Effect5480(BaseEffect):
@@ -20519,9 +20563,9 @@ class Effect5480(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, implant, context):
+    def handler(fit, implant, context, **kwargs):
         fit.appliedImplants.filteredItemMultiply(lambda mod: mod.item.group.name == 'Special Edition Implant',
-                                                 'implantBonusVelocity', implant.getModifiedItemAttr('implantSetChristmas'))
+                                                 'implantBonusVelocity', implant.getModifiedItemAttr('implantSetChristmas'), **kwargs)
 
 
 class Effect5482(BaseEffect):
@@ -20536,9 +20580,9 @@ class Effect5482(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, implant, context):
+    def handler(fit, implant, context, **kwargs):
         fit.appliedImplants.filteredItemMultiply(lambda mod: mod.item.group.name == 'Special Edition Implant',
-                                                 'agilityBonus', implant.getModifiedItemAttr('implantSetChristmas'))
+                                                 'agilityBonus', implant.getModifiedItemAttr('implantSetChristmas'), **kwargs)
 
 
 class Effect5483(BaseEffect):
@@ -20553,9 +20597,9 @@ class Effect5483(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, implant, context):
+    def handler(fit, implant, context, **kwargs):
         fit.appliedImplants.filteredItemMultiply(lambda mod: mod.item.group.name == 'Special Edition Implant',
-                                                 'shieldCapacityBonus', implant.getModifiedItemAttr('implantSetChristmas'))
+                                                 'shieldCapacityBonus', implant.getModifiedItemAttr('implantSetChristmas'), **kwargs)
 
 
 class Effect5484(BaseEffect):
@@ -20570,9 +20614,9 @@ class Effect5484(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, implant, context):
+    def handler(fit, implant, context, **kwargs):
         fit.appliedImplants.filteredItemMultiply(lambda mod: mod.item.group.name == 'Special Edition Implant',
-                                                 'armorHpBonus2', implant.getModifiedItemAttr('implantSetChristmas'))
+                                                 'armorHpBonus2', implant.getModifiedItemAttr('implantSetChristmas'), **kwargs)
 
 
 class Effect5485(BaseEffect):
@@ -20586,9 +20630,9 @@ class Effect5485(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Projectile Turret'),
-                                      'maxRange', ship.getModifiedItemAttr('shipBonusMF'), skill='Minmatar Frigate')
+                                      'maxRange', ship.getModifiedItemAttr('shipBonusMF'), skill='Minmatar Frigate', **kwargs)
 
 
 class Effect5486(BaseEffect):
@@ -20602,10 +20646,10 @@ class Effect5486(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Projectile Turret'),
                                       'damageMultiplier', ship.getModifiedItemAttr('shipBonusMBC2'),
-                                      skill='Minmatar Battlecruiser')
+                                      skill='Minmatar Battlecruiser', **kwargs)
 
 
 class Effect5496(BaseEffect):
@@ -20620,9 +20664,9 @@ class Effect5496(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Missile Launcher Heavy Assault',
-                                      'speed', ship.getModifiedItemAttr('eliteBonusCommandShips1'), skill='Command Ships')
+                                      'speed', ship.getModifiedItemAttr('eliteBonusCommandShips1'), skill='Command Ships', **kwargs)
 
 
 class Effect5497(BaseEffect):
@@ -20637,9 +20681,9 @@ class Effect5497(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Missile Launcher Heavy',
-                                      'speed', ship.getModifiedItemAttr('eliteBonusCommandShips1'), skill='Command Ships')
+                                      'speed', ship.getModifiedItemAttr('eliteBonusCommandShips1'), skill='Command Ships', **kwargs)
 
 
 class Effect5498(BaseEffect):
@@ -20653,10 +20697,10 @@ class Effect5498(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Assault Missiles'),
                                         'aoeVelocity', ship.getModifiedItemAttr('eliteBonusCommandShips2'),
-                                        skill='Command Ships')
+                                        skill='Command Ships', **kwargs)
 
 
 class Effect5499(BaseEffect):
@@ -20670,10 +20714,10 @@ class Effect5499(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Assault Missiles'),
                                         'aoeCloudSize', ship.getModifiedItemAttr('eliteBonusCommandShips2'),
-                                        skill='Command Ships')
+                                        skill='Command Ships', **kwargs)
 
 
 class Effect5500(BaseEffect):
@@ -20687,10 +20731,10 @@ class Effect5500(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Missiles'),
                                         'aoeCloudSize', ship.getModifiedItemAttr('eliteBonusCommandShips2'),
-                                        skill='Command Ships')
+                                        skill='Command Ships', **kwargs)
 
 
 class Effect5501(BaseEffect):
@@ -20704,10 +20748,10 @@ class Effect5501(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Hybrid Turret'),
                                       'damageMultiplier', ship.getModifiedItemAttr('eliteBonusCommandShips2'),
-                                      skill='Command Ships')
+                                      skill='Command Ships', **kwargs)
 
 
 class Effect5502(BaseEffect):
@@ -20721,10 +20765,10 @@ class Effect5502(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Hybrid Turret'),
                                       'trackingSpeed', ship.getModifiedItemAttr('eliteBonusCommandShips1'),
-                                      skill='Command Ships')
+                                      skill='Command Ships', **kwargs)
 
 
 class Effect5503(BaseEffect):
@@ -20738,10 +20782,10 @@ class Effect5503(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Heavy Drone Operation'),
                                      'trackingSpeed', ship.getModifiedItemAttr('eliteBonusCommandShips2'),
-                                     skill='Command Ships')
+                                     skill='Command Ships', **kwargs)
 
 
 class Effect5504(BaseEffect):
@@ -20755,10 +20799,10 @@ class Effect5504(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Heavy Drone Operation'),
                                      'maxVelocity', ship.getModifiedItemAttr('eliteBonusCommandShips2'),
-                                     skill='Command Ships')
+                                     skill='Command Ships', **kwargs)
 
 
 class Effect5505(BaseEffect):
@@ -20772,9 +20816,9 @@ class Effect5505(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Hybrid Turret'),
-                                      'speed', ship.getModifiedItemAttr('eliteBonusCommandShips1'), skill='Command Ships')
+                                      'speed', ship.getModifiedItemAttr('eliteBonusCommandShips1'), skill='Command Ships', **kwargs)
 
 
 class Effect5514(BaseEffect):
@@ -20788,12 +20832,12 @@ class Effect5514(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         damageTypes = ('em', 'explosive', 'kinetic', 'thermal')
         for damageType in damageTypes:
             fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Assault Missiles'),
                                             '{0}Damage'.format(damageType),
-                                            ship.getModifiedItemAttr('eliteBonusCommandShips2'), skill='Command Ships')
+                                            ship.getModifiedItemAttr('eliteBonusCommandShips2'), skill='Command Ships', **kwargs)
 
 
 class Effect5521(BaseEffect):
@@ -20807,12 +20851,12 @@ class Effect5521(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         damageTypes = ('em', 'explosive', 'kinetic', 'thermal')
         for damageType in damageTypes:
             fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Missiles'),
                                             '{0}Damage'.format(damageType),
-                                            ship.getModifiedItemAttr('eliteBonusCommandShips2'), skill='Command Ships')
+                                            ship.getModifiedItemAttr('eliteBonusCommandShips2'), skill='Command Ships', **kwargs)
 
 
 class Effect5539(BaseEffect):
@@ -20826,9 +20870,9 @@ class Effect5539(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Missiles'),
-                                        'kineticDamage', ship.getModifiedItemAttr('shipBonusAC'), skill='Amarr Cruiser')
+                                        'kineticDamage', ship.getModifiedItemAttr('shipBonusAC'), skill='Amarr Cruiser', **kwargs)
 
 
 class Effect5540(BaseEffect):
@@ -20842,9 +20886,9 @@ class Effect5540(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Missiles'),
-                                        'emDamage', ship.getModifiedItemAttr('shipBonusAC'), skill='Amarr Cruiser')
+                                        'emDamage', ship.getModifiedItemAttr('shipBonusAC'), skill='Amarr Cruiser', **kwargs)
 
 
 class Effect5541(BaseEffect):
@@ -20858,9 +20902,9 @@ class Effect5541(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Missiles'),
-                                        'thermalDamage', ship.getModifiedItemAttr('shipBonusAC'), skill='Amarr Cruiser')
+                                        'thermalDamage', ship.getModifiedItemAttr('shipBonusAC'), skill='Amarr Cruiser', **kwargs)
 
 
 class Effect5542(BaseEffect):
@@ -20874,9 +20918,9 @@ class Effect5542(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Missiles'),
-                                        'explosiveDamage', ship.getModifiedItemAttr('shipBonusAC'), skill='Amarr Cruiser')
+                                        'explosiveDamage', ship.getModifiedItemAttr('shipBonusAC'), skill='Amarr Cruiser', **kwargs)
 
 
 class Effect5552(BaseEffect):
@@ -20890,10 +20934,10 @@ class Effect5552(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Missiles'),
                                         'maxVelocity', ship.getModifiedItemAttr('eliteBonusHeavyGunship1'),
-                                        skill='Heavy Assault Cruisers')
+                                        skill='Heavy Assault Cruisers', **kwargs)
 
 
 class Effect5553(BaseEffect):
@@ -20907,10 +20951,10 @@ class Effect5553(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Assault Missiles'),
                                         'maxVelocity', ship.getModifiedItemAttr('eliteBonusHeavyGunship1'),
-                                        skill='Heavy Assault Cruisers')
+                                        skill='Heavy Assault Cruisers', **kwargs)
 
 
 class Effect5554(BaseEffect):
@@ -20924,10 +20968,10 @@ class Effect5554(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Repair Systems'),
                                       'armorDamageAmount', ship.getModifiedItemAttr('shipBonusGC2'),
-                                      skill='Gallente Cruiser')
+                                      skill='Gallente Cruiser', **kwargs)
 
 
 class Effect5555(BaseEffect):
@@ -20941,9 +20985,9 @@ class Effect5555(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Heavy Drone Operation'),
-                                     'maxVelocity', ship.getModifiedItemAttr('shipBonusGC'), skill='Gallente Cruiser')
+                                     'maxVelocity', ship.getModifiedItemAttr('shipBonusGC'), skill='Gallente Cruiser', **kwargs)
 
 
 class Effect5556(BaseEffect):
@@ -20957,9 +21001,9 @@ class Effect5556(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Heavy Drone Operation'),
-                                     'trackingSpeed', ship.getModifiedItemAttr('shipBonusGC'), skill='Gallente Cruiser')
+                                     'trackingSpeed', ship.getModifiedItemAttr('shipBonusGC'), skill='Gallente Cruiser', **kwargs)
 
 
 class Effect5557(BaseEffect):
@@ -20973,10 +21017,10 @@ class Effect5557(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Sentry Drone Interfacing'),
                                      'maxRange', ship.getModifiedItemAttr('eliteBonusHeavyGunship2'),
-                                     skill='Heavy Assault Cruisers')
+                                     skill='Heavy Assault Cruisers', **kwargs)
 
 
 class Effect5558(BaseEffect):
@@ -20990,10 +21034,10 @@ class Effect5558(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Sentry Drone Interfacing'),
                                      'trackingSpeed', ship.getModifiedItemAttr('eliteBonusHeavyGunship2'),
-                                     skill='Heavy Assault Cruisers')
+                                     skill='Heavy Assault Cruisers', **kwargs)
 
 
 class Effect5559(BaseEffect):
@@ -21007,9 +21051,9 @@ class Effect5559(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Operation'),
-                                      'shieldBonus', ship.getModifiedItemAttr('shipBonusMC2'), skill='Minmatar Cruiser')
+                                      'shieldBonus', ship.getModifiedItemAttr('shipBonusMC2'), skill='Minmatar Cruiser', **kwargs)
 
 
 class Effect5560(BaseEffect):
@@ -21023,9 +21067,9 @@ class Effect5560(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Micro Jump Drive',
-                                      'moduleReactivationDelay', ship.getModifiedItemAttr('roleBonusMarauder'))
+                                      'moduleReactivationDelay', ship.getModifiedItemAttr('roleBonusMarauder'), **kwargs)
 
 
 class Effect5564(BaseEffect):
@@ -21039,39 +21083,13 @@ class Effect5564(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Skirmish Command'),
-                                      'warfareBuff2Value', src.getModifiedItemAttr('subsystemBonusCaldariOffensive'), skill='Caldari Offensive Systems')
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Skirmish Command'),
-                                      'warfareBuff4Value', src.getModifiedItemAttr('subsystemBonusCaldariOffensive'), skill='Caldari Offensive Systems')
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Skirmish Command'),
-                                      'warfareBuff3Value', src.getModifiedItemAttr('subsystemBonusCaldariOffensive'), skill='Caldari Offensive Systems')
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Skirmish Command'),
-                                      'warfareBuff1Value', src.getModifiedItemAttr('subsystemBonusCaldariOffensive'), skill='Caldari Offensive Systems')
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Skirmish Command'),
-                                      'buffDuration', src.getModifiedItemAttr('subsystemBonusCaldariOffensive'), skill='Caldari Offensive Systems')
-
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Command'),
-                                      'buffDuration', src.getModifiedItemAttr('subsystemBonusCaldariOffensive'), skill='Caldari Offensive Systems')
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Command'),
-                                      'warfareBuff1Value', src.getModifiedItemAttr('subsystemBonusCaldariOffensive'), skill='Caldari Offensive Systems')
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Command'),
-                                      'warfareBuff3Value', src.getModifiedItemAttr('subsystemBonusCaldariOffensive'), skill='Caldari Offensive Systems')
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Command'),
-                                      'warfareBuff2Value', src.getModifiedItemAttr('subsystemBonusCaldariOffensive'), skill='Caldari Offensive Systems')
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Command'),
-                                      'warfareBuff4Value', src.getModifiedItemAttr('subsystemBonusCaldariOffensive'), skill='Caldari Offensive Systems')
-
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Information Command'),
-                                      'buffDuration', src.getModifiedItemAttr('subsystemBonusCaldariOffensive'), skill='Caldari Offensive Systems')
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Information Command'),
-                                      'warfareBuff3Value', src.getModifiedItemAttr('subsystemBonusCaldariOffensive'), skill='Caldari Offensive Systems')
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Information Command'),
-                                      'warfareBuff1Value', src.getModifiedItemAttr('subsystemBonusCaldariOffensive'), skill='Caldari Offensive Systems')
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Information Command'),
-                                      'warfareBuff4Value', src.getModifiedItemAttr('subsystemBonusCaldariOffensive'), skill='Caldari Offensive Systems')
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Information Command'),
-                                      'warfareBuff2Value', src.getModifiedItemAttr('subsystemBonusCaldariOffensive'), skill='Caldari Offensive Systems')
+    def handler(fit, src, context, **kwargs):
+        for attrName in ('buffDuration', 'warfareBuff1Value', 'warfareBuff2Value', 'warfareBuff3Value', 'warfareBuff4Value'):
+            fit.modules.filteredItemBoost(lambda mod: (mod.item.requiresSkill('Skirmish Command') or
+                                                       mod.item.requiresSkill('Shield Command') or
+                                                       mod.item.requiresSkill('Information Command')),
+                                          attrName, src.getModifiedItemAttr('subsystemBonusCaldariOffensive'),
+                                          skill='Caldari Offensive Systems', **kwargs)
 
 
 class Effect5568(BaseEffect):
@@ -21085,39 +21103,13 @@ class Effect5568(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Skirmish Command'),
-                                      'warfareBuff1Value', src.getModifiedItemAttr('subsystemBonusGallenteOffensive'), skill='Gallente Offensive Systems')
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Skirmish Command'),
-                                      'warfareBuff4Value', src.getModifiedItemAttr('subsystemBonusGallenteOffensive'), skill='Gallente Offensive Systems')
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Skirmish Command'),
-                                      'buffDuration', src.getModifiedItemAttr('subsystemBonusGallenteOffensive'), skill='Gallente Offensive Systems')
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Skirmish Command'),
-                                      'warfareBuff2Value', src.getModifiedItemAttr('subsystemBonusGallenteOffensive'), skill='Gallente Offensive Systems')
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Skirmish Command'),
-                                      'warfareBuff3Value', src.getModifiedItemAttr('subsystemBonusGallenteOffensive'), skill='Gallente Offensive Systems')
-
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Armored Command'),
-                                      'warfareBuff4Value', src.getModifiedItemAttr('subsystemBonusGallenteOffensive'), skill='Gallente Offensive Systems')
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Armored Command'),
-                                      'warfareBuff1Value', src.getModifiedItemAttr('subsystemBonusGallenteOffensive'), skill='Gallente Offensive Systems')
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Armored Command'),
-                                      'warfareBuff2Value', src.getModifiedItemAttr('subsystemBonusGallenteOffensive'), skill='Gallente Offensive Systems')
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Armored Command'),
-                                      'buffDuration', src.getModifiedItemAttr('subsystemBonusGallenteOffensive'), skill='Gallente Offensive Systems')
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Armored Command'),
-                                      'warfareBuff3Value', src.getModifiedItemAttr('subsystemBonusGallenteOffensive'), skill='Gallente Offensive Systems')
-
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Information Command'),
-                                      'warfareBuff3Value', src.getModifiedItemAttr('subsystemBonusGallenteOffensive'), skill='Gallente Offensive Systems')
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Information Command'),
-                                      'warfareBuff1Value', src.getModifiedItemAttr('subsystemBonusGallenteOffensive'), skill='Gallente Offensive Systems')
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Information Command'),
-                                      'warfareBuff2Value', src.getModifiedItemAttr('subsystemBonusGallenteOffensive'), skill='Gallente Offensive Systems')
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Information Command'),
-                                      'buffDuration', src.getModifiedItemAttr('subsystemBonusGallenteOffensive'), skill='Gallente Offensive Systems')
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Information Command'),
-                                      'warfareBuff4Value', src.getModifiedItemAttr('subsystemBonusGallenteOffensive'), skill='Gallente Offensive Systems')
+    def handler(fit, src, context, **kwargs):
+        for attrName in ('buffDuration', 'warfareBuff1Value', 'warfareBuff2Value', 'warfareBuff3Value', 'warfareBuff4Value'):
+            fit.modules.filteredItemBoost(lambda mod: (mod.item.requiresSkill('Skirmish Command') or
+                                                       mod.item.requiresSkill('Armored Command') or
+                                                       mod.item.requiresSkill('Information Command')),
+                                          attrName, src.getModifiedItemAttr('subsystemBonusGallenteOffensive'),
+                                          skill='Gallente Offensive Systems', **kwargs)
 
 
 class Effect5570(BaseEffect):
@@ -21131,40 +21123,13 @@ class Effect5570(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Skirmish Command'),
-                                      'warfareBuff1Value', src.getModifiedItemAttr('subsystemBonusMinmatarOffensive'), skill='Minmatar Offensive Systems')
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Skirmish Command'),
-                                      'warfareBuff2Value', src.getModifiedItemAttr('subsystemBonusMinmatarOffensive'), skill='Minmatar Offensive Systems')
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Skirmish Command'),
-                                      'buffDuration', src.getModifiedItemAttr('subsystemBonusMinmatarOffensive'), skill='Minmatar Offensive Systems')
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Skirmish Command'),
-                                      'warfareBuff4Value', src.getModifiedItemAttr('subsystemBonusMinmatarOffensive'), skill='Minmatar Offensive Systems')
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Skirmish Command'),
-                                      'warfareBuff3Value', src.getModifiedItemAttr('subsystemBonusMinmatarOffensive'), skill='Minmatar Offensive Systems')
-
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Command'),
-                                      'warfareBuff3Value', src.getModifiedItemAttr('subsystemBonusMinmatarOffensive'), skill='Minmatar Offensive Systems')
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Command'),
-                                      'warfareBuff2Value', src.getModifiedItemAttr('subsystemBonusMinmatarOffensive'), skill='Minmatar Offensive Systems')
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Command'),
-                                      'buffDuration', src.getModifiedItemAttr('subsystemBonusMinmatarOffensive'), skill='Minmatar Offensive Systems')
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Command'),
-                                      'warfareBuff4Value', src.getModifiedItemAttr('subsystemBonusMinmatarOffensive'), skill='Minmatar Offensive Systems')
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Command'),
-                                      'war'
-                                      'fareBuff1Value', src.getModifiedItemAttr('subsystemBonusMinmatarOffensive'), skill='Minmatar Offensive Systems')
-
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Armored Command'),
-                                      'warfareBuff3Value', src.getModifiedItemAttr('subsystemBonusMinmatarOffensive'), skill='Minmatar Offensive Systems')
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Armored Command'),
-                                      'warfareBuff4Value', src.getModifiedItemAttr('subsystemBonusMinmatarOffensive'), skill='Minmatar Offensive Systems')
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Armored Command'),
-                                      'warfareBuff1Value', src.getModifiedItemAttr('subsystemBonusMinmatarOffensive'), skill='Minmatar Offensive Systems')
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Armored Command'),
-                                      'buffDuration', src.getModifiedItemAttr('subsystemBonusMinmatarOffensive'), skill='Minmatar Offensive Systems')
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Armored Command'),
-                                      'warfareBuff2Value', src.getModifiedItemAttr('subsystemBonusMinmatarOffensive'), skill='Minmatar Offensive Systems')
+    def handler(fit, src, context, **kwargs):
+        for attrName in ('buffDuration', 'warfareBuff1Value', 'warfareBuff2Value', 'warfareBuff3Value', 'warfareBuff4Value'):
+            fit.modules.filteredItemBoost(lambda mod: (mod.item.requiresSkill('Skirmish Command') or
+                                                       mod.item.requiresSkill('Shield Command') or
+                                                       mod.item.requiresSkill('Armored Command')),
+                                          attrName, src.getModifiedItemAttr('subsystemBonusMinmatarOffensive'),
+                                          skill='Minmatar Offensive Systems', **kwargs)
 
 
 class Effect5572(BaseEffect):
@@ -21178,17 +21143,11 @@ class Effect5572(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Armored Command'), 'warfareBuff3Value',
-                                      src.getModifiedItemAttr('eliteBonusCommandShips3'), skill='Command Ships')
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Armored Command'), 'warfareBuff1Value',
-                                      src.getModifiedItemAttr('eliteBonusCommandShips3'), skill='Command Ships')
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Armored Command'), 'warfareBuff2Value',
-                                      src.getModifiedItemAttr('eliteBonusCommandShips3'), skill='Command Ships')
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Armored Command'), 'buffDuration',
-                                      src.getModifiedItemAttr('eliteBonusCommandShips3'), skill='Command Ships')
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Armored Command'), 'warfareBuff4Value',
-                                      src.getModifiedItemAttr('eliteBonusCommandShips3'), skill='Command Ships')
+    def handler(fit, src, context, **kwargs):
+        for attrName in ('buffDuration', 'warfareBuff1Value', 'warfareBuff2Value', 'warfareBuff3Value', 'warfareBuff4Value'):
+            fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Armored Command'),
+                                          attrName, src.getModifiedItemAttr('eliteBonusCommandShips3'),
+                                          skill='Command Ships', **kwargs)
 
 
 class Effect5573(BaseEffect):
@@ -21202,17 +21161,11 @@ class Effect5573(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Command'), 'warfareBuff1Value',
-                                      src.getModifiedItemAttr('eliteBonusCommandShips3'), skill='Command Ships')
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Command'), 'warfareBuff4Value',
-                                      src.getModifiedItemAttr('eliteBonusCommandShips3'), skill='Command Ships')
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Command'), 'warfareBuff2Value',
-                                      src.getModifiedItemAttr('eliteBonusCommandShips3'), skill='Command Ships')
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Command'), 'buffDuration',
-                                      src.getModifiedItemAttr('eliteBonusCommandShips3'), skill='Command Ships')
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Command'), 'warfareBuff3Value',
-                                      src.getModifiedItemAttr('eliteBonusCommandShips3'), skill='Command Ships')
+    def handler(fit, src, context, **kwargs):
+        for attrName in ('buffDuration', 'warfareBuff1Value', 'warfareBuff2Value', 'warfareBuff3Value', 'warfareBuff4Value'):
+            fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Command'),
+                                          attrName, src.getModifiedItemAttr('eliteBonusCommandShips3'),
+                                          skill='Command Ships', **kwargs)
 
 
 class Effect5574(BaseEffect):
@@ -21226,17 +21179,11 @@ class Effect5574(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Skirmish Command'), 'warfareBuff2Value',
-                                      src.getModifiedItemAttr('eliteBonusCommandShips3'), skill='Command Ships')
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Skirmish Command'), 'warfareBuff1Value',
-                                      src.getModifiedItemAttr('eliteBonusCommandShips3'), skill='Command Ships')
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Skirmish Command'), 'warfareBuff3Value',
-                                      src.getModifiedItemAttr('eliteBonusCommandShips3'), skill='Command Ships')
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Skirmish Command'), 'warfareBuff4Value',
-                                      src.getModifiedItemAttr('eliteBonusCommandShips3'), skill='Command Ships')
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Skirmish Command'), 'buffDuration',
-                                      src.getModifiedItemAttr('eliteBonusCommandShips3'), skill='Command Ships')
+    def handler(fit, src, context, **kwargs):
+        for attrName in ('buffDuration', 'warfareBuff1Value', 'warfareBuff2Value', 'warfareBuff3Value', 'warfareBuff4Value'):
+            fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Skirmish Command'),
+                                          attrName, src.getModifiedItemAttr('eliteBonusCommandShips3'),
+                                          skill='Command Ships', **kwargs)
 
 
 class Effect5575(BaseEffect):
@@ -21250,17 +21197,11 @@ class Effect5575(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Information Command'), 'buffDuration',
-                                      src.getModifiedItemAttr('eliteBonusCommandShips3'), skill='Command Ships')
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Information Command'), 'warfareBuff3Value',
-                                      src.getModifiedItemAttr('eliteBonusCommandShips3'), skill='Command Ships')
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Information Command'), 'warfareBuff2Value',
-                                      src.getModifiedItemAttr('eliteBonusCommandShips3'), skill='Command Ships')
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Information Command'), 'warfareBuff1Value',
-                                      src.getModifiedItemAttr('eliteBonusCommandShips3'), skill='Command Ships')
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Information Command'), 'warfareBuff4Value',
-                                      src.getModifiedItemAttr('eliteBonusCommandShips3'), skill='Command Ships')
+    def handler(fit, src, context, **kwargs):
+        for attrName in ('buffDuration', 'warfareBuff1Value', 'warfareBuff2Value', 'warfareBuff3Value', 'warfareBuff4Value'):
+            fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Information Command'),
+                                          attrName, src.getModifiedItemAttr('eliteBonusCommandShips3'),
+                                          skill='Command Ships', **kwargs)
 
 
 class Effect5607(BaseEffect):
@@ -21276,10 +21217,10 @@ class Effect5607(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, container, context):
+    def handler(fit, container, context, **kwargs):
         level = container.level if 'skill' in context else 1
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Capacitor Emission Systems'),
-                                      'capacitorNeed', container.getModifiedItemAttr('capNeedBonus') * level)
+                                      'capacitorNeed', container.getModifiedItemAttr('capNeedBonus') * level, **kwargs)
 
 
 class Effect5610(BaseEffect):
@@ -21294,9 +21235,9 @@ class Effect5610(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Large Energy Turret'),
-                                      'maxRange', ship.getModifiedItemAttr('shipBonusAB'), skill='Amarr Battleship')
+                                      'maxRange', ship.getModifiedItemAttr('shipBonusAB'), skill='Amarr Battleship', **kwargs)
 
 
 class Effect5611(BaseEffect):
@@ -21310,9 +21251,9 @@ class Effect5611(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Large Hybrid Turret'),
-                                      'falloff', ship.getModifiedItemAttr('shipBonusGB2'), skill='Gallente Battleship')
+                                      'falloff', ship.getModifiedItemAttr('shipBonusGB2'), skill='Gallente Battleship', **kwargs)
 
 
 class Effect5618(BaseEffect):
@@ -21327,9 +21268,9 @@ class Effect5618(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Missile Launcher Rapid Heavy',
-                                      'speed', ship.getModifiedItemAttr('shipBonus2CB'), skill='Caldari Battleship')
+                                      'speed', ship.getModifiedItemAttr('shipBonus2CB'), skill='Caldari Battleship', **kwargs)
 
 
 class Effect5619(BaseEffect):
@@ -21343,9 +21284,9 @@ class Effect5619(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Missile Launcher Rapid Heavy',
-                                      'speed', ship.getModifiedItemAttr('shipBonusCB'), skill='Caldari Battleship')
+                                      'speed', ship.getModifiedItemAttr('shipBonusCB'), skill='Caldari Battleship', **kwargs)
 
 
 class Effect5620(BaseEffect):
@@ -21359,9 +21300,9 @@ class Effect5620(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Missile Launcher Rapid Heavy',
-                                      'speed', ship.getModifiedItemAttr('shipBonusMB'), skill='Minmatar Battleship')
+                                      'speed', ship.getModifiedItemAttr('shipBonusMB'), skill='Minmatar Battleship', **kwargs)
 
 
 class Effect5621(BaseEffect):
@@ -21375,9 +21316,9 @@ class Effect5621(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Missile Launcher Cruise',
-                                      'speed', ship.getModifiedItemAttr('shipBonusMB'), skill='Minmatar Battleship')
+                                      'speed', ship.getModifiedItemAttr('shipBonusMB'), skill='Minmatar Battleship', **kwargs)
 
 
 class Effect5622(BaseEffect):
@@ -21391,9 +21332,9 @@ class Effect5622(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Missile Launcher Torpedo',
-                                      'speed', ship.getModifiedItemAttr('shipBonusMB'), skill='Minmatar Battleship')
+                                      'speed', ship.getModifiedItemAttr('shipBonusMB'), skill='Minmatar Battleship', **kwargs)
 
 
 class Effect5628(BaseEffect):
@@ -21407,9 +21348,9 @@ class Effect5628(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Cruise Missiles'),
-                                        'emDamage', ship.getModifiedItemAttr('shipBonusMB'), skill='Minmatar Battleship')
+                                        'emDamage', ship.getModifiedItemAttr('shipBonusMB'), skill='Minmatar Battleship', **kwargs)
 
 
 class Effect5629(BaseEffect):
@@ -21423,10 +21364,10 @@ class Effect5629(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Cruise Missiles'),
                                         'thermalDamage', ship.getModifiedItemAttr('shipBonusMB'),
-                                        skill='Minmatar Battleship')
+                                        skill='Minmatar Battleship', **kwargs)
 
 
 class Effect5630(BaseEffect):
@@ -21440,10 +21381,10 @@ class Effect5630(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Cruise Missiles'),
                                         'kineticDamage', ship.getModifiedItemAttr('shipBonusMB'),
-                                        skill='Minmatar Battleship')
+                                        skill='Minmatar Battleship', **kwargs)
 
 
 class Effect5631(BaseEffect):
@@ -21457,10 +21398,10 @@ class Effect5631(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Cruise Missiles'),
                                         'explosiveDamage', ship.getModifiedItemAttr('shipBonusMB'),
-                                        skill='Minmatar Battleship')
+                                        skill='Minmatar Battleship', **kwargs)
 
 
 class Effect5632(BaseEffect):
@@ -21474,10 +21415,10 @@ class Effect5632(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Torpedoes'),
                                         'explosiveDamage', ship.getModifiedItemAttr('shipBonusMB'),
-                                        skill='Minmatar Battleship')
+                                        skill='Minmatar Battleship', **kwargs)
 
 
 class Effect5633(BaseEffect):
@@ -21491,9 +21432,9 @@ class Effect5633(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Torpedoes'),
-                                        'emDamage', ship.getModifiedItemAttr('shipBonusMB'), skill='Minmatar Battleship')
+                                        'emDamage', ship.getModifiedItemAttr('shipBonusMB'), skill='Minmatar Battleship', **kwargs)
 
 
 class Effect5634(BaseEffect):
@@ -21507,10 +21448,10 @@ class Effect5634(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Torpedoes'),
                                         'thermalDamage', ship.getModifiedItemAttr('shipBonusMB'),
-                                        skill='Minmatar Battleship')
+                                        skill='Minmatar Battleship', **kwargs)
 
 
 class Effect5635(BaseEffect):
@@ -21524,10 +21465,10 @@ class Effect5635(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Torpedoes'),
                                         'kineticDamage', ship.getModifiedItemAttr('shipBonusMB'),
-                                        skill='Minmatar Battleship')
+                                        skill='Minmatar Battleship', **kwargs)
 
 
 class Effect5636(BaseEffect):
@@ -21541,9 +21482,9 @@ class Effect5636(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Missiles'),
-                                        'emDamage', ship.getModifiedItemAttr('shipBonusMB'), skill='Minmatar Battleship')
+                                        'emDamage', ship.getModifiedItemAttr('shipBonusMB'), skill='Minmatar Battleship', **kwargs)
 
 
 class Effect5637(BaseEffect):
@@ -21557,10 +21498,10 @@ class Effect5637(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Missiles'),
                                         'thermalDamage', ship.getModifiedItemAttr('shipBonusMB'),
-                                        skill='Minmatar Battleship')
+                                        skill='Minmatar Battleship', **kwargs)
 
 
 class Effect5638(BaseEffect):
@@ -21574,10 +21515,10 @@ class Effect5638(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Missiles'),
                                         'kineticDamage', ship.getModifiedItemAttr('shipBonusMB'),
-                                        skill='Minmatar Battleship')
+                                        skill='Minmatar Battleship', **kwargs)
 
 
 class Effect5639(BaseEffect):
@@ -21591,10 +21532,10 @@ class Effect5639(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Missiles'),
                                         'explosiveDamage', ship.getModifiedItemAttr('shipBonusMB'),
-                                        skill='Minmatar Battleship')
+                                        skill='Minmatar Battleship', **kwargs)
 
 
 class Effect5644(BaseEffect):
@@ -21608,9 +21549,9 @@ class Effect5644(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
-                                        'maxVelocity', ship.getModifiedItemAttr('shipBonusCC2'), skill='Caldari Cruiser')
+                                        'maxVelocity', ship.getModifiedItemAttr('shipBonusCC2'), skill='Caldari Cruiser', **kwargs)
 
 
 class Effect5647(BaseEffect):
@@ -21631,9 +21572,9 @@ class Effect5647(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Cloaking'),
-                                      'cpu', ship.getModifiedItemAttr('shipBonusRole7'))
+                                      'cpu', ship.getModifiedItemAttr('shipBonusRole7'), **kwargs)
 
 
 class Effect5650(BaseEffect):
@@ -21647,11 +21588,11 @@ class Effect5650(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         damageTypes = ('Em', 'Explosive', 'Kinetic', 'Thermal')
         for damageType in damageTypes:
             fit.ship.boostItemAttr('armor{0}DamageResonance'.format(damageType), ship.getModifiedItemAttr('shipBonusAF'),
-                                   skill='Amarr Frigate')
+                                   skill='Amarr Frigate', **kwargs)
 
 
 class Effect5657(BaseEffect):
@@ -21665,11 +21606,11 @@ class Effect5657(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         damageTypes = ('Em', 'Explosive', 'Kinetic', 'Thermal')
         for damageType in damageTypes:
             fit.ship.boostItemAttr('shield{0}DamageResonance'.format(damageType),
-                                   ship.getModifiedItemAttr('eliteBonusInterceptor2'), skill='Interceptors')
+                                   ship.getModifiedItemAttr('eliteBonusInterceptor2'), skill='Interceptors', **kwargs)
 
 
 class Effect5673(BaseEffect):
@@ -21683,10 +21624,10 @@ class Effect5673(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Projectile Turret'),
                                       'damageMultiplier', ship.getModifiedItemAttr('eliteBonusInterceptor2'),
-                                      skill='Interceptors')
+                                      skill='Interceptors', **kwargs)
 
 
 class Effect5676(BaseEffect):
@@ -21700,10 +21641,10 @@ class Effect5676(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredChargeBoost(
             lambda mod: mod.charge.requiresSkill('Rockets') or mod.charge.requiresSkill('Light Missiles'),
-            'aoeCloudSize', ship.getModifiedItemAttr('shipBonusCD2'), skill='Caldari Destroyer')
+            'aoeCloudSize', ship.getModifiedItemAttr('shipBonusCD2'), skill='Caldari Destroyer', **kwargs)
 
 
 class Effect5688(BaseEffect):
@@ -21717,9 +21658,9 @@ class Effect5688(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
-                                        'maxVelocity', ship.getModifiedItemAttr('shipBonusAD2'), skill='Amarr Destroyer')
+                                        'maxVelocity', ship.getModifiedItemAttr('shipBonusAD2'), skill='Amarr Destroyer', **kwargs)
 
 
 class Effect5695(BaseEffect):
@@ -21733,10 +21674,10 @@ class Effect5695(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         for damageType in ('Em', 'Thermal', 'Explosive', 'Kinetic'):
             fit.ship.boostItemAttr('armor%sDamageResonance' % damageType,
-                                   ship.getModifiedItemAttr('eliteBonusInterdictors1'), skill='Interdictors')
+                                   ship.getModifiedItemAttr('eliteBonusInterdictors1'), skill='Interdictors', **kwargs)
 
 
 class Effect5717(BaseEffect):
@@ -21751,9 +21692,9 @@ class Effect5717(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, implant, context):
+    def handler(fit, implant, context, **kwargs):
         fit.appliedImplants.filteredItemMultiply(lambda mod: mod.item.group.name == 'Cyberimplant',
-                                                 'WarpSBonus', implant.getModifiedItemAttr('implantSetWarpSpeed'))
+                                                 'WarpSBonus', implant.getModifiedItemAttr('implantSetWarpSpeed'), **kwargs)
 
 
 class Effect5721(BaseEffect):
@@ -21767,9 +21708,9 @@ class Effect5721(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Energy Turret'),
-                                      'maxRange', ship.getModifiedItemAttr('shipBonusRole7'))
+                                      'maxRange', ship.getModifiedItemAttr('shipBonusRole7'), **kwargs)
 
 
 class Effect5722(BaseEffect):
@@ -21783,9 +21724,9 @@ class Effect5722(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Hybrid Turret'),
-                                      'maxRange', ship.getModifiedItemAttr('shipBonusGD1'), skill='Gallente Destroyer')
+                                      'maxRange', ship.getModifiedItemAttr('shipBonusGD1'), skill='Gallente Destroyer', **kwargs)
 
 
 class Effect5723(BaseEffect):
@@ -21799,10 +21740,10 @@ class Effect5723(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('High Speed Maneuvering'),
                                       'signatureRadiusBonus', ship.getModifiedItemAttr('eliteBonusInterdictors2'),
-                                      skill='Interdictors')
+                                      skill='Interdictors', **kwargs)
 
 
 class Effect5724(BaseEffect):
@@ -21816,9 +21757,9 @@ class Effect5724(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Hybrid Turret'),
-                                      'maxRange', ship.getModifiedItemAttr('shipBonusGF'), skill='Gallente Frigate')
+                                      'maxRange', ship.getModifiedItemAttr('shipBonusGF'), skill='Gallente Frigate', **kwargs)
 
 
 class Effect5725(BaseEffect):
@@ -21832,9 +21773,9 @@ class Effect5725(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Remote Armor Repair Systems'),
-                                      'armorDamageAmount', ship.getModifiedItemAttr('shipBonusRole7'))
+                                      'armorDamageAmount', ship.getModifiedItemAttr('shipBonusRole7'), **kwargs)
 
 
 class Effect5726(BaseEffect):
@@ -21848,9 +21789,9 @@ class Effect5726(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Large Energy Turret'),
-                                      'maxRange', ship.getModifiedItemAttr('shipBonusRole7'))
+                                      'maxRange', ship.getModifiedItemAttr('shipBonusRole7'), **kwargs)
 
 
 class Effect5733(BaseEffect):
@@ -21864,9 +21805,9 @@ class Effect5733(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Missiles'),
-                                        'explosiveDamage', ship.getModifiedItemAttr('eliteBonusViolatorsRole1'))
+                                        'explosiveDamage', ship.getModifiedItemAttr('eliteBonusViolatorsRole1'), **kwargs)
 
 
 class Effect5734(BaseEffect):
@@ -21880,9 +21821,9 @@ class Effect5734(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Missiles'),
-                                        'kineticDamage', ship.getModifiedItemAttr('eliteBonusViolatorsRole1'))
+                                        'kineticDamage', ship.getModifiedItemAttr('eliteBonusViolatorsRole1'), **kwargs)
 
 
 class Effect5735(BaseEffect):
@@ -21896,9 +21837,9 @@ class Effect5735(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Missiles'),
-                                        'emDamage', ship.getModifiedItemAttr('eliteBonusViolatorsRole1'))
+                                        'emDamage', ship.getModifiedItemAttr('eliteBonusViolatorsRole1'), **kwargs)
 
 
 class Effect5736(BaseEffect):
@@ -21912,9 +21853,9 @@ class Effect5736(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Missiles'),
-                                        'thermalDamage', ship.getModifiedItemAttr('eliteBonusViolatorsRole1'))
+                                        'thermalDamage', ship.getModifiedItemAttr('eliteBonusViolatorsRole1'), **kwargs)
 
 
 class Effect5737(BaseEffect):
@@ -21928,9 +21869,9 @@ class Effect5737(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Astrometrics'),
-                                        'baseSensorStrength', ship.getModifiedItemAttr('shipBonusRole7'))
+                                        'baseSensorStrength', ship.getModifiedItemAttr('shipBonusRole7'), **kwargs)
 
 
 class Effect5738(BaseEffect):
@@ -21944,11 +21885,11 @@ class Effect5738(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Remote Armor Repair Systems'),
-                                      'maxRange', ship.getModifiedItemAttr('shipBonusRole8'))
+                                      'maxRange', ship.getModifiedItemAttr('shipBonusRole8'), **kwargs)
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Remote Armor Repair Systems'),
-                                      'falloffEffectiveness', ship.getModifiedItemAttr('shipBonusRole8'))
+                                      'falloffEffectiveness', ship.getModifiedItemAttr('shipBonusRole8'), **kwargs)
 
 
 class Effect5754(BaseEffect):
@@ -21963,10 +21904,10 @@ class Effect5754(BaseEffect):
     type = 'overheat'
 
     @staticmethod
-    def handler(fit, module, context):
-        module.boostItemAttr('maxRangeBonus', module.getModifiedItemAttr('overloadTrackingModuleStrengthBonus'))
-        module.boostItemAttr('falloffBonus', module.getModifiedItemAttr('overloadTrackingModuleStrengthBonus'))
-        module.boostItemAttr('trackingSpeedBonus', module.getModifiedItemAttr('overloadTrackingModuleStrengthBonus'))
+    def handler(fit, module, context, **kwargs):
+        module.boostItemAttr('maxRangeBonus', module.getModifiedItemAttr('overloadTrackingModuleStrengthBonus'), **kwargs)
+        module.boostItemAttr('falloffBonus', module.getModifiedItemAttr('overloadTrackingModuleStrengthBonus'), **kwargs)
+        module.boostItemAttr('trackingSpeedBonus', module.getModifiedItemAttr('overloadTrackingModuleStrengthBonus'), **kwargs)
 
 
 class Effect5757(BaseEffect):
@@ -21982,17 +21923,16 @@ class Effect5757(BaseEffect):
     type = 'overheat'
 
     @staticmethod
-    def handler(fit, module, context):
-        module.boostItemAttr('maxTargetRangeBonus', module.getModifiedItemAttr('overloadSensorModuleStrengthBonus'))
+    def handler(fit, module, context, **kwargs):
+        module.boostItemAttr('maxTargetRangeBonus', module.getModifiedItemAttr('overloadSensorModuleStrengthBonus'), **kwargs)
         module.boostItemAttr('scanResolutionBonus', module.getModifiedItemAttr('overloadSensorModuleStrengthBonus'),
-                             stackingPenalties=True)
+                             stackingPenalties=True, **kwargs)
 
         for scanType in ('Gravimetric', 'Magnetometric', 'Radar', 'Ladar'):
             module.boostItemAttr(
                 'scan{}StrengthPercent'.format(scanType),
                 module.getModifiedItemAttr('overloadSensorModuleStrengthBonus'),
-                stackingPenalties=True
-            )
+                stackingPenalties=True, **kwargs)
 
 
 class Effect5758(BaseEffect):
@@ -22006,8 +21946,8 @@ class Effect5758(BaseEffect):
     type = 'overheat'
 
     @staticmethod
-    def handler(fit, module, context):
-        module.boostItemAttr('signatureRadiusBonus', module.getModifiedItemAttr('overloadPainterStrengthBonus') or 0)
+    def handler(fit, module, context, **kwargs):
+        module.boostItemAttr('signatureRadiusBonus', module.getModifiedItemAttr('overloadPainterStrengthBonus') or 0, **kwargs)
 
 
 class Effect5769(BaseEffect):
@@ -22022,10 +21962,10 @@ class Effect5769(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, container, context):
+    def handler(fit, container, context, **kwargs):
         level = container.level if 'skill' in context else 1
         fit.drones.filteredItemBoost(lambda drone: drone.item.group.name == 'Logistic Drone',
-                                     'structureDamageAmount', container.getModifiedItemAttr('damageHP') * level)
+                                     'structureDamageAmount', container.getModifiedItemAttr('damageHP') * level, **kwargs)
 
 
 class Effect5778(BaseEffect):
@@ -22040,9 +21980,9 @@ class Effect5778(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Missile Launcher Operation'),
-                                      'speed', ship.getModifiedItemAttr('shipBonusMF2'), skill='Minmatar Frigate')
+                                      'speed', ship.getModifiedItemAttr('shipBonusMF2'), skill='Minmatar Frigate', **kwargs)
 
 
 class Effect5779(BaseEffect):
@@ -22057,9 +21997,9 @@ class Effect5779(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Projectile Turret'),
-                                      'falloff', ship.getModifiedItemAttr('shipBonusMF2'), skill='Minmatar Frigate')
+                                      'falloff', ship.getModifiedItemAttr('shipBonusMF2'), skill='Minmatar Frigate', **kwargs)
 
 
 class Effect5793(BaseEffect):
@@ -22074,11 +22014,11 @@ class Effect5793(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, container, context):
+    def handler(fit, container, context, **kwargs):
         level = container.level if 'skill' in context else 1
         for attr in ('maxRangeBonus', 'falloffBonus'):
             fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Weapon Disruption'),
-                                          attr, container.getModifiedItemAttr('scanSkillEwStrengthBonus') * level)
+                                          attr, container.getModifiedItemAttr('scanSkillEwStrengthBonus') * level, **kwargs)
 
 
 class Effect5802(BaseEffect):
@@ -22092,9 +22032,9 @@ class Effect5802(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Afterburner'),
-                                      'speedFactor', module.getModifiedItemAttr('shipBonus2CB'), skill='Caldari Battleship')
+                                      'speedFactor', module.getModifiedItemAttr('shipBonus2CB'), skill='Caldari Battleship', **kwargs)
 
 
 class Effect5803(BaseEffect):
@@ -22108,9 +22048,9 @@ class Effect5803(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Sentry Drone Interfacing'),
-                                     'damageMultiplier', ship.getModifiedItemAttr('shipBonusRole7'))
+                                     'damageMultiplier', ship.getModifiedItemAttr('shipBonusRole7'), **kwargs)
 
 
 class Effect5804(BaseEffect):
@@ -22124,9 +22064,9 @@ class Effect5804(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Heavy Drone Operation'),
-                                     'damageMultiplier', ship.getModifiedItemAttr('shipBonusRole7'))
+                                     'damageMultiplier', ship.getModifiedItemAttr('shipBonusRole7'), **kwargs)
 
 
 class Effect5805(BaseEffect):
@@ -22140,9 +22080,9 @@ class Effect5805(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Sentry Drone Interfacing'),
-                                     'hp', ship.getModifiedItemAttr('shipBonusRole7'))
+                                     'hp', ship.getModifiedItemAttr('shipBonusRole7'), **kwargs)
 
 
 class Effect5806(BaseEffect):
@@ -22156,9 +22096,9 @@ class Effect5806(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Sentry Drone Interfacing'),
-                                     'armorHP', ship.getModifiedItemAttr('shipBonusRole7'))
+                                     'armorHP', ship.getModifiedItemAttr('shipBonusRole7'), **kwargs)
 
 
 class Effect5807(BaseEffect):
@@ -22172,9 +22112,9 @@ class Effect5807(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Sentry Drone Interfacing'),
-                                     'shieldCapacity', ship.getModifiedItemAttr('shipBonusRole7'))
+                                     'shieldCapacity', ship.getModifiedItemAttr('shipBonusRole7'), **kwargs)
 
 
 class Effect5808(BaseEffect):
@@ -22188,9 +22128,9 @@ class Effect5808(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Heavy Drone Operation'),
-                                     'shieldCapacity', ship.getModifiedItemAttr('shipBonusRole7'))
+                                     'shieldCapacity', ship.getModifiedItemAttr('shipBonusRole7'), **kwargs)
 
 
 class Effect5809(BaseEffect):
@@ -22204,9 +22144,9 @@ class Effect5809(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Heavy Drone Operation'),
-                                     'armorHP', ship.getModifiedItemAttr('shipBonusRole7'))
+                                     'armorHP', ship.getModifiedItemAttr('shipBonusRole7'), **kwargs)
 
 
 class Effect5810(BaseEffect):
@@ -22220,9 +22160,9 @@ class Effect5810(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Heavy Drone Operation'),
-                                     'hp', ship.getModifiedItemAttr('shipBonusRole7'))
+                                     'hp', ship.getModifiedItemAttr('shipBonusRole7'), **kwargs)
 
 
 class Effect5811(BaseEffect):
@@ -22236,10 +22176,10 @@ class Effect5811(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
                                         'kineticDamage', ship.getModifiedItemAttr('shipBonusGB2'),
-                                        skill='Gallente Battleship')
+                                        skill='Gallente Battleship', **kwargs)
 
 
 class Effect5812(BaseEffect):
@@ -22253,10 +22193,10 @@ class Effect5812(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
                                         'thermalDamage', ship.getModifiedItemAttr('shipBonusGB2'),
-                                        skill='Gallente Battleship')
+                                        skill='Gallente Battleship', **kwargs)
 
 
 class Effect5813(BaseEffect):
@@ -22271,9 +22211,9 @@ class Effect5813(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Afterburner'),
-                                      'speedFactor', module.getModifiedItemAttr('shipBonusCF2'), skill='Caldari Frigate')
+                                      'speedFactor', module.getModifiedItemAttr('shipBonusCF2'), skill='Caldari Frigate', **kwargs)
 
 
 class Effect5814(BaseEffect):
@@ -22288,9 +22228,9 @@ class Effect5814(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
-                                        'kineticDamage', ship.getModifiedItemAttr('shipBonusGF'), skill='Gallente Frigate')
+                                        'kineticDamage', ship.getModifiedItemAttr('shipBonusGF'), skill='Gallente Frigate', **kwargs)
 
 
 class Effect5815(BaseEffect):
@@ -22305,9 +22245,9 @@ class Effect5815(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
-                                        'thermalDamage', ship.getModifiedItemAttr('shipBonusGF'), skill='Gallente Frigate')
+                                        'thermalDamage', ship.getModifiedItemAttr('shipBonusGF'), skill='Gallente Frigate', **kwargs)
 
 
 class Effect5816(BaseEffect):
@@ -22322,9 +22262,9 @@ class Effect5816(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Light Drone Operation'),
-                                     'damageMultiplier', ship.getModifiedItemAttr('shipBonusRole7'))
+                                     'damageMultiplier', ship.getModifiedItemAttr('shipBonusRole7'), **kwargs)
 
 
 class Effect5817(BaseEffect):
@@ -22339,9 +22279,9 @@ class Effect5817(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Light Drone Operation'),
-                                     'hp', ship.getModifiedItemAttr('shipBonusRole7'))
+                                     'hp', ship.getModifiedItemAttr('shipBonusRole7'), **kwargs)
 
 
 class Effect5818(BaseEffect):
@@ -22356,9 +22296,9 @@ class Effect5818(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Light Drone Operation'),
-                                     'armorHP', ship.getModifiedItemAttr('shipBonusRole7'))
+                                     'armorHP', ship.getModifiedItemAttr('shipBonusRole7'), **kwargs)
 
 
 class Effect5819(BaseEffect):
@@ -22373,9 +22313,9 @@ class Effect5819(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Light Drone Operation'),
-                                     'shieldCapacity', ship.getModifiedItemAttr('shipBonusRole7'))
+                                     'shieldCapacity', ship.getModifiedItemAttr('shipBonusRole7'), **kwargs)
 
 
 class Effect5820(BaseEffect):
@@ -22390,9 +22330,9 @@ class Effect5820(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Afterburner'),
-                                      'speedFactor', module.getModifiedItemAttr('shipBonusCC2'), skill='Caldari Cruiser')
+                                      'speedFactor', module.getModifiedItemAttr('shipBonusCC2'), skill='Caldari Cruiser', **kwargs)
 
 
 class Effect5821(BaseEffect):
@@ -22407,9 +22347,9 @@ class Effect5821(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Medium Drone Operation'),
-                                     'damageMultiplier', ship.getModifiedItemAttr('shipBonusRole7'))
+                                     'damageMultiplier', ship.getModifiedItemAttr('shipBonusRole7'), **kwargs)
 
 
 class Effect5822(BaseEffect):
@@ -22423,9 +22363,9 @@ class Effect5822(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Medium Drone Operation'),
-                                     'hp', ship.getModifiedItemAttr('shipBonusRole7'))
+                                     'hp', ship.getModifiedItemAttr('shipBonusRole7'), **kwargs)
 
 
 class Effect5823(BaseEffect):
@@ -22439,9 +22379,9 @@ class Effect5823(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Medium Drone Operation'),
-                                     'armorHP', ship.getModifiedItemAttr('shipBonusRole7'))
+                                     'armorHP', ship.getModifiedItemAttr('shipBonusRole7'), **kwargs)
 
 
 class Effect5824(BaseEffect):
@@ -22455,9 +22395,9 @@ class Effect5824(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Medium Drone Operation'),
-                                     'shieldCapacity', ship.getModifiedItemAttr('shipBonusRole7'))
+                                     'shieldCapacity', ship.getModifiedItemAttr('shipBonusRole7'), **kwargs)
 
 
 class Effect5825(BaseEffect):
@@ -22472,9 +22412,9 @@ class Effect5825(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
-                                        'kineticDamage', ship.getModifiedItemAttr('shipBonusGC2'), skill='Gallente Cruiser')
+                                        'kineticDamage', ship.getModifiedItemAttr('shipBonusGC2'), skill='Gallente Cruiser', **kwargs)
 
 
 class Effect5826(BaseEffect):
@@ -22489,9 +22429,9 @@ class Effect5826(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
-                                        'thermalDamage', ship.getModifiedItemAttr('shipBonusGC2'), skill='Gallente Cruiser')
+                                        'thermalDamage', ship.getModifiedItemAttr('shipBonusGC2'), skill='Gallente Cruiser', **kwargs)
 
 
 class Effect5827(BaseEffect):
@@ -22505,9 +22445,9 @@ class Effect5827(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Weapon Disruption'),
-                                      'maxRange', ship.getModifiedItemAttr('shipBonusAF'), skill='Amarr Frigate')
+                                      'maxRange', ship.getModifiedItemAttr('shipBonusAF'), skill='Amarr Frigate', **kwargs)
 
 
 class Effect5829(BaseEffect):
@@ -22522,9 +22462,9 @@ class Effect5829(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Mining'),
-                                      'duration', ship.getModifiedItemAttr('shipBonusORE3'), skill='Mining Barge')
+                                      'duration', ship.getModifiedItemAttr('shipBonusORE3'), skill='Mining Barge', **kwargs)
 
 
 class Effect5832(BaseEffect):
@@ -22538,10 +22478,10 @@ class Effect5832(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(
             lambda mod: mod.item.requiresSkill('Mining') or mod.item.requiresSkill('Ice Harvesting'),
-            'maxRange', ship.getModifiedItemAttr('shipBonusORE2'), skill='Mining Barge')
+            'maxRange', ship.getModifiedItemAttr('shipBonusORE2'), skill='Mining Barge', **kwargs)
 
 
 class Effect5839(BaseEffect):
@@ -22555,10 +22495,10 @@ class Effect5839(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         for damageType in ('em', 'thermal', 'explosive', 'kinetic'):
             fit.ship.boostItemAttr('shield{}DamageResonance'.format(damageType.capitalize()),
-                                   ship.getModifiedItemAttr('eliteBonusBarge1'), skill='Exhumers')
+                                   ship.getModifiedItemAttr('eliteBonusBarge1'), skill='Exhumers', **kwargs)
 
 
 class Effect5840(BaseEffect):
@@ -22572,9 +22512,9 @@ class Effect5840(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Mining'),
-                                      'duration', ship.getModifiedItemAttr('eliteBonusBarge2'), skill='Exhumers')
+                                      'duration', ship.getModifiedItemAttr('eliteBonusBarge2'), skill='Exhumers', **kwargs)
 
 
 class Effect5852(BaseEffect):
@@ -22588,10 +22528,10 @@ class Effect5852(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Mining'),
                                       'miningAmount', module.getModifiedItemAttr('eliteBonusExpedition1'),
-                                      skill='Expedition Frigates')
+                                      skill='Expedition Frigates', **kwargs)
 
 
 class Effect5853(BaseEffect):
@@ -22605,9 +22545,9 @@ class Effect5853(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.ship.boostItemAttr('signatureRadius', ship.getModifiedItemAttr('eliteBonusExpedition2'),
-                               skill='Expedition Frigates')
+                               skill='Expedition Frigates', **kwargs)
 
 
 class Effect5862(BaseEffect):
@@ -22621,9 +22561,9 @@ class Effect5862(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
-                                        'emDamage', ship.getModifiedItemAttr('shipBonusCB'), skill='Caldari Battleship')
+                                        'emDamage', ship.getModifiedItemAttr('shipBonusCB'), skill='Caldari Battleship', **kwargs)
 
 
 class Effect5863(BaseEffect):
@@ -22637,10 +22577,10 @@ class Effect5863(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
                                         'kineticDamage', ship.getModifiedItemAttr('shipBonusCB'),
-                                        skill='Caldari Battleship')
+                                        skill='Caldari Battleship', **kwargs)
 
 
 class Effect5864(BaseEffect):
@@ -22654,10 +22594,10 @@ class Effect5864(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
                                         'thermalDamage', ship.getModifiedItemAttr('shipBonusCB'),
-                                        skill='Caldari Battleship')
+                                        skill='Caldari Battleship', **kwargs)
 
 
 class Effect5865(BaseEffect):
@@ -22671,10 +22611,10 @@ class Effect5865(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
                                         'explosiveDamage', ship.getModifiedItemAttr('shipBonusCB'),
-                                        skill='Caldari Battleship')
+                                        skill='Caldari Battleship', **kwargs)
 
 
 class Effect5866(BaseEffect):
@@ -22688,9 +22628,9 @@ class Effect5866(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Warp Scrambler',
-                                      'maxRange', ship.getModifiedItemAttr('shipBonusGB'), skill='Gallente Battleship')
+                                      'maxRange', ship.getModifiedItemAttr('shipBonusGB'), skill='Gallente Battleship', **kwargs)
 
 
 class Effect5867(BaseEffect):
@@ -22706,9 +22646,9 @@ class Effect5867(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
-                                        'explosionDelay', ship.getModifiedItemAttr('shipBonusRole8'))
+                                        'explosionDelay', ship.getModifiedItemAttr('shipBonusRole8'), **kwargs)
 
 
 class Effect5868(BaseEffect):
@@ -22722,8 +22662,8 @@ class Effect5868(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
-        fit.ship.boostItemAttr('capacity', module.getModifiedItemAttr('drawback'))
+    def handler(fit, module, context, **kwargs):
+        fit.ship.boostItemAttr('capacity', module.getModifiedItemAttr('drawback'), **kwargs)
 
 
 class Effect5869(BaseEffect):
@@ -22737,9 +22677,9 @@ class Effect5869(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.ship.boostItemAttr('warpSpeedMultiplier', ship.getModifiedItemAttr('eliteBonusIndustrial1'),
-                               skill='Transport Ships')
+                               skill='Transport Ships', **kwargs)
 
 
 class Effect5870(BaseEffect):
@@ -22753,9 +22693,9 @@ class Effect5870(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Operation'),
-                                      'shieldBonus', ship.getModifiedItemAttr('shipBonusCI2'), skill='Caldari Industrial')
+                                      'shieldBonus', ship.getModifiedItemAttr('shipBonusCI2'), skill='Caldari Industrial', **kwargs)
 
 
 class Effect5871(BaseEffect):
@@ -22769,9 +22709,9 @@ class Effect5871(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Operation'),
-                                      'shieldBonus', ship.getModifiedItemAttr('shipBonusMI2'), skill='Minmatar Industrial')
+                                      'shieldBonus', ship.getModifiedItemAttr('shipBonusMI2'), skill='Minmatar Industrial', **kwargs)
 
 
 class Effect5872(BaseEffect):
@@ -22785,10 +22725,10 @@ class Effect5872(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Repair Systems'),
                                       'armorDamageAmount', ship.getModifiedItemAttr('shipBonusAI2'),
-                                      skill='Amarr Industrial')
+                                      skill='Amarr Industrial', **kwargs)
 
 
 class Effect5873(BaseEffect):
@@ -22802,10 +22742,10 @@ class Effect5873(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Repair Systems'),
                                       'armorDamageAmount', ship.getModifiedItemAttr('shipBonusGI2'),
-                                      skill='Gallente Industrial')
+                                      skill='Gallente Industrial', **kwargs)
 
 
 class Effect5874(BaseEffect):
@@ -22819,9 +22759,9 @@ class Effect5874(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.ship.boostItemAttr('fleetHangarCapacity', ship.getModifiedItemAttr('eliteBonusIndustrial1'),
-                               skill='Transport Ships')
+                               skill='Transport Ships', **kwargs)
 
 
 class Effect5881(BaseEffect):
@@ -22836,10 +22776,10 @@ class Effect5881(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         for damageType in ('em', 'thermal', 'explosive', 'kinetic'):
             fit.ship.boostItemAttr('shield{}DamageResonance'.format(damageType.capitalize()),
-                                   ship.getModifiedItemAttr('eliteBonusIndustrial2'), skill='Transport Ships')
+                                   ship.getModifiedItemAttr('eliteBonusIndustrial2'), skill='Transport Ships', **kwargs)
 
 
 class Effect5888(BaseEffect):
@@ -22854,10 +22794,10 @@ class Effect5888(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         for damageType in ('em', 'thermal', 'explosive', 'kinetic'):
             fit.ship.boostItemAttr('armor{}DamageResonance'.format(damageType.capitalize()),
-                                   ship.getModifiedItemAttr('eliteBonusIndustrial2'), skill='Transport Ships')
+                                   ship.getModifiedItemAttr('eliteBonusIndustrial2'), skill='Transport Ships', **kwargs)
 
 
 class Effect5889(BaseEffect):
@@ -22871,9 +22811,9 @@ class Effect5889(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Afterburner'),
-                                      'overloadSpeedFactorBonus', ship.getModifiedItemAttr('roleBonusOverheatDST'))
+                                      'overloadSpeedFactorBonus', ship.getModifiedItemAttr('roleBonusOverheatDST'), **kwargs)
 
 
 class Effect5890(BaseEffect):
@@ -22887,9 +22827,9 @@ class Effect5890(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('High Speed Maneuvering'),
-                                      'overloadSpeedFactorBonus', ship.getModifiedItemAttr('roleBonusOverheatDST'))
+                                      'overloadSpeedFactorBonus', ship.getModifiedItemAttr('roleBonusOverheatDST'), **kwargs)
 
 
 class Effect5891(BaseEffect):
@@ -22903,9 +22843,9 @@ class Effect5891(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Hull Upgrades'),
-                                      'overloadHardeningBonus', ship.getModifiedItemAttr('roleBonusOverheatDST'))
+                                      'overloadHardeningBonus', ship.getModifiedItemAttr('roleBonusOverheatDST'), **kwargs)
 
 
 class Effect5892(BaseEffect):
@@ -22919,9 +22859,9 @@ class Effect5892(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Hull Upgrades'),
-                                      'overloadSelfDurationBonus', ship.getModifiedItemAttr('roleBonusOverheatDST'))
+                                      'overloadSelfDurationBonus', ship.getModifiedItemAttr('roleBonusOverheatDST'), **kwargs)
 
 
 class Effect5893(BaseEffect):
@@ -22935,9 +22875,9 @@ class Effect5893(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Tactical Shield Manipulation'),
-                                      'overloadHardeningBonus', ship.getModifiedItemAttr('roleBonusOverheatDST'))
+                                      'overloadHardeningBonus', ship.getModifiedItemAttr('roleBonusOverheatDST'), **kwargs)
 
 
 class Effect5896(BaseEffect):
@@ -22951,11 +22891,11 @@ class Effect5896(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Operation'),
-                                      'overloadShieldBonus', ship.getModifiedItemAttr('roleBonusOverheatDST'))
+                                      'overloadShieldBonus', ship.getModifiedItemAttr('roleBonusOverheatDST'), **kwargs)
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Operation'),
-                                      'overloadSelfDurationBonus', ship.getModifiedItemAttr('roleBonusOverheatDST'))
+                                      'overloadSelfDurationBonus', ship.getModifiedItemAttr('roleBonusOverheatDST'), **kwargs)
 
 
 class Effect5899(BaseEffect):
@@ -22969,11 +22909,11 @@ class Effect5899(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Repair Systems'),
-                                      'overloadArmorDamageAmount', ship.getModifiedItemAttr('roleBonusOverheatDST'))
+                                      'overloadArmorDamageAmount', ship.getModifiedItemAttr('roleBonusOverheatDST'), **kwargs)
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Repair Systems'),
-                                      'overloadSelfDurationBonus', ship.getModifiedItemAttr('roleBonusOverheatDST'))
+                                      'overloadSelfDurationBonus', ship.getModifiedItemAttr('roleBonusOverheatDST'), **kwargs)
 
 
 class Effect5900(BaseEffect):
@@ -22987,8 +22927,8 @@ class Effect5900(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
-        fit.ship.increaseItemAttr('warpSpeedMultiplier', module.getModifiedItemAttr('warpSpeedAdd'))
+    def handler(fit, module, context, **kwargs):
+        fit.ship.increaseItemAttr('warpSpeedMultiplier', module.getModifiedItemAttr('warpSpeedAdd'), **kwargs)
 
 
 class Effect5901(BaseEffect):
@@ -23003,9 +22943,9 @@ class Effect5901(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Reinforced Bulkhead',
-                                      'cpu', ship.getModifiedItemAttr('cpuNeedBonus'))
+                                      'cpu', ship.getModifiedItemAttr('cpuNeedBonus'), **kwargs)
 
 
 class Effect5911(BaseEffect):
@@ -23020,9 +22960,9 @@ class Effect5911(BaseEffect):
     type = ('projected', 'passive')
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         fit.ship.boostItemAttr('jumpDriveConsumptionAmount',
-                               module.getModifiedItemAttr('consumptionQuantityBonusPercentage'), stackingPenalties=True)
+                               module.getModifiedItemAttr('consumptionQuantityBonusPercentage'), stackingPenalties=True, **kwargs)
 
 
 class Effect5912(BaseEffect):
@@ -23037,10 +22977,10 @@ class Effect5912(BaseEffect):
     type = ('projected', 'passive')
 
     @staticmethod
-    def handler(fit, beacon, context):
+    def handler(fit, beacon, context, **kwargs):
         fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == 'Remote Capacitor Transmitter',
                                          'powerTransferAmount', beacon.getModifiedItemAttr('energyTransferAmountBonus'),
-                                         stackingPenalties=True, penaltyGroup='postMul')
+                                         stackingPenalties=True, penaltyGroup='postMul', **kwargs)
 
 
 class Effect5913(BaseEffect):
@@ -23055,8 +22995,8 @@ class Effect5913(BaseEffect):
     type = ('projected', 'passive')
 
     @staticmethod
-    def handler(fit, beacon, context):
-        fit.ship.multiplyItemAttr('armorHP', beacon.getModifiedItemAttr('armorHPMultiplier'))
+    def handler(fit, beacon, context, **kwargs):
+        fit.ship.multiplyItemAttr('armorHP', beacon.getModifiedItemAttr('armorHPMultiplier'), **kwargs)
 
 
 class Effect5914(BaseEffect):
@@ -23071,11 +23011,11 @@ class Effect5914(BaseEffect):
     type = ('projected', 'passive')
 
     @staticmethod
-    def handler(fit, beacon, context):
+    def handler(fit, beacon, context, **kwargs):
         fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == 'Energy Neutralizer',
                                          'energyNeutralizerAmount',
                                          beacon.getModifiedItemAttr('energyWarfareStrengthMultiplier'),
-                                         stackingPenalties=True, penaltyGroup='postMul')
+                                         stackingPenalties=True, penaltyGroup='postMul', **kwargs)
 
 
 class Effect5915(BaseEffect):
@@ -23090,11 +23030,11 @@ class Effect5915(BaseEffect):
     type = ('projected', 'passive')
 
     @staticmethod
-    def handler(fit, beacon, context):
+    def handler(fit, beacon, context, **kwargs):
         fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == 'Energy Nosferatu',
                                          'powerTransferAmount',
                                          beacon.getModifiedItemAttr('energyWarfareStrengthMultiplier'),
-                                         stackingPenalties=True, penaltyGroup='postMul')
+                                         stackingPenalties=True, penaltyGroup='postMul', **kwargs)
 
 
 class Effect5916(BaseEffect):
@@ -23109,10 +23049,10 @@ class Effect5916(BaseEffect):
     type = ('projected', 'passive')
 
     @staticmethod
-    def handler(fit, beacon, context):
+    def handler(fit, beacon, context, **kwargs):
         fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill('Bomb Deployment'),
                                            'explosiveDamage', beacon.getModifiedItemAttr('smartbombDamageMultiplier'),
-                                           stackingPenalties=True, penaltyGroup='postMul')
+                                           stackingPenalties=True, penaltyGroup='postMul', **kwargs)
 
 
 class Effect5917(BaseEffect):
@@ -23127,10 +23067,10 @@ class Effect5917(BaseEffect):
     type = ('projected', 'passive')
 
     @staticmethod
-    def handler(fit, beacon, context):
+    def handler(fit, beacon, context, **kwargs):
         fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill('Bomb Deployment'),
                                            'kineticDamage', beacon.getModifiedItemAttr('smartbombDamageMultiplier'),
-                                           stackingPenalties=True, penaltyGroup='postMul')
+                                           stackingPenalties=True, penaltyGroup='postMul', **kwargs)
 
 
 class Effect5918(BaseEffect):
@@ -23145,10 +23085,10 @@ class Effect5918(BaseEffect):
     type = ('projected', 'passive')
 
     @staticmethod
-    def handler(fit, beacon, context):
+    def handler(fit, beacon, context, **kwargs):
         fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill('Bomb Deployment'),
                                            'thermalDamage', beacon.getModifiedItemAttr('smartbombDamageMultiplier'),
-                                           stackingPenalties=True, penaltyGroup='postMul')
+                                           stackingPenalties=True, penaltyGroup='postMul', **kwargs)
 
 
 class Effect5919(BaseEffect):
@@ -23163,10 +23103,10 @@ class Effect5919(BaseEffect):
     type = ('projected', 'passive')
 
     @staticmethod
-    def handler(fit, beacon, context):
+    def handler(fit, beacon, context, **kwargs):
         fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill('Bomb Deployment'),
                                            'emDamage', beacon.getModifiedItemAttr('smartbombDamageMultiplier'),
-                                           stackingPenalties=True, penaltyGroup='postMul')
+                                           stackingPenalties=True, penaltyGroup='postMul', **kwargs)
 
 
 class Effect5920(BaseEffect):
@@ -23181,9 +23121,9 @@ class Effect5920(BaseEffect):
     type = ('projected', 'passive')
 
     @staticmethod
-    def handler(fit, beacon, context):
+    def handler(fit, beacon, context, **kwargs):
         fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
-                                           'aoeCloudSize', beacon.getModifiedItemAttr('aoeCloudSizeMultiplier'))
+                                           'aoeCloudSize', beacon.getModifiedItemAttr('aoeCloudSizeMultiplier'), **kwargs)
 
 
 class Effect5921(BaseEffect):
@@ -23198,11 +23138,11 @@ class Effect5921(BaseEffect):
     type = ('projected', 'passive')
 
     @staticmethod
-    def handler(fit, beacon, context):
+    def handler(fit, beacon, context, **kwargs):
         fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill('Target Painting'),
                                          'signatureRadiusBonus',
                                          beacon.getModifiedItemAttr('targetPainterStrengthMultiplier'),
-                                         stackingPenalties=True, penaltyGroup='postMul')
+                                         stackingPenalties=True, penaltyGroup='postMul', **kwargs)
 
 
 class Effect5922(BaseEffect):
@@ -23217,10 +23157,10 @@ class Effect5922(BaseEffect):
     type = ('projected', 'passive')
 
     @staticmethod
-    def handler(fit, beacon, context):
+    def handler(fit, beacon, context, **kwargs):
         fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == 'Stasis Web',
                                          'speedFactor', beacon.getModifiedItemAttr('stasisWebStrengthMultiplier'),
-                                         stackingPenalties=True, penaltyGroup='postMul')
+                                         stackingPenalties=True, penaltyGroup='postMul', **kwargs)
 
 
 class Effect5923(BaseEffect):
@@ -23235,11 +23175,11 @@ class Effect5923(BaseEffect):
     type = ('projected', 'passive')
 
     @staticmethod
-    def handler(fit, beacon, context):
+    def handler(fit, beacon, context, **kwargs):
         fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill('Bomb Deployment'),
                                            'energyNeutralizerAmount',
                                            beacon.getModifiedItemAttr('smartbombDamageMultiplier'),
-                                           stackingPenalties=True, penaltyGroup='postMul')
+                                           stackingPenalties=True, penaltyGroup='postMul', **kwargs)
 
 
 class Effect5924(BaseEffect):
@@ -23254,11 +23194,11 @@ class Effect5924(BaseEffect):
     type = ('projected', 'passive')
 
     @staticmethod
-    def handler(fit, beacon, context):
+    def handler(fit, beacon, context, **kwargs):
         fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill('Bomb Deployment'),
                                            'scanGravimetricStrengthBonus',
                                            beacon.getModifiedItemAttr('smartbombDamageMultiplier'),
-                                           stackingPenalties=True, penaltyGroup='postMul')
+                                           stackingPenalties=True, penaltyGroup='postMul', **kwargs)
 
 
 class Effect5925(BaseEffect):
@@ -23273,11 +23213,11 @@ class Effect5925(BaseEffect):
     type = ('projected', 'passive')
 
     @staticmethod
-    def handler(fit, beacon, context):
+    def handler(fit, beacon, context, **kwargs):
         fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill('Bomb Deployment'),
                                            'scanLadarStrengthBonus',
                                            beacon.getModifiedItemAttr('smartbombDamageMultiplier'),
-                                           stackingPenalties=True, penaltyGroup='postMul')
+                                           stackingPenalties=True, penaltyGroup='postMul', **kwargs)
 
 
 class Effect5926(BaseEffect):
@@ -23292,11 +23232,11 @@ class Effect5926(BaseEffect):
     type = ('projected', 'passive')
 
     @staticmethod
-    def handler(fit, beacon, context):
+    def handler(fit, beacon, context, **kwargs):
         fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill('Bomb Deployment'),
                                            'scanMagnetometricStrengthBonus',
                                            beacon.getModifiedItemAttr('smartbombDamageMultiplier'),
-                                           stackingPenalties=True, penaltyGroup='postMul')
+                                           stackingPenalties=True, penaltyGroup='postMul', **kwargs)
 
 
 class Effect5927(BaseEffect):
@@ -23311,11 +23251,11 @@ class Effect5927(BaseEffect):
     type = ('projected', 'passive')
 
     @staticmethod
-    def handler(fit, beacon, context):
+    def handler(fit, beacon, context, **kwargs):
         fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill('Bomb Deployment'),
                                            'scanRadarStrengthBonus',
                                            beacon.getModifiedItemAttr('smartbombDamageMultiplier'),
-                                           stackingPenalties=True, penaltyGroup='postMul')
+                                           stackingPenalties=True, penaltyGroup='postMul', **kwargs)
 
 
 class Effect5929(BaseEffect):
@@ -23330,10 +23270,10 @@ class Effect5929(BaseEffect):
     type = ('projected', 'passive')
 
     @staticmethod
-    def handler(fit, beacon, context):
+    def handler(fit, beacon, context, **kwargs):
         fit.drones.filteredItemMultiply(lambda drone: True,
                                         'trackingSpeed', beacon.getModifiedItemAttr('trackingSpeedMultiplier'),
-                                        stackingPenalties=True, penaltyGroup='postMul')
+                                        stackingPenalties=True, penaltyGroup='postMul', **kwargs)
 
 
 class Effect5934(BaseEffect):
@@ -23348,14 +23288,14 @@ class Effect5934(BaseEffect):
     type = 'projected', 'active'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         if 'projected' not in context:
             return
 
         fit.ship.increaseItemAttr('warpScrambleStatus', module.getModifiedItemAttr('warpScrambleStrength'))
         fit.modules.filteredItemIncrease(
             lambda mod: mod.item.requiresSkill('High Speed Maneuvering') or mod.item.requiresSkill('Micro Jump Drive Operation'),
-            'activationBlocked', module.getModifiedItemAttr('activationBlockedStrenght'))
+            'activationBlocked', module.getModifiedItemAttr('activationBlockedStrenght'), **kwargs)
 
 
 class Effect5938(BaseEffect):
@@ -23369,10 +23309,10 @@ class Effect5938(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredChargeBoost(
             lambda mod: mod.charge.requiresSkill('Rockets') or mod.charge.requiresSkill('Light Missiles'),
-            'aoeCloudSize', ship.getModifiedItemAttr('shipBonusCF2'), skill='Caldari Frigate')
+            'aoeCloudSize', ship.getModifiedItemAttr('shipBonusCF2'), skill='Caldari Frigate', **kwargs)
 
 
 class Effect5939(BaseEffect):
@@ -23386,9 +23326,9 @@ class Effect5939(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Missile Launcher Rocket',
-                                      'speed', ship.getModifiedItemAttr('shipBonus2AF'), skill='Amarr Frigate')
+                                      'speed', ship.getModifiedItemAttr('shipBonus2AF'), skill='Amarr Frigate', **kwargs)
 
 
 class Effect5940(BaseEffect):
@@ -23402,9 +23342,9 @@ class Effect5940(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Hybrid Turret'),
-                                      'speed', ship.getModifiedItemAttr('eliteBonusInterdictors1'), skill='Interdictors')
+                                      'speed', ship.getModifiedItemAttr('eliteBonusInterdictors1'), skill='Interdictors', **kwargs)
 
 
 class Effect5944(BaseEffect):
@@ -23418,9 +23358,9 @@ class Effect5944(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Missile Launcher Operation'),
-                                      'speed', ship.getModifiedItemAttr('shipBonusAD1'), skill='Amarr Destroyer')
+                                      'speed', ship.getModifiedItemAttr('shipBonusAD1'), skill='Amarr Destroyer', **kwargs)
 
 
 class Effect5945(BaseEffect):
@@ -23435,13 +23375,13 @@ class Effect5945(BaseEffect):
     type = 'active'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         # Set flag which is used to determine if ship is cloaked or not
         # This is used to apply cloak-only bonuses, like Black Ops' speed bonus
         # Doesn't apply to covops cloaks
         fit.extraAttributes['cloaked'] = True
         # Apply speed penalty
-        fit.ship.multiplyItemAttr('maxVelocity', module.getModifiedItemAttr('maxVelocityModifier'))
+        fit.ship.multiplyItemAttr('maxVelocity', module.getModifiedItemAttr('maxVelocityModifier'), **kwargs)
 
 
 class Effect5951(BaseEffect):
@@ -23455,8 +23395,8 @@ class Effect5951(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
-        fit.ship.boostItemAttr('warpSpeedMultiplier', module.getModifiedItemAttr('drawback'), stackingPenalties=True)
+    def handler(fit, module, context, **kwargs):
+        fit.ship.boostItemAttr('warpSpeedMultiplier', module.getModifiedItemAttr('drawback'), stackingPenalties=True, **kwargs)
 
 
 class Effect5956(BaseEffect):
@@ -23470,9 +23410,9 @@ class Effect5956(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Energy Turret'),
-                                      'damageMultiplier', ship.getModifiedItemAttr('shipBonusAC2'), skill='Amarr Cruiser')
+                                      'damageMultiplier', ship.getModifiedItemAttr('shipBonusAC2'), skill='Amarr Cruiser', **kwargs)
 
 
 class Effect5957(BaseEffect):
@@ -23486,10 +23426,10 @@ class Effect5957(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Energy Turret'),
                                       'maxRange', ship.getModifiedItemAttr('eliteBonusHeavyInterdictors1'),
-                                      skill='Heavy Interdiction Cruisers')
+                                      skill='Heavy Interdiction Cruisers', **kwargs)
 
 
 class Effect5958(BaseEffect):
@@ -23504,9 +23444,9 @@ class Effect5958(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Hybrid Turret'),
-                                      'trackingSpeed', ship.getModifiedItemAttr('shipBonusGC'), skill='Gallente Cruiser')
+                                      'trackingSpeed', ship.getModifiedItemAttr('shipBonusGC'), skill='Gallente Cruiser', **kwargs)
 
 
 class Effect5959(BaseEffect):
@@ -23520,10 +23460,10 @@ class Effect5959(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Hybrid Turret'),
                                       'maxRange', ship.getModifiedItemAttr('eliteBonusHeavyInterdictors1'),
-                                      skill='Heavy Interdiction Cruisers')
+                                      skill='Heavy Interdiction Cruisers', **kwargs)
 
 
 class Effect5994(BaseEffect):
@@ -23537,10 +23477,10 @@ class Effect5994(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         for dmgType in ('em', 'thermal', 'kinetic', 'explosive'):
             tgtAttr = '{}DamageResonance'.format(dmgType)
-            fit.ship.forceItemAttr(tgtAttr, module.getModifiedItemAttr('resistanceKillerHull'))
+            fit.ship.forceItemAttr(tgtAttr, module.getModifiedItemAttr('resistanceKillerHull'), **kwargs)
 
 
 class Effect5995(BaseEffect):
@@ -23554,11 +23494,11 @@ class Effect5995(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         for layer in ('armor', 'shield'):
             for dmgType in ('em', 'thermal', 'kinetic', 'explosive'):
                 tgtAttr = '{}{}DamageResonance'.format(layer, dmgType.capitalize())
-                fit.ship.forceItemAttr(tgtAttr, module.getModifiedItemAttr('resistanceKiller'))
+                fit.ship.forceItemAttr(tgtAttr, module.getModifiedItemAttr('resistanceKiller'), **kwargs)
 
 
 class Effect5998(BaseEffect):
@@ -23572,10 +23512,10 @@ class Effect5998(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         # todo: stacking?
         fit.ship.boostItemAttr('agility', ship.getModifiedItemAttr('freighterBonusO2'), skill='ORE Freighter',
-                               stackingPenalties=True)
+                               stackingPenalties=True, **kwargs)
 
 
 class Effect6001(BaseEffect):
@@ -23589,9 +23529,9 @@ class Effect6001(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.ship.boostItemAttr('shipMaintenanceBayCapacity', ship.getModifiedItemAttr('freighterBonusO1'),
-                               skill='ORE Freighter')
+                               skill='ORE Freighter', **kwargs)
 
 
 class Effect6006(BaseEffect):
@@ -23605,10 +23545,10 @@ class Effect6006(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Energy Turret'),
                                       'damageMultiplier', ship.getModifiedItemAttr('shipBonusTacticalDestroyerAmarr1'),
-                                      skill='Amarr Tactical Destroyer')
+                                      skill='Amarr Tactical Destroyer', **kwargs)
 
 
 class Effect6007(BaseEffect):
@@ -23622,10 +23562,10 @@ class Effect6007(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Energy Turret'),
                                       'capacitorNeed', ship.getModifiedItemAttr('shipBonusTacticalDestroyerAmarr2'),
-                                      skill='Amarr Tactical Destroyer')
+                                      skill='Amarr Tactical Destroyer', **kwargs)
 
 
 class Effect6008(BaseEffect):
@@ -23639,10 +23579,10 @@ class Effect6008(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: True, 'heatDamage',
                                       ship.getModifiedItemAttr('shipBonusTacticalDestroyerAmarr3'),
-                                      skill='Amarr Tactical Destroyer')
+                                      skill='Amarr Tactical Destroyer', **kwargs)
 
 
 class Effect6009(BaseEffect):
@@ -23657,8 +23597,8 @@ class Effect6009(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Astrometrics'), 'cpu', src.getModifiedItemAttr('roleBonusT3ProbeCPU'))
+    def handler(fit, src, context, **kwargs):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Astrometrics'), 'cpu', src.getModifiedItemAttr('roleBonusT3ProbeCPU'), **kwargs)
 
 
 class Effect6010(BaseEffect):
@@ -23672,13 +23612,13 @@ class Effect6010(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         fit.ship.multiplyItemAttr(
             'maxTargetRange',
             1 / module.getModifiedItemAttr('modeMaxTargetRangePostDiv'),
             stackingPenalties=True,
-            penaltyGroup='postDiv'
-        )
+            penaltyGroup='postDiv',
+            **kwargs)
 
 
 class Effect6011(BaseEffect):
@@ -23692,14 +23632,14 @@ class Effect6011(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         fit.modules.filteredItemMultiply(
             lambda mod: mod.item.requiresSkill('Small Energy Turret'),
             'maxRange',
             1 / module.getModifiedItemAttr('modeMaxRangePostDiv'),
             stackingPenalties=True,
-            penaltyGroup='postDiv'
-        )
+            penaltyGroup='postDiv',
+            **kwargs)
 
 
 class Effect6012(BaseEffect):
@@ -23713,14 +23653,14 @@ class Effect6012(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         for scanType in ('Gravimetric', 'Magnetometric', 'Radar', 'Ladar'):
             fit.ship.multiplyItemAttr(
                 'scan{}Strength'.format(scanType),
                 1 / (module.getModifiedItemAttr('mode{}StrengthPostDiv'.format(scanType)) or 1),
                 stackingPenalties=True,
-                penaltyGroup='postDiv'
-            )
+                penaltyGroup='postDiv',
+                **kwargs)
 
 
 class Effect6014(BaseEffect):
@@ -23735,9 +23675,9 @@ class Effect6014(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         fit.ship.multiplyItemAttr('signatureRadius', 1 / module.getModifiedItemAttr('modeSignatureRadiusPostDiv'),
-                                  stackingPenalties=True, penaltyGroup='postDiv')
+                                  stackingPenalties=True, penaltyGroup='postDiv', **kwargs)
 
 
 class Effect6015(BaseEffect):
@@ -23751,7 +23691,7 @@ class Effect6015(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         for srcResType, tgtResType in (
                 ('Em', 'Em'),
                 ('Explosive', 'Explosive'),
@@ -23762,8 +23702,8 @@ class Effect6015(BaseEffect):
                 'armor{0}DamageResonance'.format(tgtResType),
                 1 / module.getModifiedItemAttr('mode{0}ResistancePostDiv'.format(srcResType)),
                 stackingPenalties=True,
-                penaltyGroup='postDiv'
-            )
+                penaltyGroup='postDiv',
+                **kwargs)
 
 
 class Effect6016(BaseEffect):
@@ -23777,13 +23717,13 @@ class Effect6016(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         fit.ship.multiplyItemAttr(
             'agility',
             1 / module.getModifiedItemAttr('modeAgilityPostDiv'),
             stackingPenalties=True,
-            penaltyGroup='postDiv'
-        )
+            penaltyGroup='postDiv',
+            **kwargs)
 
 
 class Effect6017(BaseEffect):
@@ -23797,13 +23737,13 @@ class Effect6017(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         fit.ship.multiplyItemAttr(
             'maxVelocity',
             1 / module.getModifiedItemAttr('modeVelocityPostDiv'),
             stackingPenalties=True,
-            penaltyGroup='postDiv'
-        )
+            penaltyGroup='postDiv',
+            **kwargs)
 
 
 class Effect6020(BaseEffect):
@@ -23817,9 +23757,9 @@ class Effect6020(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Energy Neutralizer', 'maxRange',
-                                      src.getModifiedItemAttr('eliteBonusReconShip3'), skill='Recon Ships')
+                                      src.getModifiedItemAttr('eliteBonusReconShip3'), skill='Recon Ships', **kwargs)
 
 
 class Effect6021(BaseEffect):
@@ -23833,9 +23773,9 @@ class Effect6021(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Energy Nosferatu', 'maxRange',
-                                      src.getModifiedItemAttr('eliteBonusReconShip3'), skill='Recon Ships')
+                                      src.getModifiedItemAttr('eliteBonusReconShip3'), skill='Recon Ships', **kwargs)
 
 
 class Effect6025(BaseEffect):
@@ -23849,9 +23789,9 @@ class Effect6025(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Hybrid Turret'),
-                                      'maxRange', ship.getModifiedItemAttr('eliteBonusReconShip1'), skill='Recon Ships')
+                                      'maxRange', ship.getModifiedItemAttr('eliteBonusReconShip1'), skill='Recon Ships', **kwargs)
 
 
 class Effect6027(BaseEffect):
@@ -23865,10 +23805,10 @@ class Effect6027(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Projectile Turret'),
                                       'damageMultiplier', ship.getModifiedItemAttr('eliteBonusReconShip1'),
-                                      skill='Recon Ships')
+                                      skill='Recon Ships', **kwargs)
 
 
 class Effect6032(BaseEffect):
@@ -23882,9 +23822,9 @@ class Effect6032(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Remote Capacitor Transmitter',
-                                      'power', ship.getModifiedItemAttr('powerTransferPowerNeedBonus'))
+                                      'power', ship.getModifiedItemAttr('powerTransferPowerNeedBonus'), **kwargs)
 
 
 class Effect6036(BaseEffect):
@@ -23898,10 +23838,10 @@ class Effect6036(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: True, 'heatDamage',
                                       ship.getModifiedItemAttr('shipBonusTacticalDestroyerMinmatar3'),
-                                      skill='Minmatar Tactical Destroyer')
+                                      skill='Minmatar Tactical Destroyer', **kwargs)
 
 
 class Effect6037(BaseEffect):
@@ -23915,10 +23855,10 @@ class Effect6037(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Projectile Turret'),
                                       'damageMultiplier', ship.getModifiedItemAttr('shipBonusTacticalDestroyerMinmatar1'),
-                                      skill='Minmatar Tactical Destroyer')
+                                      skill='Minmatar Tactical Destroyer', **kwargs)
 
 
 class Effect6038(BaseEffect):
@@ -23932,10 +23872,10 @@ class Effect6038(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Projectile Turret'),
                                       'maxRange', ship.getModifiedItemAttr('shipBonusTacticalDestroyerMinmatar2'),
-                                      skill='Minmatar Tactical Destroyer')
+                                      skill='Minmatar Tactical Destroyer', **kwargs)
 
 
 class Effect6039(BaseEffect):
@@ -23949,14 +23889,14 @@ class Effect6039(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         fit.modules.filteredItemMultiply(
             lambda mod: mod.item.requiresSkill('Small Projectile Turret'),
             'trackingSpeed',
             1 / module.getModifiedItemAttr('modeTrackingPostDiv'),
             stackingPenalties=True,
-            penaltyGroup='postDiv'
-        )
+            penaltyGroup='postDiv',
+            **kwargs)
 
 
 class Effect6040(BaseEffect):
@@ -23970,14 +23910,14 @@ class Effect6040(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         fit.modules.filteredItemMultiply(
             lambda mod: mod.item.requiresSkill('High Speed Maneuvering'),
             'signatureRadiusBonus',
             1 / module.getModifiedItemAttr('modeMWDSigPenaltyPostDiv'),
             stackingPenalties=True,
-            penaltyGroup='postDiv'
-        )
+            penaltyGroup='postDiv',
+            **kwargs)
 
 
 class Effect6041(BaseEffect):
@@ -23992,7 +23932,7 @@ class Effect6041(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         for srcResType, tgtResType in (
                 ('Em', 'Em'),
                 ('Explosive', 'Explosive'),
@@ -24003,8 +23943,8 @@ class Effect6041(BaseEffect):
                 'shield{0}DamageResonance'.format(tgtResType),
                 1 / module.getModifiedItemAttr('mode{0}ResistancePostDiv'.format(srcResType)),
                 stackingPenalties=True,
-                penaltyGroup='postDiv'
-            )
+                penaltyGroup='postDiv',
+                **kwargs)
 
 
 class Effect6045(BaseEffect):
@@ -24018,9 +23958,9 @@ class Effect6045(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Sentry Drone Interfacing'),
-                                     'damageMultiplier', ship.getModifiedItemAttr('shipBonusGC3'), skill='Gallente Cruiser')
+                                     'damageMultiplier', ship.getModifiedItemAttr('shipBonusGC3'), skill='Gallente Cruiser', **kwargs)
 
 
 class Effect6046(BaseEffect):
@@ -24034,9 +23974,9 @@ class Effect6046(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Sentry Drone Interfacing'),
-                                     'hp', ship.getModifiedItemAttr('shipBonusGC3'), skill='Gallente Cruiser')
+                                     'hp', ship.getModifiedItemAttr('shipBonusGC3'), skill='Gallente Cruiser', **kwargs)
 
 
 class Effect6047(BaseEffect):
@@ -24050,9 +23990,9 @@ class Effect6047(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Sentry Drone Interfacing'),
-                                     'armorHP', ship.getModifiedItemAttr('shipBonusGC3'), skill='Gallente Cruiser')
+                                     'armorHP', ship.getModifiedItemAttr('shipBonusGC3'), skill='Gallente Cruiser', **kwargs)
 
 
 class Effect6048(BaseEffect):
@@ -24066,9 +24006,9 @@ class Effect6048(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Sentry Drone Interfacing'),
-                                     'shieldCapacity', ship.getModifiedItemAttr('shipBonusGC3'), skill='Gallente Cruiser')
+                                     'shieldCapacity', ship.getModifiedItemAttr('shipBonusGC3'), skill='Gallente Cruiser', **kwargs)
 
 
 class Effect6051(BaseEffect):
@@ -24082,9 +24022,9 @@ class Effect6051(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Light Drone Operation'),
-                                     'damageMultiplier', ship.getModifiedItemAttr('shipBonusGC2'), skill='Gallente Cruiser')
+                                     'damageMultiplier', ship.getModifiedItemAttr('shipBonusGC2'), skill='Gallente Cruiser', **kwargs)
 
 
 class Effect6052(BaseEffect):
@@ -24098,9 +24038,9 @@ class Effect6052(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Medium Drone Operation'),
-                                     'damageMultiplier', ship.getModifiedItemAttr('shipBonusGC2'), skill='Gallente Cruiser')
+                                     'damageMultiplier', ship.getModifiedItemAttr('shipBonusGC2'), skill='Gallente Cruiser', **kwargs)
 
 
 class Effect6053(BaseEffect):
@@ -24114,9 +24054,9 @@ class Effect6053(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Heavy Drone Operation'),
-                                     'damageMultiplier', ship.getModifiedItemAttr('shipBonusGC2'), skill='Gallente Cruiser')
+                                     'damageMultiplier', ship.getModifiedItemAttr('shipBonusGC2'), skill='Gallente Cruiser', **kwargs)
 
 
 class Effect6054(BaseEffect):
@@ -24130,9 +24070,9 @@ class Effect6054(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Heavy Drone Operation'),
-                                     'hp', ship.getModifiedItemAttr('shipBonusGC2'), skill='Gallente Cruiser')
+                                     'hp', ship.getModifiedItemAttr('shipBonusGC2'), skill='Gallente Cruiser', **kwargs)
 
 
 class Effect6055(BaseEffect):
@@ -24146,9 +24086,9 @@ class Effect6055(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Heavy Drone Operation'),
-                                     'armorHP', ship.getModifiedItemAttr('shipBonusGC2'), skill='Gallente Cruiser')
+                                     'armorHP', ship.getModifiedItemAttr('shipBonusGC2'), skill='Gallente Cruiser', **kwargs)
 
 
 class Effect6056(BaseEffect):
@@ -24162,9 +24102,9 @@ class Effect6056(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Heavy Drone Operation'),
-                                     'shieldCapacity', ship.getModifiedItemAttr('shipBonusGC2'), skill='Gallente Cruiser')
+                                     'shieldCapacity', ship.getModifiedItemAttr('shipBonusGC2'), skill='Gallente Cruiser', **kwargs)
 
 
 class Effect6057(BaseEffect):
@@ -24178,9 +24118,9 @@ class Effect6057(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Medium Drone Operation'),
-                                     'shieldCapacity', ship.getModifiedItemAttr('shipBonusGC2'), skill='Gallente Cruiser')
+                                     'shieldCapacity', ship.getModifiedItemAttr('shipBonusGC2'), skill='Gallente Cruiser', **kwargs)
 
 
 class Effect6058(BaseEffect):
@@ -24194,9 +24134,9 @@ class Effect6058(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Medium Drone Operation'),
-                                     'armorHP', ship.getModifiedItemAttr('shipBonusGC2'), skill='Gallente Cruiser')
+                                     'armorHP', ship.getModifiedItemAttr('shipBonusGC2'), skill='Gallente Cruiser', **kwargs)
 
 
 class Effect6059(BaseEffect):
@@ -24210,9 +24150,9 @@ class Effect6059(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Medium Drone Operation'),
-                                     'hp', ship.getModifiedItemAttr('shipBonusGC2'), skill='Gallente Cruiser')
+                                     'hp', ship.getModifiedItemAttr('shipBonusGC2'), skill='Gallente Cruiser', **kwargs)
 
 
 class Effect6060(BaseEffect):
@@ -24226,9 +24166,9 @@ class Effect6060(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Light Drone Operation'),
-                                     'hp', ship.getModifiedItemAttr('shipBonusGC2'), skill='Gallente Cruiser')
+                                     'hp', ship.getModifiedItemAttr('shipBonusGC2'), skill='Gallente Cruiser', **kwargs)
 
 
 class Effect6061(BaseEffect):
@@ -24242,9 +24182,9 @@ class Effect6061(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Light Drone Operation'),
-                                     'armorHP', ship.getModifiedItemAttr('shipBonusGC2'), skill='Gallente Cruiser')
+                                     'armorHP', ship.getModifiedItemAttr('shipBonusGC2'), skill='Gallente Cruiser', **kwargs)
 
 
 class Effect6062(BaseEffect):
@@ -24258,9 +24198,9 @@ class Effect6062(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Light Drone Operation'),
-                                     'shieldCapacity', ship.getModifiedItemAttr('shipBonusGC2'), skill='Gallente Cruiser')
+                                     'shieldCapacity', ship.getModifiedItemAttr('shipBonusGC2'), skill='Gallente Cruiser', **kwargs)
 
 
 class Effect6063(BaseEffect):
@@ -24274,14 +24214,13 @@ class Effect6063(BaseEffect):
     type = 'active'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         fit.ship.forceItemAttr('disallowAssistance', module.getModifiedItemAttr('disallowAssistance'))
         for scanType in ('Gravimetric', 'Magnetometric', 'Radar', 'Ladar'):
             fit.ship.boostItemAttr(
                 'scan{}Strength'.format(scanType),
                 module.getModifiedItemAttr('scan{}StrengthPercent'.format(scanType)),
-                stackingPenalties=True
-            )
+                stackingPenalties=True, **kwargs)
 
 
 class Effect6076(BaseEffect):
@@ -24295,14 +24234,14 @@ class Effect6076(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         fit.modules.filteredChargeMultiply(
             lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
             'maxVelocity',
             1 / module.getModifiedItemAttr('modeMaxRangePostDiv'),
             stackingPenalties=True,
-            penaltyGroup='postDiv'
-        )
+            penaltyGroup='postDiv',
+            **kwargs)
 
 
 class Effect6077(BaseEffect):
@@ -24316,10 +24255,10 @@ class Effect6077(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: True, 'heatDamage',
                                       ship.getModifiedItemAttr('shipBonusTacticalDestroyerCaldari3'),
-                                      skill='Caldari Tactical Destroyer')
+                                      skill='Caldari Tactical Destroyer', **kwargs)
 
 
 class Effect6083(BaseEffect):
@@ -24334,11 +24273,11 @@ class Effect6083(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         for damageType in ('em', 'explosive', 'kinetic', 'thermal'):
             fit.modules.filteredChargeBoost(
                 lambda mod: mod.charge.requiresSkill('Rockets') or mod.charge.requiresSkill('Light Missiles'),
-                '{0}Damage'.format(damageType), ship.getModifiedItemAttr('shipBonusRole7'))
+                '{0}Damage'.format(damageType), ship.getModifiedItemAttr('shipBonusRole7'), **kwargs)
 
 
 class Effect6085(BaseEffect):
@@ -24352,10 +24291,10 @@ class Effect6085(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Missile Launcher Operation'),
                                       'speed', ship.getModifiedItemAttr('shipBonusTacticalDestroyerCaldari1'),
-                                      skill='Caldari Tactical Destroyer')
+                                      skill='Caldari Tactical Destroyer', **kwargs)
 
 
 class Effect6088(BaseEffect):
@@ -24370,11 +24309,11 @@ class Effect6088(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         for damageType in ('em', 'explosive', 'kinetic', 'thermal'):
             fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Assault Missiles'),
                                             '{0}Damage'.format(damageType), ship.getModifiedItemAttr('shipBonusMC2'),
-                                            skill='Minmatar Cruiser')
+                                            skill='Minmatar Cruiser', **kwargs)
 
 
 class Effect6093(BaseEffect):
@@ -24389,11 +24328,11 @@ class Effect6093(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         for damageType in ('em', 'explosive', 'kinetic', 'thermal'):
             fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Missiles'),
                                             '{0}Damage'.format(damageType), ship.getModifiedItemAttr('shipBonusMC2'),
-                                            skill='Minmatar Cruiser')
+                                            skill='Minmatar Cruiser', **kwargs)
 
 
 class Effect6096(BaseEffect):
@@ -24408,11 +24347,11 @@ class Effect6096(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         for damageType in ('em', 'explosive', 'kinetic', 'thermal'):
             fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Light Missiles'),
                                             '{0}Damage'.format(damageType), ship.getModifiedItemAttr('shipBonusMC2'),
-                                            skill='Minmatar Cruiser')
+                                            skill='Minmatar Cruiser', **kwargs)
 
 
 class Effect6098(BaseEffect):
@@ -24426,10 +24365,10 @@ class Effect6098(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Missile Launcher Operation'),
                                       'reloadTime', ship.getModifiedItemAttr('shipBonusTacticalDestroyerCaldari2'),
-                                      skill='Caldari Tactical Destroyer')
+                                      skill='Caldari Tactical Destroyer', **kwargs)
 
 
 class Effect6104(BaseEffect):
@@ -24443,9 +24382,9 @@ class Effect6104(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill('Infomorph Psychology'),
-                                         'duration', ship.getModifiedItemAttr('entosisDurationMultiplier') or 1)
+                                         'duration', ship.getModifiedItemAttr('entosisDurationMultiplier') or 1, **kwargs)
 
 
 class Effect6110(BaseEffect):
@@ -24459,10 +24398,10 @@ class Effect6110(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
                                         'maxVelocity', module.getModifiedItemAttr('missileVelocityBonus'),
-                                        stackingPenalties=True)
+                                        stackingPenalties=True, **kwargs)
 
 
 class Effect6111(BaseEffect):
@@ -24476,10 +24415,10 @@ class Effect6111(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
                                         'explosionDelay', module.getModifiedItemAttr('explosionDelayBonus'),
-                                        stackingPenalties=True)
+                                        stackingPenalties=True, **kwargs)
 
 
 class Effect6112(BaseEffect):
@@ -24493,10 +24432,10 @@ class Effect6112(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
                                         'aoeCloudSize', module.getModifiedItemAttr('aoeCloudSizeBonus'),
-                                        stackingPenalties=True)
+                                        stackingPenalties=True, **kwargs)
 
 
 class Effect6113(BaseEffect):
@@ -24511,10 +24450,10 @@ class Effect6113(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
                                         'aoeVelocity', module.getModifiedItemAttr('aoeVelocityBonus'),
-                                        stackingPenalties=True)
+                                        stackingPenalties=True, **kwargs)
 
 
 class Effect6128(BaseEffect):
@@ -24529,8 +24468,8 @@ class Effect6128(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
-        module.boostItemAttr('aoeCloudSizeBonus', module.getModifiedChargeAttr('aoeCloudSizeBonusBonus'))
+    def handler(fit, module, context, **kwargs):
+        module.boostItemAttr('aoeCloudSizeBonus', module.getModifiedChargeAttr('aoeCloudSizeBonusBonus'), **kwargs)
 
 
 class Effect6129(BaseEffect):
@@ -24545,8 +24484,8 @@ class Effect6129(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
-        module.boostItemAttr('aoeVelocityBonus', module.getModifiedChargeAttr('aoeVelocityBonusBonus'))
+    def handler(fit, module, context, **kwargs):
+        module.boostItemAttr('aoeVelocityBonus', module.getModifiedChargeAttr('aoeVelocityBonusBonus'), **kwargs)
 
 
 class Effect6130(BaseEffect):
@@ -24560,8 +24499,8 @@ class Effect6130(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
-        module.boostItemAttr('missileVelocityBonus', module.getModifiedChargeAttr('missileVelocityBonusBonus'))
+    def handler(fit, module, context, **kwargs):
+        module.boostItemAttr('missileVelocityBonus', module.getModifiedChargeAttr('missileVelocityBonusBonus'), **kwargs)
 
 
 class Effect6131(BaseEffect):
@@ -24575,8 +24514,8 @@ class Effect6131(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
-        module.boostItemAttr('explosionDelayBonus', module.getModifiedChargeAttr('explosionDelayBonusBonus'))
+    def handler(fit, module, context, **kwargs):
+        module.boostItemAttr('explosionDelayBonus', module.getModifiedChargeAttr('explosionDelayBonusBonus'), **kwargs)
 
 
 class Effect6135(BaseEffect):
@@ -24590,7 +24529,7 @@ class Effect6135(BaseEffect):
     type = 'active'
 
     @staticmethod
-    def handler(fit, container, context):
+    def handler(fit, container, context, **kwargs):
         for srcAttr, tgtAttr in (
                 ('aoeCloudSizeBonus', 'aoeCloudSize'),
                 ('aoeVelocityBonus', 'aoeVelocity'),
@@ -24599,7 +24538,7 @@ class Effect6135(BaseEffect):
         ):
             fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
                                             tgtAttr, container.getModifiedItemAttr(srcAttr),
-                                            stackingPenalties=True)
+                                            stackingPenalties=True, **kwargs)
 
 
 class Effect6144(BaseEffect):
@@ -24613,7 +24552,7 @@ class Effect6144(BaseEffect):
     type = 'overheat'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         for tgtAttr in (
                 'aoeCloudSizeBonus',
                 'explosionDelayBonus',
@@ -24621,7 +24560,7 @@ class Effect6144(BaseEffect):
                 'maxVelocityModifier',
                 'aoeVelocityBonus'
         ):
-            module.boostItemAttr(tgtAttr, module.getModifiedItemAttr('overloadTrackingModuleStrengthBonus'))
+            module.boostItemAttr(tgtAttr, module.getModifiedItemAttr('overloadTrackingModuleStrengthBonus'), **kwargs)
 
 
 class Effect6148(BaseEffect):
@@ -24635,10 +24574,10 @@ class Effect6148(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: True, 'heatDamage',
                                       ship.getModifiedItemAttr('shipBonusTacticalDestroyerGallente3'),
-                                      skill='Gallente Tactical Destroyer')
+                                      skill='Gallente Tactical Destroyer', **kwargs)
 
 
 class Effect6149(BaseEffect):
@@ -24652,10 +24591,10 @@ class Effect6149(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Hybrid Turret'),
                                       'speed', ship.getModifiedItemAttr('shipBonusTacticalDestroyerGallente1'),
-                                      skill='Gallente Tactical Destroyer')
+                                      skill='Gallente Tactical Destroyer', **kwargs)
 
 
 class Effect6150(BaseEffect):
@@ -24669,10 +24608,10 @@ class Effect6150(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Hybrid Turret'),
                                       'trackingSpeed', ship.getModifiedItemAttr('shipBonusTacticalDestroyerGallente2'),
-                                      skill='Gallente Tactical Destroyer')
+                                      skill='Gallente Tactical Destroyer', **kwargs)
 
 
 class Effect6151(BaseEffect):
@@ -24686,7 +24625,7 @@ class Effect6151(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         for srcResType, tgtResType in (
                 ('Em', 'em'),
                 ('Explosive', 'explosive'),
@@ -24695,8 +24634,7 @@ class Effect6151(BaseEffect):
         ):
             fit.ship.multiplyItemAttr(
                 '{0}DamageResonance'.format(tgtResType),
-                1 / module.getModifiedItemAttr('mode{0}ResistancePostDiv'.format(srcResType))
-            )
+                1 / module.getModifiedItemAttr('mode{0}ResistancePostDiv'.format(srcResType)), **kwargs)
 
 
 class Effect6152(BaseEffect):
@@ -24710,14 +24648,14 @@ class Effect6152(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         fit.modules.filteredItemMultiply(
             lambda mod: mod.item.requiresSkill('Small Hybrid Turret'),
             'maxRange',
             1 / module.getModifiedItemAttr('modeMaxRangePostDiv'),
             stackingPenalties=True,
-            penaltyGroup='postDiv'
-        )
+            penaltyGroup='postDiv',
+            **kwargs)
 
 
 class Effect6153(BaseEffect):
@@ -24731,12 +24669,12 @@ class Effect6153(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         fit.modules.filteredItemMultiply(
             lambda mod: mod.item.requiresSkill('High Speed Maneuvering'),
             'capacitorNeed',
-            1 / module.getModifiedItemAttr('modeMWDCapPostDiv')
-        )
+            1 / module.getModifiedItemAttr('modeMWDCapPostDiv'),
+            **kwargs)
 
 
 class Effect6154(BaseEffect):
@@ -24750,14 +24688,14 @@ class Effect6154(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         fit.modules.filteredItemMultiply(
             lambda mod: mod.item.requiresSkill('High Speed Maneuvering'),
             'speedFactor',
             1 / module.getModifiedItemAttr('modeMWDVelocityPostDiv'),
             stackingPenalties=True,
-            penaltyGroup='postDiv'
-        )
+            penaltyGroup='postDiv',
+            **kwargs)
 
 
 class Effect6155(BaseEffect):
@@ -24771,12 +24709,12 @@ class Effect6155(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         fit.modules.filteredItemMultiply(
             lambda mod: mod.item.requiresSkill('Repair Systems'),
             'duration',
-            1 / module.getModifiedItemAttr('modeArmorRepDurationPostDiv')
-        )
+            1 / module.getModifiedItemAttr('modeArmorRepDurationPostDiv'),
+            **kwargs)
 
 
 class Effect6163(BaseEffect):
@@ -24791,7 +24729,7 @@ class Effect6163(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.extraAttributes['speedLimit'] = src.getModifiedItemAttr('speedLimit')
 
 
@@ -24807,8 +24745,8 @@ class Effect6164(BaseEffect):
     type = ('projected', 'passive')
 
     @staticmethod
-    def handler(fit, beacon, context):
-        fit.ship.boostItemAttr('maxVelocity', beacon.getModifiedItemAttr('maxVelocityMultiplier'), stackingPenalties=True)
+    def handler(fit, beacon, context, **kwargs):
+        fit.ship.boostItemAttr('maxVelocity', beacon.getModifiedItemAttr('maxVelocityMultiplier'), stackingPenalties=True, **kwargs)
 
 
 class Effect6166(BaseEffect):
@@ -24823,13 +24761,13 @@ class Effect6166(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Propulsion Jamming'),
-                                      'speedFactorBonus', ship.getModifiedItemAttr('shipBonusAT'))
+                                      'speedFactorBonus', ship.getModifiedItemAttr('shipBonusAT'), **kwargs)
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Propulsion Jamming'),
-                                      'speedBoostFactorBonus', ship.getModifiedItemAttr('shipBonusAT'))
+                                      'speedBoostFactorBonus', ship.getModifiedItemAttr('shipBonusAT'), **kwargs)
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Propulsion Jamming'),
-                                      'massBonusPercentage', ship.getModifiedItemAttr('shipBonusAT'))
+                                      'massBonusPercentage', ship.getModifiedItemAttr('shipBonusAT'), **kwargs)
 
 
 class Effect6170(BaseEffect):
@@ -24843,9 +24781,9 @@ class Effect6170(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemIncrease(lambda mod: mod.item.requiresSkill('Infomorph Psychology'),
-                                         'entosisCPUAdd', ship.getModifiedItemAttr('entosisCPUPenalty'))
+                                         'entosisCPUAdd', ship.getModifiedItemAttr('entosisCPUPenalty'), **kwargs)
 
 
 class Effect6171(BaseEffect):
@@ -24859,8 +24797,8 @@ class Effect6171(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
-        module.increaseItemAttr('cpu', module.getModifiedItemAttr('entosisCPUAdd'))
+    def handler(fit, module, context, **kwargs):
+        module.increaseItemAttr('cpu', module.getModifiedItemAttr('entosisCPUAdd'), **kwargs)
 
 
 class Effect6172(BaseEffect):
@@ -24874,11 +24812,11 @@ class Effect6172(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Energy Turret'),
-                                      'maxRange', ship.getModifiedItemAttr('roleBonusCBC'))
+                                      'maxRange', ship.getModifiedItemAttr('roleBonusCBC'), **kwargs)
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Energy Turret'),
-                                      'falloff', ship.getModifiedItemAttr('roleBonusCBC'))
+                                      'falloff', ship.getModifiedItemAttr('roleBonusCBC'), **kwargs)
 
 
 class Effect6173(BaseEffect):
@@ -24893,11 +24831,11 @@ class Effect6173(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Hybrid Turret'),
-                                      'maxRange', ship.getModifiedItemAttr('roleBonusCBC'))
+                                      'maxRange', ship.getModifiedItemAttr('roleBonusCBC'), **kwargs)
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Hybrid Turret'),
-                                      'falloff', ship.getModifiedItemAttr('roleBonusCBC'))
+                                      'falloff', ship.getModifiedItemAttr('roleBonusCBC'), **kwargs)
 
 
 class Effect6174(BaseEffect):
@@ -24911,11 +24849,11 @@ class Effect6174(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Projectile Turret'),
-                                      'maxRange', ship.getModifiedItemAttr('roleBonusCBC'))
+                                      'maxRange', ship.getModifiedItemAttr('roleBonusCBC'), **kwargs)
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Projectile Turret'),
-                                      'falloff', ship.getModifiedItemAttr('roleBonusCBC'))
+                                      'falloff', ship.getModifiedItemAttr('roleBonusCBC'), **kwargs)
 
 
 class Effect6175(BaseEffect):
@@ -24930,9 +24868,9 @@ class Effect6175(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, skill, context):
+    def handler(fit, skill, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
-                                        'maxVelocity', skill.getModifiedItemAttr('roleBonusCBC'))
+                                        'maxVelocity', skill.getModifiedItemAttr('roleBonusCBC'), **kwargs)
 
 
 class Effect6176(BaseEffect):
@@ -24947,9 +24885,9 @@ class Effect6176(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Drones'),
-                                     'maxVelocity', ship.getModifiedItemAttr('roleBonusCBC'))
+                                     'maxVelocity', ship.getModifiedItemAttr('roleBonusCBC'), **kwargs)
 
 
 class Effect6177(BaseEffect):
@@ -24963,10 +24901,10 @@ class Effect6177(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Hybrid Turret'),
                                       'damageMultiplier', ship.getModifiedItemAttr('shipBonusCBC2'),
-                                      skill='Caldari Battlecruiser')
+                                      skill='Caldari Battlecruiser', **kwargs)
 
 
 class Effect6178(BaseEffect):
@@ -24980,10 +24918,10 @@ class Effect6178(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Projectile Turret'),
                                       'trackingSpeed', ship.getModifiedItemAttr('shipBonusMBC2'),
-                                      skill='Minmatar Battlecruiser')
+                                      skill='Minmatar Battlecruiser', **kwargs)
 
 
 class Effect6184(BaseEffect):
@@ -25022,12 +24960,12 @@ class Effect6185(BaseEffect):
     type = 'projected', 'active'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         if 'projected' not in context:
             return
         bonus = module.getModifiedItemAttr('structureDamageAmount')
         duration = module.getModifiedItemAttr('duration') / 1000.0
-        fit.extraAttributes.increase('hullRepair', bonus / duration)
+        fit.extraAttributes.increase('hullRepair', bonus / duration, **kwargs)
 
 
 class Effect6186(BaseEffect):
@@ -25090,9 +25028,9 @@ class Effect6188(BaseEffect):
             bonus = container.getModifiedItemAttr('armorDamageAmount')
             duration = container.getModifiedItemAttr('duration') / 1000.0
             rps = bonus / duration
-            fit.extraAttributes.increase('armorRepair', rps)
-            fit.extraAttributes.increase('armorRepairPreSpool', rps)
-            fit.extraAttributes.increase('armorRepairFullSpool', rps)
+            fit.extraAttributes.increase('armorRepair', rps, **kwargs)
+            fit.extraAttributes.increase('armorRepairPreSpool', rps, **kwargs)
+            fit.extraAttributes.increase('armorRepairFullSpool', rps, **kwargs)
 
 
 class Effect6195(BaseEffect):
@@ -25106,15 +25044,11 @@ class Effect6195(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
-        fit.ship.boostItemAttr('shieldThermalDamageResonance', src.getModifiedItemAttr('eliteBonusExpedition1'),
-                               skill='Expedition Frigates')
-        fit.ship.boostItemAttr('shieldKineticDamageResonance', src.getModifiedItemAttr('eliteBonusExpedition1'),
-                               skill='Expedition Frigates')
-        fit.ship.boostItemAttr('shieldExplosiveDamageResonance', src.getModifiedItemAttr('eliteBonusExpedition1'),
-                               skill='Expedition Frigates')
-        fit.ship.boostItemAttr('shieldEmDamageResonance', src.getModifiedItemAttr('eliteBonusExpedition1'),
-                               skill='Expedition Frigates')
+    def handler(fit, src, context, **kwargs):
+        for dmgType in ('Em', 'Thermal', 'Kinetic', 'Explosive'):
+            fit.ship.boostItemAttr('shield{}DamageResonance'.format(dmgType),
+                                   src.getModifiedItemAttr('eliteBonusExpedition1'),
+                                   skill='Expedition Frigates', **kwargs)
 
 
 class Effect6196(BaseEffect):
@@ -25128,9 +25062,9 @@ class Effect6196(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Ice Harvesting'), 'duration',
-                                      src.getModifiedItemAttr('eliteBonusExpedition2'), skill='Expedition Frigates')
+                                      src.getModifiedItemAttr('eliteBonusExpedition2'), skill='Expedition Frigates', **kwargs)
 
 
 class Effect6197(BaseEffect):
@@ -25156,7 +25090,7 @@ class Effect6197(BaseEffect):
         if 'projected' in context:
             fit.addDrain(src, time, amount, 0)
         elif 'module' in context:
-            src.itemModifiedAttributes.force('capacitorNeed', -amount)
+            src.itemModifiedAttributes.force('capacitorNeed', -amount, **kwargs)
 
 
 class Effect6201(BaseEffect):
@@ -25181,9 +25115,9 @@ class Effect6208(BaseEffect):
     type = 'active'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         fit.ship.boostItemAttr('signatureRadius', module.getModifiedItemAttr('signatureRadiusBonusPercent'),
-                               stackingPenalties=True)
+                               stackingPenalties=True, **kwargs)
 
 
 class Effect6214(BaseEffect):
@@ -25198,9 +25132,9 @@ class Effect6214(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Leadership'), 'power',
-                                      src.getModifiedItemAttr('roleBonusCD'))
+                                      src.getModifiedItemAttr('roleBonusCD'), **kwargs)
 
 
 class Effect6216(BaseEffect):
@@ -25241,12 +25175,12 @@ class Effect6222(BaseEffect):
     type = 'projected', 'active'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         if 'projected' in context:
-            fit.ship.increaseItemAttr('warpScrambleStatus', module.getModifiedItemAttr('warpScrambleStrength'))
+            fit.ship.increaseItemAttr('warpScrambleStatus', module.getModifiedItemAttr('warpScrambleStrength'), **kwargs)
             fit.modules.filteredItemIncrease(
                 lambda mod: mod.item.requiresSkill('High Speed Maneuvering') or mod.item.requiresSkill('Micro Jump Drive Operation'),
-                'activationBlocked', module.getModifiedItemAttr('activationBlockedStrenght'))
+                'activationBlocked', module.getModifiedItemAttr('activationBlockedStrenght'), **kwargs)
 
 
 class Effect6230(BaseEffect):
@@ -25260,9 +25194,9 @@ class Effect6230(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Energy Neutralizer', 'maxRange',
-                                      src.getModifiedItemAttr('eliteBonusReconShip1'), skill='Recon Ships')
+                                      src.getModifiedItemAttr('eliteBonusReconShip1'), skill='Recon Ships', **kwargs)
 
 
 class Effect6232(BaseEffect):
@@ -25276,9 +25210,9 @@ class Effect6232(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Energy Neutralizer', 'falloffEffectiveness',
-                                      src.getModifiedItemAttr('eliteBonusReconShip2'), skill='Recon Ships')
+                                      src.getModifiedItemAttr('eliteBonusReconShip2'), skill='Recon Ships', **kwargs)
 
 
 class Effect6233(BaseEffect):
@@ -25292,9 +25226,9 @@ class Effect6233(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Energy Neutralizer', 'falloffEffectiveness',
-                                      src.getModifiedItemAttr('eliteBonusReconShip3'), skill='Recon Ships')
+                                      src.getModifiedItemAttr('eliteBonusReconShip3'), skill='Recon Ships', **kwargs)
 
 
 class Effect6234(BaseEffect):
@@ -25308,9 +25242,9 @@ class Effect6234(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Energy Nosferatu', 'maxRange',
-                                      src.getModifiedItemAttr('eliteBonusReconShip1'), skill='Recon Ships')
+                                      src.getModifiedItemAttr('eliteBonusReconShip1'), skill='Recon Ships', **kwargs)
 
 
 class Effect6237(BaseEffect):
@@ -25324,9 +25258,9 @@ class Effect6237(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Energy Nosferatu', 'falloffEffectiveness',
-                                      src.getModifiedItemAttr('eliteBonusReconShip2'), skill='Recon Ships')
+                                      src.getModifiedItemAttr('eliteBonusReconShip2'), skill='Recon Ships', **kwargs)
 
 
 class Effect6238(BaseEffect):
@@ -25340,9 +25274,9 @@ class Effect6238(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Energy Nosferatu', 'falloffEffectiveness',
-                                      src.getModifiedItemAttr('eliteBonusReconShip3'), skill='Recon Ships')
+                                      src.getModifiedItemAttr('eliteBonusReconShip3'), skill='Recon Ships', **kwargs)
 
 
 class Effect6239(BaseEffect):
@@ -25356,9 +25290,9 @@ class Effect6239(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Ice Harvesting'), 'duration',
-                                      src.getModifiedItemAttr('shipBonusOREfrig2'), skill='Mining Frigate')
+                                      src.getModifiedItemAttr('shipBonusOREfrig2'), skill='Mining Frigate', **kwargs)
 
 
 class Effect6241(BaseEffect):
@@ -25372,9 +25306,9 @@ class Effect6241(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Energy Neutralizer', 'falloffEffectiveness',
-                                      src.getModifiedItemAttr('shipBonusAD1'), skill='Amarr Destroyer')
+                                      src.getModifiedItemAttr('shipBonusAD1'), skill='Amarr Destroyer', **kwargs)
 
 
 class Effect6242(BaseEffect):
@@ -25388,9 +25322,9 @@ class Effect6242(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Energy Neutralizer', 'maxRange',
-                                      src.getModifiedItemAttr('shipBonusAD2'), skill='Amarr Destroyer')
+                                      src.getModifiedItemAttr('shipBonusAD2'), skill='Amarr Destroyer', **kwargs)
 
 
 class Effect6245(BaseEffect):
@@ -25404,9 +25338,9 @@ class Effect6245(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Energy Nosferatu', 'maxRange',
-                                      src.getModifiedItemAttr('shipBonusAD2'), skill='Amarr Destroyer')
+                                      src.getModifiedItemAttr('shipBonusAD2'), skill='Amarr Destroyer', **kwargs)
 
 
 class Effect6246(BaseEffect):
@@ -25420,9 +25354,9 @@ class Effect6246(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Energy Nosferatu', 'falloffEffectiveness',
-                                      src.getModifiedItemAttr('shipBonusAD1'), skill='Amarr Destroyer')
+                                      src.getModifiedItemAttr('shipBonusAD1'), skill='Amarr Destroyer', **kwargs)
 
 
 class Effect6253(BaseEffect):
@@ -25436,9 +25370,9 @@ class Effect6253(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Energy Neutralizer', 'maxRange',
-                                      src.getModifiedItemAttr('shipBonusAB'), skill='Amarr Battleship')
+                                      src.getModifiedItemAttr('shipBonusAB'), skill='Amarr Battleship', **kwargs)
 
 
 class Effect6256(BaseEffect):
@@ -25452,9 +25386,9 @@ class Effect6256(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Energy Neutralizer', 'falloffEffectiveness',
-                                      src.getModifiedItemAttr('shipBonusAB2'), skill='Amarr Battleship')
+                                      src.getModifiedItemAttr('shipBonusAB2'), skill='Amarr Battleship', **kwargs)
 
 
 class Effect6257(BaseEffect):
@@ -25468,9 +25402,9 @@ class Effect6257(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Energy Nosferatu', 'maxRange',
-                                      src.getModifiedItemAttr('shipBonusAB'), skill='Amarr Battleship')
+                                      src.getModifiedItemAttr('shipBonusAB'), skill='Amarr Battleship', **kwargs)
 
 
 class Effect6260(BaseEffect):
@@ -25484,9 +25418,9 @@ class Effect6260(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Energy Nosferatu', 'falloffEffectiveness',
-                                      src.getModifiedItemAttr('shipBonusAB2'), skill='Amarr Battleship')
+                                      src.getModifiedItemAttr('shipBonusAB2'), skill='Amarr Battleship', **kwargs)
 
 
 class Effect6267(BaseEffect):
@@ -25500,10 +25434,10 @@ class Effect6267(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Energy Neutralizer', 'maxRange',
                                       src.getModifiedItemAttr('eliteBonusElectronicAttackShip1'),
-                                      skill='Electronic Attack Ships')
+                                      skill='Electronic Attack Ships', **kwargs)
 
 
 class Effect6272(BaseEffect):
@@ -25517,10 +25451,10 @@ class Effect6272(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Energy Neutralizer', 'falloffEffectiveness',
                                       src.getModifiedItemAttr('eliteBonusElectronicAttackShip3'),
-                                      skill='Electronic Attack Ships')
+                                      skill='Electronic Attack Ships', **kwargs)
 
 
 class Effect6273(BaseEffect):
@@ -25534,10 +25468,10 @@ class Effect6273(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Energy Nosferatu', 'maxRange',
                                       src.getModifiedItemAttr('eliteBonusElectronicAttackShip1'),
-                                      skill='Electronic Attack Ships')
+                                      skill='Electronic Attack Ships', **kwargs)
 
 
 class Effect6278(BaseEffect):
@@ -25551,10 +25485,10 @@ class Effect6278(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Energy Nosferatu', 'falloffEffectiveness',
                                       src.getModifiedItemAttr('eliteBonusElectronicAttackShip3'),
-                                      skill='Electronic Attack Ships')
+                                      skill='Electronic Attack Ships', **kwargs)
 
 
 class Effect6281(BaseEffect):
@@ -25568,9 +25502,9 @@ class Effect6281(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Energy Neutralizer', 'maxRange',
-                                      src.getModifiedItemAttr('shipBonus2AF'), skill='Amarr Frigate')
+                                      src.getModifiedItemAttr('shipBonus2AF'), skill='Amarr Frigate', **kwargs)
 
 
 class Effect6285(BaseEffect):
@@ -25584,9 +25518,9 @@ class Effect6285(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Energy Neutralizer', 'falloffEffectiveness',
-                                      src.getModifiedItemAttr('shipBonus3AF'), skill='Amarr Frigate')
+                                      src.getModifiedItemAttr('shipBonus3AF'), skill='Amarr Frigate', **kwargs)
 
 
 class Effect6287(BaseEffect):
@@ -25600,9 +25534,9 @@ class Effect6287(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Energy Nosferatu', 'maxRange',
-                                      src.getModifiedItemAttr('shipBonus2AF'), skill='Amarr Frigate')
+                                      src.getModifiedItemAttr('shipBonus2AF'), skill='Amarr Frigate', **kwargs)
 
 
 class Effect6291(BaseEffect):
@@ -25616,9 +25550,9 @@ class Effect6291(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Energy Nosferatu', 'falloffEffectiveness',
-                                      src.getModifiedItemAttr('shipBonus3AF'), skill='Amarr Frigate')
+                                      src.getModifiedItemAttr('shipBonus3AF'), skill='Amarr Frigate', **kwargs)
 
 
 class Effect6294(BaseEffect):
@@ -25632,9 +25566,9 @@ class Effect6294(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Energy Neutralizer', 'maxRange',
-                                      src.getModifiedItemAttr('shipBonusAC'), skill='Amarr Cruiser')
+                                      src.getModifiedItemAttr('shipBonusAC'), skill='Amarr Cruiser', **kwargs)
 
 
 class Effect6299(BaseEffect):
@@ -25648,9 +25582,9 @@ class Effect6299(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Energy Neutralizer', 'falloffEffectiveness',
-                                      src.getModifiedItemAttr('shipBonusAC3'), skill='Amarr Cruiser')
+                                      src.getModifiedItemAttr('shipBonusAC3'), skill='Amarr Cruiser', **kwargs)
 
 
 class Effect6300(BaseEffect):
@@ -25664,9 +25598,9 @@ class Effect6300(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Energy Nosferatu', 'maxRange',
-                                      src.getModifiedItemAttr('shipBonusAC'), skill='Amarr Cruiser')
+                                      src.getModifiedItemAttr('shipBonusAC'), skill='Amarr Cruiser', **kwargs)
 
 
 class Effect6301(BaseEffect):
@@ -25680,11 +25614,11 @@ class Effect6301(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Energy Nosferatu', 'falloffEffectiveness',
-                                      src.getModifiedItemAttr('shipBonusAC2'), skill='Amarr Cruiser')
+                                      src.getModifiedItemAttr('shipBonusAC2'), skill='Amarr Cruiser', **kwargs)
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Energy Nosferatu', 'maxRange',
-                                      src.getModifiedItemAttr('shipBonusAC2'), skill='Amarr Cruiser')
+                                      src.getModifiedItemAttr('shipBonusAC2'), skill='Amarr Cruiser', **kwargs)
 
 
 class Effect6305(BaseEffect):
@@ -25698,9 +25632,9 @@ class Effect6305(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Energy Nosferatu', 'falloffEffectiveness',
-                                      src.getModifiedItemAttr('shipBonusAC3'), skill='Amarr Cruiser')
+                                      src.getModifiedItemAttr('shipBonusAC3'), skill='Amarr Cruiser', **kwargs)
 
 
 class Effect6307(BaseEffect):
@@ -25714,9 +25648,9 @@ class Effect6307(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'), 'thermalDamage',
-                                        src.getModifiedItemAttr('shipBonusMD1'), skill='Minmatar Destroyer')
+                                        src.getModifiedItemAttr('shipBonusMD1'), skill='Minmatar Destroyer', **kwargs)
 
 
 class Effect6308(BaseEffect):
@@ -25730,9 +25664,9 @@ class Effect6308(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'), 'emDamage',
-                                        src.getModifiedItemAttr('shipBonusMD1'), skill='Minmatar Destroyer')
+                                        src.getModifiedItemAttr('shipBonusMD1'), skill='Minmatar Destroyer', **kwargs)
 
 
 class Effect6309(BaseEffect):
@@ -25746,9 +25680,9 @@ class Effect6309(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'), 'kineticDamage',
-                                        src.getModifiedItemAttr('shipBonusMD1'), skill='Minmatar Destroyer')
+                                        src.getModifiedItemAttr('shipBonusMD1'), skill='Minmatar Destroyer', **kwargs)
 
 
 class Effect6310(BaseEffect):
@@ -25762,10 +25696,10 @@ class Effect6310(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
                                         'explosiveDamage', src.getModifiedItemAttr('shipBonusMD1'),
-                                        skill='Minmatar Destroyer')
+                                        skill='Minmatar Destroyer', **kwargs)
 
 
 class Effect6315(BaseEffect):
@@ -25779,17 +25713,11 @@ class Effect6315(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Skirmish Command'), 'warfareBuff3Value',
-                                      src.getModifiedItemAttr('eliteBonusCommandDestroyer1'), skill='Command Destroyers')
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Skirmish Command'), 'buffDuration',
-                                      src.getModifiedItemAttr('eliteBonusCommandDestroyer1'), skill='Command Destroyers')
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Skirmish Command'), 'warfareBuff1Value',
-                                      src.getModifiedItemAttr('eliteBonusCommandDestroyer1'), skill='Command Destroyers')
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Skirmish Command'), 'warfareBuff4Value',
-                                      src.getModifiedItemAttr('eliteBonusCommandDestroyer1'), skill='Command Destroyers')
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Skirmish Command'), 'warfareBuff2Value',
-                                      src.getModifiedItemAttr('eliteBonusCommandDestroyer1'), skill='Command Destroyers')
+    def handler(fit, src, context, **kwargs):
+        for attrName in ('buffDuration', 'warfareBuff1Value', 'warfareBuff2Value', 'warfareBuff3Value', 'warfareBuff4Value'):
+            fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Skirmish Command'),
+                                          attrName, src.getModifiedItemAttr('eliteBonusCommandDestroyer1'),
+                                          skill='Command Destroyers', **kwargs)
 
 
 class Effect6316(BaseEffect):
@@ -25804,17 +25732,11 @@ class Effect6316(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Command'), 'warfareBuff3Value',
-                                      src.getModifiedItemAttr('eliteBonusCommandDestroyer1'), skill='Command Destroyers')
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Command'), 'buffDuration',
-                                      src.getModifiedItemAttr('eliteBonusCommandDestroyer1'), skill='Command Destroyers')
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Command'), 'warfareBuff1Value',
-                                      src.getModifiedItemAttr('eliteBonusCommandDestroyer1'), skill='Command Destroyers')
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Command'), 'warfareBuff4Value',
-                                      src.getModifiedItemAttr('eliteBonusCommandDestroyer1'), skill='Command Destroyers')
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Command'), 'warfareBuff2Value',
-                                      src.getModifiedItemAttr('eliteBonusCommandDestroyer1'), skill='Command Destroyers')
+    def handler(fit, src, context, **kwargs):
+        for attrName in ('buffDuration', 'warfareBuff1Value', 'warfareBuff2Value', 'warfareBuff3Value', 'warfareBuff4Value'):
+            fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Command'),
+                                          attrName, src.getModifiedItemAttr('eliteBonusCommandDestroyer1'),
+                                          skill='Command Destroyers', **kwargs)
 
 
 class Effect6317(BaseEffect):
@@ -25828,9 +25750,9 @@ class Effect6317(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Micro Jump Drive Operation'), 'duration',
-                                      src.getModifiedItemAttr('eliteBonusCommandDestroyer2'), skill='Command Destroyers')
+                                      src.getModifiedItemAttr('eliteBonusCommandDestroyer2'), skill='Command Destroyers', **kwargs)
 
 
 class Effect6318(BaseEffect):
@@ -25844,9 +25766,9 @@ class Effect6318(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.ship.boostItemAttr('shieldEmDamageResonance', src.getModifiedItemAttr('shipBonusMD2'),
-                               skill='Minmatar Destroyer')
+                               skill='Minmatar Destroyer', **kwargs)
 
 
 class Effect6319(BaseEffect):
@@ -25860,9 +25782,9 @@ class Effect6319(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.ship.boostItemAttr('shieldKineticDamageResonance', src.getModifiedItemAttr('shipBonusMD2'),
-                               skill='Minmatar Destroyer')
+                               skill='Minmatar Destroyer', **kwargs)
 
 
 class Effect6320(BaseEffect):
@@ -25876,9 +25798,9 @@ class Effect6320(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.ship.boostItemAttr('shieldThermalDamageResonance', src.getModifiedItemAttr('shipBonusMD2'),
-                               skill='Minmatar Destroyer')
+                               skill='Minmatar Destroyer', **kwargs)
 
 
 class Effect6321(BaseEffect):
@@ -25892,9 +25814,9 @@ class Effect6321(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.ship.boostItemAttr('shieldExplosiveDamageResonance', src.getModifiedItemAttr('shipBonusMD2'),
-                               skill='Minmatar Destroyer')
+                               skill='Minmatar Destroyer', **kwargs)
 
 
 class Effect6322(BaseEffect):
@@ -25909,8 +25831,8 @@ class Effect6322(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context, *args, **kwargs):
-        src.boostItemAttr('scanGravimetricStrengthBonus', src.getModifiedChargeAttr('scanGravimetricStrengthBonusBonus'))
+    def handler(fit, src, context, **kwargs):
+        src.boostItemAttr('scanGravimetricStrengthBonus', src.getModifiedChargeAttr('scanGravimetricStrengthBonusBonus'), **kwargs)
 
 
 class Effect6323(BaseEffect):
@@ -25925,8 +25847,8 @@ class Effect6323(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context, *args, **kwargs):
-        src.boostItemAttr('scanLadarStrengthBonus', src.getModifiedChargeAttr('scanLadarStrengthBonusBonus'))
+    def handler(fit, src, context, **kwargs):
+        src.boostItemAttr('scanLadarStrengthBonus', src.getModifiedChargeAttr('scanLadarStrengthBonusBonus'), **kwargs)
 
 
 class Effect6324(BaseEffect):
@@ -25941,8 +25863,8 @@ class Effect6324(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context, *args, **kwargs):
-        src.boostItemAttr('scanMagnetometricStrengthBonus', src.getModifiedChargeAttr('scanMagnetometricStrengthBonusBonus'))
+    def handler(fit, src, context, **kwargs):
+        src.boostItemAttr('scanMagnetometricStrengthBonus', src.getModifiedChargeAttr('scanMagnetometricStrengthBonusBonus'), **kwargs)
 
 
 class Effect6325(BaseEffect):
@@ -25957,8 +25879,8 @@ class Effect6325(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context, *args, **kwargs):
-        src.boostItemAttr('scanRadarStrengthBonus', src.getModifiedChargeAttr('scanRadarStrengthBonusBonus'))
+    def handler(fit, src, context, **kwargs):
+        src.boostItemAttr('scanRadarStrengthBonus', src.getModifiedChargeAttr('scanRadarStrengthBonusBonus'), **kwargs)
 
 
 class Effect6326(BaseEffect):
@@ -25972,9 +25894,9 @@ class Effect6326(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'), 'thermalDamage',
-                                        src.getModifiedItemAttr('shipBonusCD1'), skill='Caldari Destroyer')
+                                        src.getModifiedItemAttr('shipBonusCD1'), skill='Caldari Destroyer', **kwargs)
 
 
 class Effect6327(BaseEffect):
@@ -25988,9 +25910,9 @@ class Effect6327(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'), 'emDamage',
-                                        src.getModifiedItemAttr('shipBonusCD1'), skill='Caldari Destroyer')
+                                        src.getModifiedItemAttr('shipBonusCD1'), skill='Caldari Destroyer', **kwargs)
 
 
 class Effect6328(BaseEffect):
@@ -26004,9 +25926,9 @@ class Effect6328(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'), 'kineticDamage',
-                                        src.getModifiedItemAttr('shipBonusCD1'), skill='Caldari Destroyer')
+                                        src.getModifiedItemAttr('shipBonusCD1'), skill='Caldari Destroyer', **kwargs)
 
 
 class Effect6329(BaseEffect):
@@ -26020,10 +25942,10 @@ class Effect6329(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
                                         'explosiveDamage', src.getModifiedItemAttr('shipBonusCD1'),
-                                        skill='Caldari Destroyer')
+                                        skill='Caldari Destroyer', **kwargs)
 
 
 class Effect6330(BaseEffect):
@@ -26037,9 +25959,9 @@ class Effect6330(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.ship.boostItemAttr('shieldEmDamageResonance', src.getModifiedItemAttr('shipBonusCD2'),
-                               skill='Caldari Destroyer')
+                               skill='Caldari Destroyer', **kwargs)
 
 
 class Effect6331(BaseEffect):
@@ -26053,9 +25975,9 @@ class Effect6331(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.ship.boostItemAttr('shieldThermalDamageResonance', src.getModifiedItemAttr('shipBonusCD2'),
-                               skill='Caldari Destroyer')
+                               skill='Caldari Destroyer', **kwargs)
 
 
 class Effect6332(BaseEffect):
@@ -26069,9 +25991,9 @@ class Effect6332(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.ship.boostItemAttr('shieldKineticDamageResonance', src.getModifiedItemAttr('shipBonusCD2'),
-                               skill='Caldari Destroyer')
+                               skill='Caldari Destroyer', **kwargs)
 
 
 class Effect6333(BaseEffect):
@@ -26085,9 +26007,9 @@ class Effect6333(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.ship.boostItemAttr('shieldExplosiveDamageResonance', src.getModifiedItemAttr('shipBonusCD2'),
-                               skill='Caldari Destroyer')
+                               skill='Caldari Destroyer', **kwargs)
 
 
 class Effect6334(BaseEffect):
@@ -26101,17 +26023,11 @@ class Effect6334(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Information Command'), 'warfareBuff1Value',
-                                      src.getModifiedItemAttr('eliteBonusCommandDestroyer1'), skill='Command Destroyers')
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Information Command'), 'warfareBuff3Value',
-                                      src.getModifiedItemAttr('eliteBonusCommandDestroyer1'), skill='Command Destroyers')
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Information Command'), 'warfareBuff2Value',
-                                      src.getModifiedItemAttr('eliteBonusCommandDestroyer1'), skill='Command Destroyers')
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Information Command'), 'buffDuration',
-                                      src.getModifiedItemAttr('eliteBonusCommandDestroyer1'), skill='Command Destroyers')
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Information Command'), 'warfareBuff4Value',
-                                      src.getModifiedItemAttr('eliteBonusCommandDestroyer1'), skill='Command Destroyers')
+    def handler(fit, src, context, **kwargs):
+        for attrName in ('buffDuration', 'warfareBuff1Value', 'warfareBuff2Value', 'warfareBuff3Value', 'warfareBuff4Value'):
+            fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Information Command'),
+                                          attrName, src.getModifiedItemAttr('eliteBonusCommandDestroyer1'),
+                                          skill='Command Destroyers', **kwargs)
 
 
 class Effect6335(BaseEffect):
@@ -26125,9 +26041,9 @@ class Effect6335(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.ship.boostItemAttr('armorKineticDamageResonance', src.getModifiedItemAttr('shipBonusAD2'),
-                               skill='Amarr Destroyer')
+                               skill='Amarr Destroyer', **kwargs)
 
 
 class Effect6336(BaseEffect):
@@ -26141,9 +26057,9 @@ class Effect6336(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.ship.boostItemAttr('armorThermalDamageResonance', src.getModifiedItemAttr('shipBonusAD2'),
-                               skill='Amarr Destroyer')
+                               skill='Amarr Destroyer', **kwargs)
 
 
 class Effect6337(BaseEffect):
@@ -26157,8 +26073,8 @@ class Effect6337(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
-        fit.ship.boostItemAttr('armorEmDamageResonance', src.getModifiedItemAttr('shipBonusAD2'), skill='Amarr Destroyer')
+    def handler(fit, src, context, **kwargs):
+        fit.ship.boostItemAttr('armorEmDamageResonance', src.getModifiedItemAttr('shipBonusAD2'), skill='Amarr Destroyer', **kwargs)
 
 
 class Effect6338(BaseEffect):
@@ -26172,9 +26088,9 @@ class Effect6338(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.ship.boostItemAttr('armorExplosiveDamageResonance', src.getModifiedItemAttr('shipBonusAD2'),
-                               skill='Amarr Destroyer')
+                               skill='Amarr Destroyer', **kwargs)
 
 
 class Effect6339(BaseEffect):
@@ -26189,17 +26105,11 @@ class Effect6339(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Armored Command'), 'warfareBuff2Value',
-                                      src.getModifiedItemAttr('eliteBonusCommandDestroyer1'), skill='Command Destroyers')
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Armored Command'), 'warfareBuff3Value',
-                                      src.getModifiedItemAttr('eliteBonusCommandDestroyer1'), skill='Command Destroyers')
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Armored Command'), 'buffDuration',
-                                      src.getModifiedItemAttr('eliteBonusCommandDestroyer1'), skill='Command Destroyers')
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Armored Command'), 'warfareBuff4Value',
-                                      src.getModifiedItemAttr('eliteBonusCommandDestroyer1'), skill='Command Destroyers')
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Armored Command'), 'warfareBuff1Value',
-                                      src.getModifiedItemAttr('eliteBonusCommandDestroyer1'), skill='Command Destroyers')
+    def handler(fit, src, context, **kwargs):
+        for attrName in ('buffDuration', 'warfareBuff1Value', 'warfareBuff2Value', 'warfareBuff3Value', 'warfareBuff4Value'):
+            fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Armored Command'),
+                                          attrName, src.getModifiedItemAttr('eliteBonusCommandDestroyer1'),
+                                          skill='Command Destroyers', **kwargs)
 
 
 class Effect6340(BaseEffect):
@@ -26213,9 +26123,9 @@ class Effect6340(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.ship.boostItemAttr('armorKineticDamageResonance', src.getModifiedItemAttr('shipBonusGD2'),
-                               skill='Gallente Destroyer')
+                               skill='Gallente Destroyer', **kwargs)
 
 
 class Effect6341(BaseEffect):
@@ -26229,9 +26139,9 @@ class Effect6341(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.ship.boostItemAttr('armorEmDamageResonance', src.getModifiedItemAttr('shipBonusGD2'),
-                               skill='Gallente Destroyer')
+                               skill='Gallente Destroyer', **kwargs)
 
 
 class Effect6342(BaseEffect):
@@ -26245,9 +26155,9 @@ class Effect6342(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.ship.boostItemAttr('armorThermalDamageResonance', src.getModifiedItemAttr('shipBonusGD2'),
-                               skill='Gallente Destroyer')
+                               skill='Gallente Destroyer', **kwargs)
 
 
 class Effect6343(BaseEffect):
@@ -26261,9 +26171,9 @@ class Effect6343(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.ship.boostItemAttr('armorExplosiveDamageResonance', src.getModifiedItemAttr('shipBonusGD2'),
-                               skill='Gallente Destroyer')
+                               skill='Gallente Destroyer', **kwargs)
 
 
 class Effect6350(BaseEffect):
@@ -26277,10 +26187,10 @@ class Effect6350(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredChargeBoost(
             lambda mod: mod.charge.requiresSkill('Light Missiles') or mod.charge.requiresSkill('Rockets'), 'kineticDamage',
-            src.getModifiedItemAttr('shipBonus3CF'), skill='Caldari Frigate')
+            src.getModifiedItemAttr('shipBonus3CF'), skill='Caldari Frigate', **kwargs)
 
 
 class Effect6351(BaseEffect):
@@ -26294,9 +26204,9 @@ class Effect6351(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'), 'kineticDamage',
-                                        src.getModifiedItemAttr('shipBonusCC3'), skill='Caldari Cruiser')
+                                        src.getModifiedItemAttr('shipBonusCC3'), skill='Caldari Cruiser', **kwargs)
 
 
 class Effect6352(BaseEffect):
@@ -26310,11 +26220,11 @@ class Effect6352(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Weapon Disruption'), 'falloffEffectiveness',
-                                      src.getModifiedItemAttr('roleBonus'))
+                                      src.getModifiedItemAttr('roleBonus'), **kwargs)
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Weapon Disruption'), 'maxRange',
-                                      src.getModifiedItemAttr('roleBonus'))
+                                      src.getModifiedItemAttr('roleBonus'), **kwargs)
 
 
 class Effect6353(BaseEffect):
@@ -26328,11 +26238,11 @@ class Effect6353(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Weapon Disruption'), 'cpu',
-                                      src.getModifiedItemAttr('roleBonus'))
+                                      src.getModifiedItemAttr('roleBonus'), **kwargs)
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Weapon Disruption'), 'capacitorNeed',
-                                      src.getModifiedItemAttr('roleBonus'))
+                                      src.getModifiedItemAttr('roleBonus'), **kwargs)
 
 
 class Effect6354(BaseEffect):
@@ -26346,21 +26256,13 @@ class Effect6354(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Weapon Disruption'), 'trackingSpeedBonus',
-                                      src.getModifiedItemAttr('shipBonus2AF'), skill='Amarr Frigate')
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Weapon Disruption'), 'explosionDelayBonus',
-                                      src.getModifiedItemAttr('shipBonus2AF'), skill='Amarr Frigate')
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Weapon Disruption'), 'maxRangeBonus',
-                                      src.getModifiedItemAttr('shipBonus2AF'), skill='Amarr Frigate')
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Weapon Disruption'), 'falloffBonus',
-                                      src.getModifiedItemAttr('shipBonus2AF'), skill='Amarr Frigate')
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Weapon Disruption'), 'missileVelocityBonus',
-                                      src.getModifiedItemAttr('shipBonus2AF'), skill='Amarr Frigate')
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Weapon Disruption'), 'aoeVelocityBonus',
-                                      src.getModifiedItemAttr('shipBonus2AF'), skill='Amarr Frigate')
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Weapon Disruption'), 'aoeCloudSizeBonus',
-                                      src.getModifiedItemAttr('shipBonus2AF'), skill='Amarr Frigate')
+    def handler(fit, src, context, **kwargs):
+        for attrName in (
+            'trackingSpeedBonus', 'explosionDelayBonus', 'maxRangeBonus', 'falloffBonus',
+            'missileVelocityBonus', 'aoeVelocityBonus', 'aoeCloudSizeBonus'
+        ):
+            fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Weapon Disruption'), attrName,
+                                          src.getModifiedItemAttr('shipBonus2AF'), skill='Amarr Frigate', **kwargs)
 
 
 class Effect6355(BaseEffect):
@@ -26374,10 +26276,10 @@ class Effect6355(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'ECM', 'capacitorNeed',
-                                      src.getModifiedItemAttr('roleBonus'))
-        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'ECM', 'cpu', src.getModifiedItemAttr('roleBonus'))
+                                      src.getModifiedItemAttr('roleBonus'), **kwargs)
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'ECM', 'cpu', src.getModifiedItemAttr('roleBonus'), **kwargs)
 
 
 class Effect6356(BaseEffect):
@@ -26391,11 +26293,11 @@ class Effect6356(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'ECM', 'falloffEffectiveness',
-                                      src.getModifiedItemAttr('roleBonus'))
+                                      src.getModifiedItemAttr('roleBonus'), **kwargs)
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'ECM', 'maxRange',
-                                      src.getModifiedItemAttr('roleBonus'))
+                                      src.getModifiedItemAttr('roleBonus'), **kwargs)
 
 
 class Effect6357(BaseEffect):
@@ -26409,9 +26311,9 @@ class Effect6357(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Navigation'), 'maxRange',
-                                      src.getModifiedItemAttr('shipBonusGF2'), skill='Gallente Frigate')
+                                      src.getModifiedItemAttr('shipBonusGF2'), skill='Gallente Frigate', **kwargs)
 
 
 class Effect6358(BaseEffect):
@@ -26425,9 +26327,9 @@ class Effect6358(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemIncrease(lambda mod: mod.item.requiresSkill('Navigation'),
-                                         'warpScrambleStrength', ship.getModifiedItemAttr('roleBonus'))
+                                         'warpScrambleStrength', ship.getModifiedItemAttr('roleBonus'), **kwargs)
 
 
 class Effect6359(BaseEffect):
@@ -26441,9 +26343,9 @@ class Effect6359(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Rockets'), 'aoeVelocity',
-                                        src.getModifiedItemAttr('shipBonusMF'), skill='Minmatar Frigate')
+                                        src.getModifiedItemAttr('shipBonusMF'), skill='Minmatar Frigate', **kwargs)
 
 
 class Effect6360(BaseEffect):
@@ -26457,13 +26359,13 @@ class Effect6360(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Rockets'), 'emDamage',
-                                        src.getModifiedItemAttr('shipBonusMF2'), skill='Minmatar Frigate')
+                                        src.getModifiedItemAttr('shipBonusMF2'), skill='Minmatar Frigate', **kwargs)
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Rockets'), 'thermalDamage',
-                                        src.getModifiedItemAttr('shipBonusMF2'), skill='Minmatar Frigate')
+                                        src.getModifiedItemAttr('shipBonusMF2'), skill='Minmatar Frigate', **kwargs)
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Rockets'), 'kineticDamage',
-                                        src.getModifiedItemAttr('shipBonusMF2'), skill='Minmatar Frigate')
+                                        src.getModifiedItemAttr('shipBonusMF2'), skill='Minmatar Frigate', **kwargs)
 
 
 class Effect6361(BaseEffect):
@@ -26477,9 +26379,9 @@ class Effect6361(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Rockets'), 'explosiveDamage',
-                                        src.getModifiedItemAttr('shipBonus3MF'), skill='Minmatar Frigate')
+                                        src.getModifiedItemAttr('shipBonus3MF'), skill='Minmatar Frigate', **kwargs)
 
 
 class Effect6362(BaseEffect):
@@ -26493,9 +26395,9 @@ class Effect6362(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Stasis Web', 'maxRange',
-                                      src.getModifiedItemAttr('roleBonus'))
+                                      src.getModifiedItemAttr('roleBonus'), **kwargs)
 
 
 class Effect6368(BaseEffect):
@@ -26512,11 +26414,11 @@ class Effect6368(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Remote Shield Booster', 'falloffEffectiveness',
-                                      src.getModifiedItemAttr('falloffBonus'))
+                                      src.getModifiedItemAttr('falloffBonus'), **kwargs)
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Ancillary Remote Shield Booster',
-                                      'falloffEffectiveness', src.getModifiedItemAttr('falloffBonus'))
+                                      'falloffEffectiveness', src.getModifiedItemAttr('falloffBonus'), **kwargs)
 
 
 class Effect6369(BaseEffect):
@@ -26530,9 +26432,9 @@ class Effect6369(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Emission Systems'), 'falloffEffectiveness',
-                                      src.getModifiedItemAttr('shipBonusMC2'), skill='Minmatar Cruiser')
+                                      src.getModifiedItemAttr('shipBonusMC2'), skill='Minmatar Cruiser', **kwargs)
 
 
 class Effect6370(BaseEffect):
@@ -26547,9 +26449,9 @@ class Effect6370(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Emission Systems'), 'falloffEffectiveness',
-                                      src.getModifiedItemAttr('shipBonusCC'), skill='Caldari Cruiser')
+                                      src.getModifiedItemAttr('shipBonusCC'), skill='Caldari Cruiser', **kwargs)
 
 
 class Effect6371(BaseEffect):
@@ -26563,10 +26465,10 @@ class Effect6371(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Remote Armor Repair Systems'),
                                       'falloffEffectiveness', src.getModifiedItemAttr('shipBonusGC'),
-                                      skill='Gallente Cruiser')
+                                      skill='Gallente Cruiser', **kwargs)
 
 
 class Effect6372(BaseEffect):
@@ -26580,10 +26482,10 @@ class Effect6372(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Remote Armor Repair Systems'),
                                       'falloffEffectiveness', src.getModifiedItemAttr('shipBonusAC2'),
-                                      skill='Amarr Cruiser')
+                                      skill='Amarr Cruiser', **kwargs)
 
 
 class Effect6373(BaseEffect):
@@ -26601,11 +26503,11 @@ class Effect6373(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Remote Armor Repairer', 'falloffEffectiveness',
-                                      src.getModifiedItemAttr('falloffBonus'))
+                                      src.getModifiedItemAttr('falloffBonus'), **kwargs)
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Ancillary Remote Armor Repairer',
-                                      'falloffEffectiveness', src.getModifiedItemAttr('falloffBonus'))
+                                      'falloffEffectiveness', src.getModifiedItemAttr('falloffBonus'), **kwargs)
 
 
 class Effect6374(BaseEffect):
@@ -26621,9 +26523,9 @@ class Effect6374(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.drones.filteredItemBoost(lambda drone: drone.item.group.name == 'Logistic Drone', 'structureDamageAmount',
-                                     src.getModifiedItemAttr('droneArmorDamageAmountBonus'))
+                                     src.getModifiedItemAttr('droneArmorDamageAmountBonus'), **kwargs)
 
 
 class Effect6377(BaseEffect):
@@ -26638,11 +26540,11 @@ class Effect6377(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Remote Armor Repair Systems'), 'capacitorNeed',
-                                      src.getModifiedItemAttr('eliteBonusLogiFrig1'), skill='Logistics Frigates')
+                                      src.getModifiedItemAttr('eliteBonusLogiFrig1'), skill='Logistics Frigates', **kwargs)
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Remote Armor Repair Systems'), 'duration',
-                                      src.getModifiedItemAttr('eliteBonusLogiFrig1'), skill='Logistics Frigates')
+                                      src.getModifiedItemAttr('eliteBonusLogiFrig1'), skill='Logistics Frigates', **kwargs)
 
 
 class Effect6378(BaseEffect):
@@ -26657,11 +26559,11 @@ class Effect6378(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Emission Systems'), 'duration',
-                                      src.getModifiedItemAttr('eliteBonusLogiFrig1'), skill='Logistics Frigates')
+                                      src.getModifiedItemAttr('eliteBonusLogiFrig1'), skill='Logistics Frigates', **kwargs)
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Emission Systems'), 'capacitorNeed',
-                                      src.getModifiedItemAttr('eliteBonusLogiFrig1'), skill='Logistics Frigates')
+                                      src.getModifiedItemAttr('eliteBonusLogiFrig1'), skill='Logistics Frigates', **kwargs)
 
 
 class Effect6379(BaseEffect):
@@ -26675,8 +26577,8 @@ class Effect6379(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
-        fit.ship.boostItemAttr('armorHP', src.getModifiedItemAttr('eliteBonusLogiFrig2'), skill='Logistics Frigates')
+    def handler(fit, src, context, **kwargs):
+        fit.ship.boostItemAttr('armorHP', src.getModifiedItemAttr('eliteBonusLogiFrig2'), skill='Logistics Frigates', **kwargs)
 
 
 class Effect6380(BaseEffect):
@@ -26690,8 +26592,8 @@ class Effect6380(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
-        fit.ship.boostItemAttr('shieldCapacity', src.getModifiedItemAttr('eliteBonusLogiFrig2'), skill='Logistics Frigates')
+    def handler(fit, src, context, **kwargs):
+        fit.ship.boostItemAttr('shieldCapacity', src.getModifiedItemAttr('eliteBonusLogiFrig2'), skill='Logistics Frigates', **kwargs)
 
 
 class Effect6381(BaseEffect):
@@ -26706,9 +26608,9 @@ class Effect6381(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.ship.boostItemAttr('signatureRadius', src.getModifiedItemAttr('eliteBonusLogiFrig2'),
-                               skill='Logistics Frigates')
+                               skill='Logistics Frigates', **kwargs)
 
 
 class Effect6384(BaseEffect):
@@ -26722,14 +26624,14 @@ class Effect6384(BaseEffect):
     type = 'overheat'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         for tgtAttr in (
                 'aoeCloudSizeBonus',
                 'explosionDelayBonus',
                 'missileVelocityBonus',
                 'aoeVelocityBonus'
         ):
-            module.boostItemAttr(tgtAttr, module.getModifiedItemAttr('overloadTrackingModuleStrengthBonus'))
+            module.boostItemAttr(tgtAttr, module.getModifiedItemAttr('overloadTrackingModuleStrengthBonus'), **kwargs)
 
 
 class Effect6385(BaseEffect):
@@ -26744,9 +26646,9 @@ class Effect6385(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemForce(lambda mod: mod.item.group.name == 'Cloaking Device',
-                                      'maxVelocityModifier', src.getModifiedItemAttr('velocityPenaltyReduction'))
+                                      'maxVelocityModifier', src.getModifiedItemAttr('velocityPenaltyReduction'), **kwargs)
 
 
 class Effect6386(BaseEffect):
@@ -26761,7 +26663,7 @@ class Effect6386(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         level = src.level if 'skill' in context else 1
         for attr in (
                 'explosionDelayBonus',
@@ -26770,7 +26672,7 @@ class Effect6386(BaseEffect):
                 'missileVelocityBonus'
         ):
             fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Weapon Disruption'),
-                                          attr, src.getModifiedItemAttr('scanSkillEwStrengthBonus') * level)
+                                          attr, src.getModifiedItemAttr('scanSkillEwStrengthBonus') * level, **kwargs)
 
 
 class Effect6395(BaseEffect):
@@ -26784,21 +26686,13 @@ class Effect6395(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Weapon Disruption'), 'missileVelocityBonus',
-                                      src.getModifiedItemAttr('shipBonusAC'), skill='Amarr Cruiser')
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Weapon Disruption'), 'aoeVelocityBonus',
-                                      src.getModifiedItemAttr('shipBonusAC'), skill='Amarr Cruiser')
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Weapon Disruption'), 'maxRangeBonus',
-                                      src.getModifiedItemAttr('shipBonusAC'), skill='Amarr Cruiser')
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Weapon Disruption'), 'explosionDelayBonus',
-                                      src.getModifiedItemAttr('shipBonusAC'), skill='Amarr Cruiser')
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Weapon Disruption'), 'aoeCloudSizeBonus',
-                                      src.getModifiedItemAttr('shipBonusAC'), skill='Amarr Cruiser')
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Weapon Disruption'), 'trackingSpeedBonus',
-                                      src.getModifiedItemAttr('shipBonusAC'), skill='Amarr Cruiser')
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Weapon Disruption'), 'falloffBonus',
-                                      src.getModifiedItemAttr('shipBonusAC'), skill='Amarr Cruiser')
+    def handler(fit, src, context, **kwargs):
+        for attrName in (
+            'missileVelocityBonus', 'aoeVelocityBonus', 'maxRangeBonus', 'explosionDelayBonus',
+            'aoeCloudSizeBonus', 'trackingSpeedBonus', 'falloffBonus'
+        ):
+            fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Weapon Disruption'), attrName,
+                                          src.getModifiedItemAttr('shipBonusAC'), skill='Amarr Cruiser', **kwargs)
 
 
 class Effect6396(BaseEffect):
@@ -26812,12 +26706,12 @@ class Effect6396(BaseEffect):
     type = 'passive', 'structure'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         groups = ('Structure Anti-Capital Missile', 'Structure Anti-Subcapital Missile', 'Structure Guided Bomb')
         for damageType in ('em', 'thermal', 'explosive', 'kinetic'):
             fit.modules.filteredChargeBoost(lambda mod: mod.charge.group.name in groups,
                                             '%sDamage' % damageType, src.getModifiedItemAttr('damageMultiplierBonus'),
-                                            skill='Structure Missile Systems')
+                                            skill='Structure Missile Systems', **kwargs)
 
 
 class Effect6400(BaseEffect):
@@ -26831,11 +26725,11 @@ class Effect6400(BaseEffect):
     type = 'passive', 'structure'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         groups = ('Structure Warp Scrambler', 'Structure Disruption Battery', 'Structure Stasis Webifier')
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in groups,
                                       'capacitorNeed', src.getModifiedItemAttr('capNeedBonus'),
-                                      skill='Structure Electronic Systems')
+                                      skill='Structure Electronic Systems', **kwargs)
 
 
 class Effect6401(BaseEffect):
@@ -26849,11 +26743,11 @@ class Effect6401(BaseEffect):
     type = 'passive', 'structure'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         groups = ('Structure Energy Neutralizer', 'Structure Area Denial Module')
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in groups,
                                       'capacitorNeed', src.getModifiedItemAttr('capNeedBonus'),
-                                      skill='Structure Engineering Systems')
+                                      skill='Structure Engineering Systems', **kwargs)
 
 
 class Effect6402(BaseEffect):
@@ -26867,12 +26761,12 @@ class Effect6402(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         groups = ('Structure Anti-Subcapital Missile', 'Structure Anti-Capital Missile')
 
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.group.name in groups,
                                       'aoeVelocity', src.getModifiedItemAttr('structureRigMissileExploVeloBonus'),
-                                      stackingPenalties=True)
+                                      stackingPenalties=True, **kwargs)
 
 
 class Effect6403(BaseEffect):
@@ -26886,11 +26780,11 @@ class Effect6403(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         groups = ('Structure Anti-Subcapital Missile', 'Structure Anti-Capital Missile')
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.group.name in groups,
                                       'maxVelocity', src.getModifiedItemAttr('structureRigMissileVelocityBonus'),
-                                      stackingPenalties=True)
+                                      stackingPenalties=True, **kwargs)
 
 
 class Effect6404(BaseEffect):
@@ -26905,14 +26799,14 @@ class Effect6404(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Structure Energy Neutralizer',
                                       'maxRange', src.getModifiedItemAttr('structureRigEwarOptimalBonus'),
-                                      stackingPenalties=True)
+                                      stackingPenalties=True, **kwargs)
 
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Structure Energy Neutralizer',
                                       'falloffEffectiveness', src.getModifiedItemAttr('structureRigEwarFalloffBonus'),
-                                      stackingPenalties=True)
+                                      stackingPenalties=True, **kwargs)
 
 
 class Effect6405(BaseEffect):
@@ -26927,10 +26821,10 @@ class Effect6405(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Structure Energy Neutralizer',
                                       'capacitorNeed', src.getModifiedItemAttr('structureRigEwarCapUseBonus'),
-                                      stackingPenalties=True)
+                                      stackingPenalties=True, **kwargs)
 
 
 class Effect6406(BaseEffect):
@@ -26945,20 +26839,20 @@ class Effect6406(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         groups = ('Structure ECM Battery', 'Structure Disruption Battery')
 
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in groups,
                                       'falloff', src.getModifiedItemAttr('structureRigEwarFalloffBonus'),
-                                      stackingPenalties=True)
+                                      stackingPenalties=True, **kwargs)
 
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in groups,
                                       'maxRange', src.getModifiedItemAttr('structureRigEwarOptimalBonus'),
-                                      stackingPenalties=True)
+                                      stackingPenalties=True, **kwargs)
 
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in groups,
                                       'falloffEffectiveness', src.getModifiedItemAttr('structureRigEwarFalloffBonus'),
-                                      stackingPenalties=True)
+                                      stackingPenalties=True, **kwargs)
 
 
 class Effect6407(BaseEffect):
@@ -26973,11 +26867,11 @@ class Effect6407(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         groups = ('Structure ECM Battery', 'Structure Disruption Battery')
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in groups,
                                       'capacitorNeed', src.getModifiedItemAttr('structureRigEwarCapUseBonus'),
-                                      stackingPenalties=True)
+                                      stackingPenalties=True, **kwargs)
 
 
 class Effect6408(BaseEffect):
@@ -26992,8 +26886,8 @@ class Effect6408(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
-        fit.extraAttributes.increase('maxTargetsLockedFromSkills', src.getModifiedItemAttr('structureRigMaxTargetBonus'))
+    def handler(fit, src, context, **kwargs):
+        fit.extraAttributes.increase('maxTargetsLockedFromSkills', src.getModifiedItemAttr('structureRigMaxTargetBonus'), **kwargs)
 
 
 class Effect6409(BaseEffect):
@@ -27009,9 +26903,9 @@ class Effect6409(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.ship.boostItemAttr('scanResolution', src.getModifiedItemAttr('structureRigScanResBonus'),
-                               stackingPenalties=True)
+                               stackingPenalties=True, **kwargs)
 
 
 class Effect6410(BaseEffect):
@@ -27026,10 +26920,10 @@ class Effect6410(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.group.name == 'Structure Guided Bomb',
                                         'aoeCloudSize', src.getModifiedItemAttr('structureRigMissileExplosionRadiusBonus'),
-                                        stackingPenalties=True)
+                                        stackingPenalties=True, **kwargs)
 
 
 class Effect6411(BaseEffect):
@@ -27044,10 +26938,10 @@ class Effect6411(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.group.name == 'Structure Guided Bomb',
                                         'maxVelocity', src.getModifiedItemAttr('structureRigMissileVelocityBonus'),
-                                        stackingPenalties=True)
+                                        stackingPenalties=True, **kwargs)
 
 
 class Effect6412(BaseEffect):
@@ -27062,10 +26956,10 @@ class Effect6412(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Structure Area Denial Module',
                                       'empFieldRange', src.getModifiedItemAttr('structureRigPDRangeBonus'),
-                                      stackingPenalties=True)
+                                      stackingPenalties=True, **kwargs)
 
 
 class Effect6413(BaseEffect):
@@ -27080,10 +26974,10 @@ class Effect6413(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Structure Area Denial Module',
                                       'capacitorNeed', src.getModifiedItemAttr('structureRigPDCapUseBonus'),
-                                      stackingPenalties=True)
+                                      stackingPenalties=True, **kwargs)
 
 
 class Effect6417(BaseEffect):
@@ -27097,10 +26991,10 @@ class Effect6417(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemIncrease(lambda mod: mod.item.group.name == 'Structure Doomsday Weapon',
                                          'lightningWeaponDamageLossTarget',
-                                         src.getModifiedItemAttr('structureRigDoomsdayDamageLossTargetBonus'))
+                                         src.getModifiedItemAttr('structureRigDoomsdayDamageLossTargetBonus'), **kwargs)
 
 
 class Effect6422(BaseEffect):
@@ -27115,15 +27009,15 @@ class Effect6422(BaseEffect):
     type = 'projected', 'active'
 
     @staticmethod
-    def handler(fit, module, context, *args, **kwargs):
+    def handler(fit, module, context, **kwargs):
         if 'projected' not in context:
             return
 
         fit.ship.boostItemAttr('maxTargetRange', module.getModifiedItemAttr('maxTargetRangeBonus'),
-                               stackingPenalties=True, *args, **kwargs)
+                               stackingPenalties=True, **kwargs)
 
         fit.ship.boostItemAttr('scanResolution', module.getModifiedItemAttr('scanResolutionBonus'),
-                               stackingPenalties=True, *args, **kwargs)
+                               stackingPenalties=True, **kwargs)
 
 
 class Effect6423(BaseEffect):
@@ -27137,7 +27031,7 @@ class Effect6423(BaseEffect):
     type = 'active', 'projected'
 
     @staticmethod
-    def handler(fit, module, context, *args, **kwargs):
+    def handler(fit, module, context, **kwargs):
         if 'projected' in context:
             for srcAttr, tgtAttr in (
                     ('aoeCloudSizeBonus', 'aoeCloudSize'),
@@ -27147,7 +27041,7 @@ class Effect6423(BaseEffect):
             ):
                 fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
                                                 tgtAttr, module.getModifiedItemAttr(srcAttr),
-                                                stackingPenalties=True, *args, **kwargs)
+                                                stackingPenalties=True, **kwargs)
 
 
 class Effect6424(BaseEffect):
@@ -27161,17 +27055,17 @@ class Effect6424(BaseEffect):
     type = 'projected', 'active'
 
     @staticmethod
-    def handler(fit, module, context, *args, **kwargs):
+    def handler(fit, module, context, **kwargs):
         if 'projected' in context:
             fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Gunnery'),
                                           'trackingSpeed', module.getModifiedItemAttr('trackingSpeedBonus'),
-                                          stackingPenalties=True, *args, **kwargs)
+                                          stackingPenalties=True, **kwargs)
             fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Gunnery'),
                                           'maxRange', module.getModifiedItemAttr('maxRangeBonus'),
-                                          stackingPenalties=True, *args, **kwargs)
+                                          stackingPenalties=True, **kwargs)
             fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Gunnery'),
                                           'falloff', module.getModifiedItemAttr('falloffBonus'),
-                                          stackingPenalties=True, *args, **kwargs)
+                                          stackingPenalties=True, **kwargs)
 
 
 class Effect6425(BaseEffect):
@@ -27185,10 +27079,10 @@ class Effect6425(BaseEffect):
     type = 'projected', 'active'
 
     @staticmethod
-    def handler(fit, container, context, *args, **kwargs):
+    def handler(fit, container, context, **kwargs):
         if 'projected' in context:
             fit.ship.boostItemAttr('signatureRadius', container.getModifiedItemAttr('signatureRadiusBonus'),
-                                   stackingPenalties=True, *args, **kwargs)
+                                   stackingPenalties=True, **kwargs)
 
 
 class Effect6426(BaseEffect):
@@ -27204,11 +27098,11 @@ class Effect6426(BaseEffect):
     type = 'active', 'projected'
 
     @staticmethod
-    def handler(fit, module, context, *args, **kwargs):
+    def handler(fit, module, context, **kwargs):
         if 'projected' not in context:
             return
         fit.ship.boostItemAttr('maxVelocity', module.getModifiedItemAttr('speedFactor'),
-                               stackingPenalties=True, *args, **kwargs)
+                               stackingPenalties=True, **kwargs)
 
 
 class Effect6427(BaseEffect):
@@ -27222,21 +27116,21 @@ class Effect6427(BaseEffect):
     type = 'projected', 'active'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         if 'projected' not in context:
             return
 
         fit.ship.boostItemAttr('maxTargetRange', module.getModifiedItemAttr('maxTargetRangeBonus'),
-                               stackingPenalties=True)
+                               stackingPenalties=True, **kwargs)
         fit.ship.boostItemAttr('scanResolution', module.getModifiedItemAttr('scanResolutionBonus'),
-                               stackingPenalties=True)
+                               stackingPenalties=True, **kwargs)
 
         for scanType in ('Gravimetric', 'Magnetometric', 'Radar', 'Ladar'):
             fit.ship.boostItemAttr(
                 'scan{}Strength'.format(scanType),
                 module.getModifiedItemAttr('scan{}StrengthPercent'.format(scanType)),
-                stackingPenalties=True
-            )
+                stackingPenalties=True,
+                **kwargs)
 
 
 class Effect6428(BaseEffect):
@@ -27318,11 +27212,11 @@ class Effect6435(BaseEffect):
     type = 'active', 'projected'
 
     @classmethod
-    def handler(cls, fit, src, context):
+    def handler(cls, fit, src, context, **kwargs):
         if 'projected' not in context:
             return
         fit.ship.boostItemAttr('maxVelocity', src.getModifiedItemAttr('{}SpeedPenalty'.format(cls.prefix)) * src.amountActive,
-                               stackingPenalties=True)
+                               stackingPenalties=True, **kwargs)
 
 
 class Effect6436(BaseEffect):
@@ -27339,10 +27233,10 @@ class Effect6436(BaseEffect):
     type = 'active', 'projected'
 
     @classmethod
-    def handler(cls, fit, src, context):
+    def handler(cls, fit, src, context, **kwargs):
         if 'projected' not in context:
             return
-        fit.ship.increaseItemAttr('warpScrambleStatus', src.getModifiedItemAttr('{}PointStrength'.format(cls.prefix)) * src.amountActive)
+        fit.ship.increaseItemAttr('warpScrambleStatus', src.getModifiedItemAttr('{}PointStrength'.format(cls.prefix)) * src.amountActive, **kwargs)
 
 
 class Effect6437(BaseEffect):
@@ -27387,26 +27281,26 @@ class Effect6439(BaseEffect):
     type = 'active'
 
     @staticmethod
-    def handler(fit, container, context):
+    def handler(fit, container, context, **kwargs):
         container.boostItemAttr('maxVelocity',
-                                container.getModifiedItemAttr('fighterAbilityEvasiveManeuversSpeedBonus'))
+                                container.getModifiedItemAttr('fighterAbilityEvasiveManeuversSpeedBonus'), **kwargs)
         container.boostItemAttr('signatureRadius',
                                 container.getModifiedItemAttr('fighterAbilityEvasiveManeuversSignatureRadiusBonus'),
-                                stackingPenalties=True)
+                                stackingPenalties=True, **kwargs)
 
         # These may not have stacking penalties, but there's nothing else that affects the attributes yet to check.
         container.multiplyItemAttr('shieldEmDamageResonance',
                                    container.getModifiedItemAttr('fighterAbilityEvasiveManeuversEmResonance'),
-                                   stackingPenalties=True)
+                                   stackingPenalties=True, **kwargs)
         container.multiplyItemAttr('shieldThermalDamageResonance',
                                    container.getModifiedItemAttr('fighterAbilityEvasiveManeuversThermResonance'),
-                                   stackingPenalties=True)
+                                   stackingPenalties=True, **kwargs)
         container.multiplyItemAttr('shieldKineticDamageResonance',
                                    container.getModifiedItemAttr('fighterAbilityEvasiveManeuversKinResonance'),
-                                   stackingPenalties=True)
+                                   stackingPenalties=True, **kwargs)
         container.multiplyItemAttr('shieldExplosiveDamageResonance',
                                    container.getModifiedItemAttr('fighterAbilityEvasiveManeuversExpResonance'),
-                                   stackingPenalties=True)
+                                   stackingPenalties=True, **kwargs)
 
 
 class Effect6441(BaseEffect):
@@ -27423,12 +27317,12 @@ class Effect6441(BaseEffect):
     type = 'active'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         module.boostItemAttr('maxVelocity', module.getModifiedItemAttr('fighterAbilityMicroWarpDriveSpeedBonus'),
-                             stackingPenalties=True)
+                             stackingPenalties=True, **kwargs)
         module.boostItemAttr('signatureRadius',
                              module.getModifiedItemAttr('fighterAbilityMicroWarpDriveSignatureRadiusBonus'),
-                             stackingPenalties=True)
+                             stackingPenalties=True, **kwargs)
 
 
 class Effect6443(BaseEffect):
@@ -27464,7 +27358,7 @@ class Effect6448(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, container, context):
+    def handler(fit, container, context, **kwargs):
         missileGroups = ('Structure Anti-Capital Missile', 'Structure Anti-Subcapital Missile')
         for srcAttr, tgtAttr in (
                 ('aoeCloudSizeBonus', 'aoeCloudSize'),
@@ -27474,7 +27368,7 @@ class Effect6448(BaseEffect):
         ):
             fit.modules.filteredChargeBoost(lambda mod: mod.charge.group.name in missileGroups,
                                             tgtAttr, container.getModifiedItemAttr(srcAttr),
-                                            stackingPenalties=True)
+                                            stackingPenalties=True, **kwargs)
 
 
 class Effect6449(BaseEffect):
@@ -27488,19 +27382,19 @@ class Effect6449(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         missileGroups = ('Structure Anti-Capital Missile', 'Structure Anti-Subcapital Missile')
 
         for dmgType in ('em', 'kinetic', 'explosive', 'thermal'):
             fit.modules.filteredChargeMultiply(lambda mod: mod.charge.group.name in missileGroups,
                                                '%sDamage' % dmgType,
                                                module.getModifiedItemAttr('missileDamageMultiplierBonus'),
-                                               stackingPenalties=True)
+                                               stackingPenalties=True, **kwargs)
 
         launcherGroups = ('Structure XL Missile Launcher', 'Structure Multirole Missile Launcher')
         fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name in launcherGroups,
                                          'speed', module.getModifiedItemAttr('speedMultiplier'),
-                                         stackingPenalties=True)
+                                         stackingPenalties=True, **kwargs)
 
 
 class Effect6465(BaseEffect):
@@ -27585,10 +27479,10 @@ class Effect6475(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemIncrease(lambda mod: mod.item.group.name == 'Structure Doomsday Weapon',
                                          'lightningWeaponTargetAmount',
-                                         src.getModifiedItemAttr('structureRigDoomsdayTargetAmountBonus'))
+                                         src.getModifiedItemAttr('structureRigDoomsdayTargetAmountBonus'), **kwargs)
 
 
 class Effect6476(BaseEffect):
@@ -27603,11 +27497,11 @@ class Effect6476(BaseEffect):
     type = 'active', 'projected'
 
     @staticmethod
-    def handler(fit, module, context, *args, **kwargs):
+    def handler(fit, module, context, **kwargs):
         if 'projected' not in context:
             return
         fit.ship.boostItemAttr('maxVelocity', module.getModifiedItemAttr('speedFactor'),
-                               stackingPenalties=True, *args, **kwargs)
+                               stackingPenalties=True, **kwargs)
 
 
 class Effect6477(BaseEffect):
@@ -27648,10 +27542,10 @@ class Effect6478(BaseEffect):
     type = 'projected', 'active'
 
     @staticmethod
-    def handler(fit, container, context, *args, **kwargs):
+    def handler(fit, container, context, **kwargs):
         if 'projected' in context:
             fit.ship.boostItemAttr('signatureRadius', container.getModifiedItemAttr('signatureRadiusBonus'),
-                                   stackingPenalties=True, *args, **kwargs)
+                                   stackingPenalties=True, **kwargs)
 
 
 class Effect6479(BaseEffect):
@@ -27666,7 +27560,7 @@ class Effect6479(BaseEffect):
     type = 'active', 'projected'
 
     @staticmethod
-    def handler(fit, module, context, *args, **kwargs):
+    def handler(fit, module, context, **kwargs):
         if 'projected' in context:
             for srcAttr, tgtAttr in (
                     ('aoeCloudSizeBonus', 'aoeCloudSize'),
@@ -27676,17 +27570,17 @@ class Effect6479(BaseEffect):
             ):
                 fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
                                                 tgtAttr, module.getModifiedItemAttr(srcAttr),
-                                                stackingPenalties=True, *args, **kwargs)
+                                                stackingPenalties=True, **kwargs)
 
             fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Gunnery'),
                                           'trackingSpeed', module.getModifiedItemAttr('trackingSpeedBonus'),
-                                          stackingPenalties=True, *args, **kwargs)
+                                          stackingPenalties=True, **kwargs)
             fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Gunnery'),
                                           'maxRange', module.getModifiedItemAttr('maxRangeBonus'),
-                                          stackingPenalties=True, *args, **kwargs)
+                                          stackingPenalties=True, **kwargs)
             fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Gunnery'),
                                           'falloff', module.getModifiedItemAttr('falloffBonus'),
-                                          stackingPenalties=True, *args, **kwargs)
+                                          stackingPenalties=True, **kwargs)
 
 
 class Effect6481(BaseEffect):
@@ -27701,15 +27595,15 @@ class Effect6481(BaseEffect):
     type = 'projected', 'active'
 
     @staticmethod
-    def handler(fit, module, context, *args, **kwargs):
+    def handler(fit, module, context, **kwargs):
         if 'projected' not in context:
             return
 
         fit.ship.boostItemAttr('maxTargetRange', module.getModifiedItemAttr('maxTargetRangeBonus'),
-                               stackingPenalties=True, *args, **kwargs)
+                               stackingPenalties=True, **kwargs)
 
         fit.ship.boostItemAttr('scanResolution', module.getModifiedItemAttr('scanResolutionBonus'),
-                               stackingPenalties=True, *args, **kwargs)
+                               stackingPenalties=True, **kwargs)
 
 
 class Effect6482(BaseEffect):
@@ -27724,7 +27618,7 @@ class Effect6482(BaseEffect):
     type = 'projected', 'active'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         return
 
 
@@ -27740,11 +27634,11 @@ class Effect6484(BaseEffect):
     type = 'active'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         for dmgType in ('em', 'thermal', 'kinetic', 'explosive'):
             fit.ship.multiplyItemAttr('{}DamageResonance'.format(dmgType),
                                       src.getModifiedItemAttr('hull{}DamageResonance'.format(dmgType.title())),
-                                      stackingPenalties=True, penaltyGroup='postMul')
+                                      stackingPenalties=True, penaltyGroup='postMul', **kwargs)
 
 
 class Effect6485(BaseEffect):
@@ -27772,10 +27666,10 @@ class Effect6487(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         fit.ship.boostItemAttr('energyWarfareResistance',
                                module.getModifiedItemAttr('energyWarfareResistanceBonus'),
-                               stackingPenalties=True)
+                               stackingPenalties=True, **kwargs)
 
 
 class Effect6488(BaseEffect):
@@ -27789,10 +27683,10 @@ class Effect6488(BaseEffect):
     type = 'active'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         for scanType in ('Gravimetric', 'Magnetometric', 'Radar', 'Ladar'):
             module.boostItemAttr('scan{}StrengthPercent'.format(scanType),
-                                 module.getModifiedChargeAttr('sensorStrengthBonusBonus'))
+                                 module.getModifiedChargeAttr('sensorStrengthBonusBonus'), **kwargs)
 
 
 class Effect6501(BaseEffect):
@@ -27806,9 +27700,9 @@ class Effect6501(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Capital Energy Turret'), 'damageMultiplier',
-                                      src.getModifiedItemAttr('shipBonusDreadnoughtA1'), skill='Amarr Dreadnought')
+                                      src.getModifiedItemAttr('shipBonusDreadnoughtA1'), skill='Amarr Dreadnought', **kwargs)
 
 
 class Effect6502(BaseEffect):
@@ -27822,15 +27716,15 @@ class Effect6502(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.ship.boostItemAttr('armorExplosiveDamageResonance', src.getModifiedItemAttr('shipBonusDreadnoughtA2'),
-                               skill='Amarr Dreadnought')
+                               skill='Amarr Dreadnought', **kwargs)
         fit.ship.boostItemAttr('armorEmDamageResonance', src.getModifiedItemAttr('shipBonusDreadnoughtA2'),
-                               skill='Amarr Dreadnought')
+                               skill='Amarr Dreadnought', **kwargs)
         fit.ship.boostItemAttr('armorThermalDamageResonance', src.getModifiedItemAttr('shipBonusDreadnoughtA2'),
-                               skill='Amarr Dreadnought')
+                               skill='Amarr Dreadnought', **kwargs)
         fit.ship.boostItemAttr('armorKineticDamageResonance', src.getModifiedItemAttr('shipBonusDreadnoughtA2'),
-                               skill='Amarr Dreadnought')
+                               skill='Amarr Dreadnought', **kwargs)
 
 
 class Effect6503(BaseEffect):
@@ -27844,9 +27738,9 @@ class Effect6503(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Capital Energy Turret'), 'capacitorNeed',
-                                      src.getModifiedItemAttr('shipBonusDreadnoughtA3'), skill='Amarr Dreadnought')
+                                      src.getModifiedItemAttr('shipBonusDreadnoughtA3'), skill='Amarr Dreadnought', **kwargs)
 
 
 class Effect6504(BaseEffect):
@@ -27860,31 +27754,13 @@ class Effect6504(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
-        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('XL Torpedoes'), 'thermalDamage',
-                                        src.getModifiedItemAttr('shipBonusDreadnoughtC1'), skill='Caldari Dreadnought')
-        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('XL Cruise Missiles'), 'kineticDamage',
-                                        src.getModifiedItemAttr('shipBonusDreadnoughtC1'), skill='Caldari Dreadnought')
-        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Torpedoes'), 'emDamage',
-                                        src.getModifiedItemAttr('shipBonusDreadnoughtC1'), skill='Caldari Dreadnought')
-        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Torpedoes'), 'explosiveDamage',
-                                        src.getModifiedItemAttr('shipBonusDreadnoughtC1'), skill='Caldari Dreadnought')
-        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('XL Cruise Missiles'), 'explosiveDamage',
-                                        src.getModifiedItemAttr('shipBonusDreadnoughtC1'), skill='Caldari Dreadnought')
-        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('XL Cruise Missiles'), 'thermalDamage',
-                                        src.getModifiedItemAttr('shipBonusDreadnoughtC1'), skill='Caldari Dreadnought')
-        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Torpedoes'), 'thermalDamage',
-                                        src.getModifiedItemAttr('shipBonusDreadnoughtC1'), skill='Caldari Dreadnought')
-        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('XL Torpedoes'), 'emDamage',
-                                        src.getModifiedItemAttr('shipBonusDreadnoughtC1'), skill='Caldari Dreadnought')
-        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Torpedoes'), 'kineticDamage',
-                                        src.getModifiedItemAttr('shipBonusDreadnoughtC1'), skill='Caldari Dreadnought')
-        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('XL Torpedoes'), 'kineticDamage',
-                                        src.getModifiedItemAttr('shipBonusDreadnoughtC1'), skill='Caldari Dreadnought')
-        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('XL Torpedoes'), 'explosiveDamage',
-                                        src.getModifiedItemAttr('shipBonusDreadnoughtC1'), skill='Caldari Dreadnought')
-        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('XL Cruise Missiles'), 'emDamage',
-                                        src.getModifiedItemAttr('shipBonusDreadnoughtC1'), skill='Caldari Dreadnought')
+    def handler(fit, src, context, **kwargs):
+        for attrName in ('emDamage', 'thermalDamage', 'kineticDamage', 'explosiveDamage'):
+            fit.modules.filteredChargeBoost(lambda mod: (mod.charge.requiresSkill('XL Torpedoes') or
+                                                         mod.charge.requiresSkill('XL Cruise Missiles') or
+                                                         mod.charge.requiresSkill('Torpedoes')), 'thermalDamage',
+                                            src.getModifiedItemAttr('shipBonusDreadnoughtC1'),
+                                            skill='Caldari Dreadnought', **kwargs)
 
 
 class Effect6505(BaseEffect):
@@ -27898,15 +27774,15 @@ class Effect6505(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.ship.boostItemAttr('shieldThermalDamageResonance', src.getModifiedItemAttr('shipBonusDreadnoughtC2'),
-                               skill='Caldari Dreadnought')
+                               skill='Caldari Dreadnought', **kwargs)
         fit.ship.boostItemAttr('shieldKineticDamageResonance', src.getModifiedItemAttr('shipBonusDreadnoughtC2'),
-                               skill='Caldari Dreadnought')
+                               skill='Caldari Dreadnought', **kwargs)
         fit.ship.boostItemAttr('shieldEmDamageResonance', src.getModifiedItemAttr('shipBonusDreadnoughtC2'),
-                               skill='Caldari Dreadnought')
+                               skill='Caldari Dreadnought', **kwargs)
         fit.ship.boostItemAttr('shieldExplosiveDamageResonance', src.getModifiedItemAttr('shipBonusDreadnoughtC2'),
-                               skill='Caldari Dreadnought')
+                               skill='Caldari Dreadnought', **kwargs)
 
 
 class Effect6506(BaseEffect):
@@ -27920,9 +27796,9 @@ class Effect6506(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Capital Hybrid Turret'), 'damageMultiplier',
-                                      src.getModifiedItemAttr('shipBonusDreadnoughtG1'), skill='Gallente Dreadnought')
+                                      src.getModifiedItemAttr('shipBonusDreadnoughtG1'), skill='Gallente Dreadnought', **kwargs)
 
 
 class Effect6507(BaseEffect):
@@ -27936,9 +27812,9 @@ class Effect6507(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Capital Hybrid Turret'), 'speed',
-                                      src.getModifiedItemAttr('shipBonusDreadnoughtG2'), skill='Gallente Dreadnought')
+                                      src.getModifiedItemAttr('shipBonusDreadnoughtG2'), skill='Gallente Dreadnought', **kwargs)
 
 
 class Effect6508(BaseEffect):
@@ -27952,9 +27828,9 @@ class Effect6508(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Capital Repair Systems'), 'duration',
-                                      src.getModifiedItemAttr('shipBonusDreadnoughtG3'), skill='Gallente Dreadnought')
+                                      src.getModifiedItemAttr('shipBonusDreadnoughtG3'), skill='Gallente Dreadnought', **kwargs)
 
 
 class Effect6509(BaseEffect):
@@ -27968,9 +27844,9 @@ class Effect6509(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Capital Projectile Turret'), 'damageMultiplier',
-                                      src.getModifiedItemAttr('shipBonusDreadnoughtM1'), skill='Minmatar Dreadnought')
+                                      src.getModifiedItemAttr('shipBonusDreadnoughtM1'), skill='Minmatar Dreadnought', **kwargs)
 
 
 class Effect6510(BaseEffect):
@@ -27984,9 +27860,9 @@ class Effect6510(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Capital Projectile Turret'), 'speed',
-                                      src.getModifiedItemAttr('shipBonusDreadnoughtM2'), skill='Minmatar Dreadnought')
+                                      src.getModifiedItemAttr('shipBonusDreadnoughtM2'), skill='Minmatar Dreadnought', **kwargs)
 
 
 class Effect6511(BaseEffect):
@@ -28000,9 +27876,9 @@ class Effect6511(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Capital Shield Operation'), 'duration',
-                                      src.getModifiedItemAttr('shipBonusDreadnoughtM2'), skill='Minmatar Dreadnought')
+                                      src.getModifiedItemAttr('shipBonusDreadnoughtM2'), skill='Minmatar Dreadnought', **kwargs)
 
 
 class Effect6513(BaseEffect):
@@ -28040,15 +27916,15 @@ class Effect6526(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Capacitor Emission Systems') or
                                                   mod.item.requiresSkill('Capital Capacitor Emission Systems'),
                                       'powerTransferAmount', src.getModifiedItemAttr('shipBonusForceAuxiliaryA1'),
-                                      skill='Amarr Carrier')
+                                      skill='Amarr Carrier', **kwargs)
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Remote Armor Repair Systems') or
                                                   mod.item.requiresSkill('Capital Remote Armor Repair Systems'),
                                       'armorDamageAmount', src.getModifiedItemAttr('shipBonusForceAuxiliaryA1'),
-                                      skill='Amarr Carrier')
+                                      skill='Amarr Carrier', **kwargs)
 
 
 class Effect6527(BaseEffect):
@@ -28062,15 +27938,15 @@ class Effect6527(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.ship.boostItemAttr('armorKineticDamageResonance', src.getModifiedItemAttr('shipBonusForceAuxiliaryA2'),
-                               skill='Amarr Carrier')
+                               skill='Amarr Carrier', **kwargs)
         fit.ship.boostItemAttr('armorExplosiveDamageResonance', src.getModifiedItemAttr('shipBonusForceAuxiliaryA2'),
-                               skill='Amarr Carrier')
+                               skill='Amarr Carrier', **kwargs)
         fit.ship.boostItemAttr('armorEmDamageResonance', src.getModifiedItemAttr('shipBonusForceAuxiliaryA2'),
-                               skill='Amarr Carrier')
+                               skill='Amarr Carrier', **kwargs)
         fit.ship.boostItemAttr('armorThermalDamageResonance', src.getModifiedItemAttr('shipBonusForceAuxiliaryA2'),
-                               skill='Amarr Carrier')
+                               skill='Amarr Carrier', **kwargs)
 
 
 class Effect6533(BaseEffect):
@@ -28084,22 +27960,27 @@ class Effect6533(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Armored Command') or
                                                   mod.item.requiresSkill('Information Command'),
-                                      'warfareBuff4Value', src.getModifiedItemAttr('shipBonusForceAuxiliaryA4'), skill='Amarr Carrier')
+                                      'warfareBuff4Value', src.getModifiedItemAttr('shipBonusForceAuxiliaryA4'),
+                                      skill='Amarr Carrier', **kwargs)
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Armored Command') or
                                                   mod.item.requiresSkill('Information Command'),
-                                      'warfareBuff3Value', src.getModifiedItemAttr('shipBonusForceAuxiliaryA4'), skill='Amarr Carrier')
+                                      'warfareBuff3Value', src.getModifiedItemAttr('shipBonusForceAuxiliaryA4'),
+                                      skill='Amarr Carrier', **kwargs)
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Armored Command') or
                                                   mod.item.requiresSkill('Information Command'),
-                                      'warfareBuff1Value', src.getModifiedItemAttr('shipBonusForceAuxiliaryA4'), skill='Amarr Carrier')
+                                      'warfareBuff1Value', src.getModifiedItemAttr('shipBonusForceAuxiliaryA4'),
+                                      skill='Amarr Carrier', **kwargs)
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Armored Command') or
                                                   mod.item.requiresSkill('Information Command'),
-                                      'buffDuration', src.getModifiedItemAttr('shipBonusForceAuxiliaryA4'), skill='Amarr Carrier')
+                                      'buffDuration', src.getModifiedItemAttr('shipBonusForceAuxiliaryA4'),
+                                      skill='Amarr Carrier', **kwargs)
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Armored Command') or
                                                   mod.item.requiresSkill('Information Command'),
-                                      'warfareBuff2Value', src.getModifiedItemAttr('shipBonusForceAuxiliaryA4'), skill='Amarr Carrier')
+                                      'warfareBuff2Value', src.getModifiedItemAttr('shipBonusForceAuxiliaryA4'),
+                                      skill='Amarr Carrier', **kwargs)
 
 
 class Effect6534(BaseEffect):
@@ -28113,22 +27994,22 @@ class Effect6534(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(
             lambda mod: mod.item.requiresSkill('Skirmish Command') or mod.item.requiresSkill('Shield Command'),
-            'warfareBuff3Value', src.getModifiedItemAttr('shipBonusForceAuxiliaryM4'), skill='Minmatar Carrier')
+            'warfareBuff3Value', src.getModifiedItemAttr('shipBonusForceAuxiliaryM4'), skill='Minmatar Carrier', **kwargs)
         fit.modules.filteredItemBoost(
             lambda mod: mod.item.requiresSkill('Skirmish Command') or mod.item.requiresSkill('Shield Command'),
-            'warfareBuff2Value', src.getModifiedItemAttr('shipBonusForceAuxiliaryM4'), skill='Minmatar Carrier')
+            'warfareBuff2Value', src.getModifiedItemAttr('shipBonusForceAuxiliaryM4'), skill='Minmatar Carrier', **kwargs)
         fit.modules.filteredItemBoost(
             lambda mod: mod.item.requiresSkill('Skirmish Command') or mod.item.requiresSkill('Shield Command'),
-            'warfareBuff1Value', src.getModifiedItemAttr('shipBonusForceAuxiliaryM4'), skill='Minmatar Carrier')
+            'warfareBuff1Value', src.getModifiedItemAttr('shipBonusForceAuxiliaryM4'), skill='Minmatar Carrier', **kwargs)
         fit.modules.filteredItemBoost(
             lambda mod: mod.item.requiresSkill('Skirmish Command') or mod.item.requiresSkill('Shield Command'),
-            'buffDuration', src.getModifiedItemAttr('shipBonusForceAuxiliaryM4'), skill='Minmatar Carrier')
+            'buffDuration', src.getModifiedItemAttr('shipBonusForceAuxiliaryM4'), skill='Minmatar Carrier', **kwargs)
         fit.modules.filteredItemBoost(
             lambda mod: mod.item.requiresSkill('Skirmish Command') or mod.item.requiresSkill('Shield Command'),
-            'warfareBuff4Value', src.getModifiedItemAttr('shipBonusForceAuxiliaryM4'), skill='Minmatar Carrier')
+            'warfareBuff4Value', src.getModifiedItemAttr('shipBonusForceAuxiliaryM4'), skill='Minmatar Carrier', **kwargs)
 
 
 class Effect6535(BaseEffect):
@@ -28142,22 +28023,22 @@ class Effect6535(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(
             lambda mod: mod.item.requiresSkill('Skirmish Command') or mod.item.requiresSkill('Armored Command'),
-            'warfareBuff3Value', src.getModifiedItemAttr('shipBonusForceAuxiliaryG4'), skill='Gallente Carrier')
+            'warfareBuff3Value', src.getModifiedItemAttr('shipBonusForceAuxiliaryG4'), skill='Gallente Carrier', **kwargs)
         fit.modules.filteredItemBoost(
             lambda mod: mod.item.requiresSkill('Skirmish Command') or mod.item.requiresSkill('Armored Command'),
-            'warfareBuff4Value', src.getModifiedItemAttr('shipBonusForceAuxiliaryG4'), skill='Gallente Carrier')
+            'warfareBuff4Value', src.getModifiedItemAttr('shipBonusForceAuxiliaryG4'), skill='Gallente Carrier', **kwargs)
         fit.modules.filteredItemBoost(
             lambda mod: mod.item.requiresSkill('Skirmish Command') or mod.item.requiresSkill('Armored Command'),
-            'buffDuration', src.getModifiedItemAttr('shipBonusForceAuxiliaryG4'), skill='Gallente Carrier')
+            'buffDuration', src.getModifiedItemAttr('shipBonusForceAuxiliaryG4'), skill='Gallente Carrier', **kwargs)
         fit.modules.filteredItemBoost(
             lambda mod: mod.item.requiresSkill('Skirmish Command') or mod.item.requiresSkill('Armored Command'),
-            'warfareBuff2Value', src.getModifiedItemAttr('shipBonusForceAuxiliaryG4'), skill='Gallente Carrier')
+            'warfareBuff2Value', src.getModifiedItemAttr('shipBonusForceAuxiliaryG4'), skill='Gallente Carrier', **kwargs)
         fit.modules.filteredItemBoost(
             lambda mod: mod.item.requiresSkill('Skirmish Command') or mod.item.requiresSkill('Armored Command'),
-            'warfareBuff1Value', src.getModifiedItemAttr('shipBonusForceAuxiliaryG4'), skill='Gallente Carrier')
+            'warfareBuff1Value', src.getModifiedItemAttr('shipBonusForceAuxiliaryG4'), skill='Gallente Carrier', **kwargs)
 
 
 class Effect6536(BaseEffect):
@@ -28171,22 +28052,22 @@ class Effect6536(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(
             lambda mod: mod.item.requiresSkill('Shield Command') or mod.item.requiresSkill('Information Command'),
-            'warfareBuff3Value', src.getModifiedItemAttr('shipBonusForceAuxiliaryC4'), skill='Caldari Carrier')
+            'warfareBuff3Value', src.getModifiedItemAttr('shipBonusForceAuxiliaryC4'), skill='Caldari Carrier', **kwargs)
         fit.modules.filteredItemBoost(
             lambda mod: mod.item.requiresSkill('Shield Command') or mod.item.requiresSkill('Information Command'),
-            'warfareBuff4Value', src.getModifiedItemAttr('shipBonusForceAuxiliaryC4'), skill='Caldari Carrier')
+            'warfareBuff4Value', src.getModifiedItemAttr('shipBonusForceAuxiliaryC4'), skill='Caldari Carrier', **kwargs)
         fit.modules.filteredItemBoost(
             lambda mod: mod.item.requiresSkill('Shield Command') or mod.item.requiresSkill('Information Command'),
-            'warfareBuff2Value', src.getModifiedItemAttr('shipBonusForceAuxiliaryC4'), skill='Caldari Carrier')
+            'warfareBuff2Value', src.getModifiedItemAttr('shipBonusForceAuxiliaryC4'), skill='Caldari Carrier', **kwargs)
         fit.modules.filteredItemBoost(
             lambda mod: mod.item.requiresSkill('Shield Command') or mod.item.requiresSkill('Information Command'),
-            'buffDuration', src.getModifiedItemAttr('shipBonusForceAuxiliaryC4'), skill='Caldari Carrier')
+            'buffDuration', src.getModifiedItemAttr('shipBonusForceAuxiliaryC4'), skill='Caldari Carrier', **kwargs)
         fit.modules.filteredItemBoost(
             lambda mod: mod.item.requiresSkill('Shield Command') or mod.item.requiresSkill('Information Command'),
-            'warfareBuff1Value', src.getModifiedItemAttr('shipBonusForceAuxiliaryC4'), skill='Caldari Carrier')
+            'warfareBuff1Value', src.getModifiedItemAttr('shipBonusForceAuxiliaryC4'), skill='Caldari Carrier', **kwargs)
 
 
 class Effect6537(BaseEffect):
@@ -28200,9 +28081,9 @@ class Effect6537(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Leadership'), 'cpu',
-                                      src.getModifiedItemAttr('shipBonusRole1'))
+                                      src.getModifiedItemAttr('shipBonusRole1'), **kwargs)
 
 
 class Effect6545(BaseEffect):
@@ -28216,18 +28097,18 @@ class Effect6545(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         if src.getModifiedItemAttr('shipBonusForceAuxiliaryC1') is None:
             return  # See GH Issue 1321
 
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Capacitor Emission Systems') or
                                                   mod.item.requiresSkill('Capital Capacitor Emission Systems'),
                                       'powerTransferAmount', src.getModifiedItemAttr('shipBonusForceAuxiliaryC1'),
-                                      skill='Caldari Carrier')
+                                      skill='Caldari Carrier', **kwargs)
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Emission Systems') or
                                                   mod.item.requiresSkill('Capital Shield Emission Systems'),
                                       'shieldBonus', src.getModifiedItemAttr('shipBonusForceAuxiliaryC1'),
-                                      skill='Caldari Carrier')
+                                      skill='Caldari Carrier', **kwargs)
 
 
 class Effect6546(BaseEffect):
@@ -28241,15 +28122,15 @@ class Effect6546(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.ship.boostItemAttr('shieldEmDamageResonance', src.getModifiedItemAttr('shipBonusForceAuxiliaryC2'),
-                               skill='Caldari Carrier')
+                               skill='Caldari Carrier', **kwargs)
         fit.ship.boostItemAttr('shieldExplosiveDamageResonance', src.getModifiedItemAttr('shipBonusForceAuxiliaryC2'),
-                               skill='Caldari Carrier')
+                               skill='Caldari Carrier', **kwargs)
         fit.ship.boostItemAttr('shieldKineticDamageResonance', src.getModifiedItemAttr('shipBonusForceAuxiliaryC2'),
-                               skill='Caldari Carrier')
+                               skill='Caldari Carrier', **kwargs)
         fit.ship.boostItemAttr('shieldThermalDamageResonance', src.getModifiedItemAttr('shipBonusForceAuxiliaryC2'),
-                               skill='Caldari Carrier')
+                               skill='Caldari Carrier', **kwargs)
 
 
 class Effect6548(BaseEffect):
@@ -28263,15 +28144,15 @@ class Effect6548(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Emission Systems') or
                                                   mod.item.requiresSkill('Capital Shield Emission Systems'),
                                       'duration', src.getModifiedItemAttr('shipBonusForceAuxiliaryG1'),
-                                      skill='Gallente Carrier')
+                                      skill='Gallente Carrier', **kwargs)
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Remote Armor Repair Systems') or
                                                   mod.item.requiresSkill('Capital Remote Armor Repair Systems'),
                                       'duration', src.getModifiedItemAttr('shipBonusForceAuxiliaryG1'),
-                                      skill='Gallente Carrier')
+                                      skill='Gallente Carrier', **kwargs)
 
 
 class Effect6549(BaseEffect):
@@ -28285,11 +28166,11 @@ class Effect6549(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Repair Systems'), 'armorDamageAmount',
-                                      src.getModifiedItemAttr('shipBonusForceAuxiliaryG2'), skill='Gallente Carrier')
+                                      src.getModifiedItemAttr('shipBonusForceAuxiliaryG2'), skill='Gallente Carrier', **kwargs)
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Capital Repair Systems'), 'armorDamageAmount',
-                                      src.getModifiedItemAttr('shipBonusForceAuxiliaryG2'), skill='Gallente Carrier')
+                                      src.getModifiedItemAttr('shipBonusForceAuxiliaryG2'), skill='Gallente Carrier', **kwargs)
 
 
 class Effect6551(BaseEffect):
@@ -28303,16 +28184,16 @@ class Effect6551(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Emission Systems') or
                                                   mod.item.requiresSkill('Capital Shield Emission Systems'),
                                       'duration', src.getModifiedItemAttr('shipBonusForceAuxiliaryM1'),
-                                      skill='Minmatar Carrier')
+                                      skill='Minmatar Carrier', **kwargs)
 
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Remote Armor Repair Systems') or
                                                   mod.item.requiresSkill('Capital Remote Armor Repair Systems'),
                                       'duration', src.getModifiedItemAttr('shipBonusForceAuxiliaryM1'),
-                                      skill='Minmatar Carrier')
+                                      skill='Minmatar Carrier', **kwargs)
 
 
 class Effect6552(BaseEffect):
@@ -28326,11 +28207,11 @@ class Effect6552(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Capital Shield Operation'), 'shieldBonus',
-                                      src.getModifiedItemAttr('shipBonusForceAuxiliaryM2'), skill='Minmatar Carrier')
+                                      src.getModifiedItemAttr('shipBonusForceAuxiliaryM2'), skill='Minmatar Carrier', **kwargs)
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Operation'), 'shieldBonus',
-                                      src.getModifiedItemAttr('shipBonusForceAuxiliaryM2'), skill='Minmatar Carrier')
+                                      src.getModifiedItemAttr('shipBonusForceAuxiliaryM2'), skill='Minmatar Carrier', **kwargs)
 
 
 class Effect6555(BaseEffect):
@@ -28344,11 +28225,11 @@ class Effect6555(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'), 'maxVelocity',
-                                       src.getModifiedItemAttr('speedFactor'), stackingPenalties=True)
+                                       src.getModifiedItemAttr('speedFactor'), stackingPenalties=True, **kwargs)
         fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Drones'), 'maxVelocity',
-                                     src.getModifiedItemAttr('speedFactor'), stackingPenalties=True)
+                                     src.getModifiedItemAttr('speedFactor'), stackingPenalties=True, **kwargs)
 
 
 class Effect6556(BaseEffect):
@@ -28364,18 +28245,18 @@ class Effect6556(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'),
                                        'fighterAbilityMissilesDamageMultiplier',
-                                       src.getModifiedItemAttr('droneDamageBonus'), stackingPenalties=True)
+                                       src.getModifiedItemAttr('droneDamageBonus'), stackingPenalties=True, **kwargs)
         fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'),
                                        'fighterAbilityAttackTurretDamageMultiplier',
-                                       src.getModifiedItemAttr('droneDamageBonus'), stackingPenalties=True)
+                                       src.getModifiedItemAttr('droneDamageBonus'), stackingPenalties=True, **kwargs)
         fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'),
                                        'fighterAbilityAttackMissileDamageMultiplier',
-                                       src.getModifiedItemAttr('droneDamageBonus'), stackingPenalties=True)
+                                       src.getModifiedItemAttr('droneDamageBonus'), stackingPenalties=True, **kwargs)
         fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Drones'), 'damageMultiplier',
-                                     src.getModifiedItemAttr('droneDamageBonus'), stackingPenalties=True)
+                                     src.getModifiedItemAttr('droneDamageBonus'), stackingPenalties=True, **kwargs)
 
 
 class Effect6557(BaseEffect):
@@ -28389,42 +28270,42 @@ class Effect6557(BaseEffect):
     type = 'active'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'),
                                        'fighterAbilityAttackTurretRangeFalloff', src.getModifiedItemAttr('falloffBonus'),
-                                       stackingPenalties=True)
+                                       stackingPenalties=True, **kwargs)
         fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'),
                                        'fighterAbilityMissilesExplosionVelocity',
-                                       src.getModifiedItemAttr('aoeVelocityBonus'), stackingPenalties=True)
+                                       src.getModifiedItemAttr('aoeVelocityBonus'), stackingPenalties=True, **kwargs)
         fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Drones'), 'trackingSpeed',
-                                     src.getModifiedItemAttr('trackingSpeedBonus'), stackingPenalties=True)
+                                     src.getModifiedItemAttr('trackingSpeedBonus'), stackingPenalties=True, **kwargs)
         fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'),
                                        'fighterAbilityAttackMissileExplosionRadius',
-                                       src.getModifiedItemAttr('aoeCloudSizeBonus'), stackingPenalties=True)
+                                       src.getModifiedItemAttr('aoeCloudSizeBonus'), stackingPenalties=True, **kwargs)
         fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'),
                                        'fighterAbilityAttackTurretTrackingSpeed',
-                                       src.getModifiedItemAttr('trackingSpeedBonus'), stackingPenalties=True)
+                                       src.getModifiedItemAttr('trackingSpeedBonus'), stackingPenalties=True, **kwargs)
         fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'),
                                        'fighterAbilityMissilesExplosionRadius',
-                                       src.getModifiedItemAttr('aoeCloudSizeBonus'), stackingPenalties=True)
+                                       src.getModifiedItemAttr('aoeCloudSizeBonus'), stackingPenalties=True, **kwargs)
         fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'), 'fighterAbilityMissilesRange',
-                                       src.getModifiedItemAttr('maxRangeBonus'), stackingPenalties=True)
+                                       src.getModifiedItemAttr('maxRangeBonus'), stackingPenalties=True, **kwargs)
         fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'),
                                        'fighterAbilityAttackMissileRangeOptimal', src.getModifiedItemAttr('maxRangeBonus'),
-                                       stackingPenalties=True)
+                                       stackingPenalties=True, **kwargs)
         fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Drones'), 'falloff',
-                                     src.getModifiedItemAttr('falloffBonus'), stackingPenalties=True)
+                                     src.getModifiedItemAttr('falloffBonus'), stackingPenalties=True, **kwargs)
         fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'),
                                        'fighterAbilityAttackMissileExplosionVelocity',
-                                       src.getModifiedItemAttr('aoeVelocityBonus'), stackingPenalties=True)
+                                       src.getModifiedItemAttr('aoeVelocityBonus'), stackingPenalties=True, **kwargs)
         fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'),
                                        'fighterAbilityAttackMissileRangeFalloff', src.getModifiedItemAttr('falloffBonus'),
-                                       stackingPenalties=True)
+                                       stackingPenalties=True, **kwargs)
         fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Drones'), 'maxRange',
-                                     src.getModifiedItemAttr('maxRangeBonus'), stackingPenalties=True)
+                                     src.getModifiedItemAttr('maxRangeBonus'), stackingPenalties=True, **kwargs)
         fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'),
                                        'fighterAbilityAttackTurretRangeOptimal', src.getModifiedItemAttr('maxRangeBonus'),
-                                       stackingPenalties=True)
+                                       stackingPenalties=True, **kwargs)
 
 
 class Effect6558(BaseEffect):
@@ -28438,13 +28319,13 @@ class Effect6558(BaseEffect):
     type = 'overheat'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         overloadBonus = module.getModifiedItemAttr('overloadTrackingModuleStrengthBonus')
-        module.boostItemAttr('maxRangeBonus', overloadBonus)
-        module.boostItemAttr('falloffBonus', overloadBonus)
-        module.boostItemAttr('trackingSpeedBonus', overloadBonus)
-        module.boostItemAttr('aoeCloudSizeBonus', overloadBonus)
-        module.boostItemAttr('aoeVelocityBonus', overloadBonus)
+        module.boostItemAttr('maxRangeBonus', overloadBonus, **kwargs)
+        module.boostItemAttr('falloffBonus', overloadBonus, **kwargs)
+        module.boostItemAttr('trackingSpeedBonus', overloadBonus, **kwargs)
+        module.boostItemAttr('aoeCloudSizeBonus', overloadBonus, **kwargs)
+        module.boostItemAttr('aoeVelocityBonus', overloadBonus, **kwargs)
 
 
 class Effect6559(BaseEffect):
@@ -28458,42 +28339,42 @@ class Effect6559(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'),
                                        'fighterAbilityAttackMissileExplosionRadius',
-                                       src.getModifiedItemAttr('aoeCloudSizeBonus'), stackingPenalties=True)
+                                       src.getModifiedItemAttr('aoeCloudSizeBonus'), stackingPenalties=True, **kwargs)
         fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'),
                                        'fighterAbilityAttackMissileRangeOptimal', src.getModifiedItemAttr('maxRangeBonus'),
-                                       stackingPenalties=True)
+                                       stackingPenalties=True, **kwargs)
         fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'),
                                        'fighterAbilityAttackTurretRangeFalloff', src.getModifiedItemAttr('falloffBonus'),
-                                       stackingPenalties=True)
+                                       stackingPenalties=True, **kwargs)
         fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'),
                                        'fighterAbilityMissilesExplosionRadius',
-                                       src.getModifiedItemAttr('aoeCloudSizeBonus'), stackingPenalties=True)
+                                       src.getModifiedItemAttr('aoeCloudSizeBonus'), stackingPenalties=True, **kwargs)
         fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Drones'), 'falloff',
-                                     src.getModifiedItemAttr('falloffBonus'), stackingPenalties=True)
+                                     src.getModifiedItemAttr('falloffBonus'), stackingPenalties=True, **kwargs)
         fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'),
                                        'fighterAbilityAttackMissileRangeFalloff', src.getModifiedItemAttr('falloffBonus'),
-                                       stackingPenalties=True)
+                                       stackingPenalties=True, **kwargs)
         fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'),
                                        'fighterAbilityAttackTurretTrackingSpeed',
-                                       src.getModifiedItemAttr('trackingSpeedBonus'), stackingPenalties=True)
+                                       src.getModifiedItemAttr('trackingSpeedBonus'), stackingPenalties=True, **kwargs)
         fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Drones'), 'maxRange',
-                                     src.getModifiedItemAttr('maxRangeBonus'), stackingPenalties=True)
+                                     src.getModifiedItemAttr('maxRangeBonus'), stackingPenalties=True, **kwargs)
         fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Drones'), 'trackingSpeed',
-                                     src.getModifiedItemAttr('trackingSpeedBonus'), stackingPenalties=True)
+                                     src.getModifiedItemAttr('trackingSpeedBonus'), stackingPenalties=True, **kwargs)
         fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'),
                                        'fighterAbilityAttackTurretRangeOptimal', src.getModifiedItemAttr('maxRangeBonus'),
-                                       stackingPenalties=True)
+                                       stackingPenalties=True, **kwargs)
         fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'),
                                        'fighterAbilityMissilesExplosionVelocity',
-                                       src.getModifiedItemAttr('aoeVelocityBonus'), stackingPenalties=True)
+                                       src.getModifiedItemAttr('aoeVelocityBonus'), stackingPenalties=True, **kwargs)
         fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'),
                                        'fighterAbilityAttackMissileExplosionVelocity',
-                                       src.getModifiedItemAttr('aoeVelocityBonus'), stackingPenalties=True)
+                                       src.getModifiedItemAttr('aoeVelocityBonus'), stackingPenalties=True, **kwargs)
         fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'), 'fighterAbilityMissilesRange',
-                                       src.getModifiedItemAttr('maxRangeBonus'), stackingPenalties=True)
+                                       src.getModifiedItemAttr('maxRangeBonus'), stackingPenalties=True, **kwargs)
 
 
 class Effect6560(BaseEffect):
@@ -28507,17 +28388,17 @@ class Effect6560(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         lvl = src.level
         fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'),
                                        'fighterAbilityAttackMissileDamageMultiplier',
-                                       src.getModifiedItemAttr('damageMultiplierBonus') * lvl)
+                                       src.getModifiedItemAttr('damageMultiplierBonus') * lvl, **kwargs)
         fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'),
                                        'fighterAbilityAttackTurretDamageMultiplier',
-                                       src.getModifiedItemAttr('damageMultiplierBonus') * lvl)
+                                       src.getModifiedItemAttr('damageMultiplierBonus') * lvl, **kwargs)
         fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'),
                                        'fighterAbilityMissilesDamageMultiplier',
-                                       src.getModifiedItemAttr('damageMultiplierBonus') * lvl)
+                                       src.getModifiedItemAttr('damageMultiplierBonus') * lvl, **kwargs)
 
 
 class Effect6561(BaseEffect):
@@ -28531,10 +28412,10 @@ class Effect6561(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         lvl = src.level
         fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Light Fighters'), 'maxVelocity',
-                                       src.getModifiedItemAttr('maxVelocityBonus') * lvl)
+                                       src.getModifiedItemAttr('maxVelocityBonus') * lvl, **kwargs)
 
 
 class Effect6562(BaseEffect):
@@ -28548,10 +28429,10 @@ class Effect6562(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         lvl = src.level
         fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Support Fighters'), 'shieldCapacity',
-                                       src.getModifiedItemAttr('shieldBonus') * lvl)
+                                       src.getModifiedItemAttr('shieldBonus') * lvl, **kwargs)
 
 
 class Effect6563(BaseEffect):
@@ -28565,17 +28446,17 @@ class Effect6563(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         lvl = src.level
         fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Heavy Fighters'),
                                        'fighterAbilityMissilesDamageMultiplier',
-                                       src.getModifiedItemAttr('damageMultiplierBonus') * lvl)
+                                       src.getModifiedItemAttr('damageMultiplierBonus') * lvl, **kwargs)
         fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Heavy Fighters'),
                                        'fighterAbilityAttackMissileDamageMultiplier',
-                                       src.getModifiedItemAttr('damageMultiplierBonus') * lvl)
+                                       src.getModifiedItemAttr('damageMultiplierBonus') * lvl, **kwargs)
         fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Heavy Fighters'),
                                        'fighterAbilityAttackTurretDamageMultiplier',
-                                       src.getModifiedItemAttr('damageMultiplierBonus') * lvl)
+                                       src.getModifiedItemAttr('damageMultiplierBonus') * lvl, **kwargs)
 
 
 class Effect6565(BaseEffect):
@@ -28590,7 +28471,7 @@ class Effect6565(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
 
         for attr in [
             'structureRigDoomsdayDamageLossTargetBonus',
@@ -28605,7 +28486,7 @@ class Effect6565(BaseEffect):
             'structureRigMissileExplosionRadiusBonus'
         ]:
             fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Jury Rigging'),
-                                      attr, src.getModifiedItemAttr('structureRoleBonus'))
+                                      attr, src.getModifiedItemAttr('structureRoleBonus'), **kwargs)
 
 
 class Effect6566(BaseEffect):
@@ -28619,20 +28500,20 @@ class Effect6566(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.fighters.filteredItemMultiply(lambda mod: mod.item.requiresSkill('Fighters'), 'shieldCapacity',
-                                       src.getModifiedItemAttr('fighterBonusShieldCapacityPercent'))
+                                       src.getModifiedItemAttr('fighterBonusShieldCapacityPercent'), **kwargs)
         fit.fighters.filteredItemMultiply(lambda mod: mod.item.requiresSkill('Fighters'), 'maxVelocity',
-                                       src.getModifiedItemAttr('fighterBonusVelocityPercent'), stackingPenalties=True, penaltyGroup='postMul')
+                                       src.getModifiedItemAttr('fighterBonusVelocityPercent'), stackingPenalties=True, penaltyGroup='postMul', **kwargs)
         fit.fighters.filteredItemMultiply(lambda mod: mod.item.requiresSkill('Fighters'),
                                        'fighterAbilityAttackMissileDuration',
-                                       src.getModifiedItemAttr('fighterBonusROFPercent'), stackingPenalties=True, penaltyGroup='postMul')
+                                       src.getModifiedItemAttr('fighterBonusROFPercent'), stackingPenalties=True, penaltyGroup='postMul', **kwargs)
         fit.fighters.filteredItemMultiply(lambda mod: mod.item.requiresSkill('Fighters'), 'fighterAbilityAttackTurretDuration',
-                                       src.getModifiedItemAttr('fighterBonusROFPercent'), stackingPenalties=True, penaltyGroup='postMul')
+                                       src.getModifiedItemAttr('fighterBonusROFPercent'), stackingPenalties=True, penaltyGroup='postMul', **kwargs)
         fit.fighters.filteredItemMultiply(lambda mod: mod.item.requiresSkill('Fighters'), 'fighterAbilityMissilesDuration',
-                                       src.getModifiedItemAttr('fighterBonusROFPercent'), stackingPenalties=True, penaltyGroup='postMul')
+                                       src.getModifiedItemAttr('fighterBonusROFPercent'), stackingPenalties=True, penaltyGroup='postMul', **kwargs)
         fit.fighters.filteredItemMultiply(lambda mod: mod.item.requiresSkill('Fighters'), 'shieldRechargeRate',
-                                       src.getModifiedItemAttr('fighterBonusShieldRechargePercent'))
+                                       src.getModifiedItemAttr('fighterBonusShieldRechargePercent'), **kwargs)
 
 
 class Effect6567(BaseEffect):
@@ -28646,15 +28527,15 @@ class Effect6567(BaseEffect):
     type = 'active'
 
     @staticmethod
-    def handler(fit, src, context):
-        fit.ship.boostItemAttr('scanResolution', src.getModifiedItemAttr('scanResolutionBonus'), stackingPenalties=True)
+    def handler(fit, src, context, **kwargs):
+        fit.ship.boostItemAttr('scanResolution', src.getModifiedItemAttr('scanResolutionBonus'), stackingPenalties=True, **kwargs)
 
         for scanType in ('Magnetometric', 'Ladar', 'Gravimetric', 'Radar'):
             attr = 'scan{}Strength'.format(scanType)
             bonus = src.getModifiedItemAttr('scan{}StrengthPercent'.format(scanType))
-            fit.ship.boostItemAttr(attr, bonus, stackingPenalties=True)
+            fit.ship.boostItemAttr(attr, bonus, stackingPenalties=True, **kwargs)
             fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'), attr, bonus,
-                                           stackingPenalties=True)
+                                           stackingPenalties=True, **kwargs)
 
         # EW cap need increase
         groups = [
@@ -28667,7 +28548,7 @@ class Effect6567(BaseEffect):
 
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in groups or
                                                   mod.item.requiresSkill('Propulsion Jamming'),
-                                      'capacitorNeed', src.getModifiedItemAttr('ewCapacitorNeedBonus'))
+                                      'capacitorNeed', src.getModifiedItemAttr('ewCapacitorNeedBonus'), **kwargs)
 
 
 class Effect6570(BaseEffect):
@@ -28681,9 +28562,9 @@ class Effect6570(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         lvl = src.level
-        fit.ship.boostItemAttr('fighterCapacity', src.getModifiedItemAttr('skillBonusFighterHangarSize') * lvl)
+        fit.ship.boostItemAttr('fighterCapacity', src.getModifiedItemAttr('skillBonusFighterHangarSize') * lvl, **kwargs)
 
 
 class Effect6571(BaseEffect):
@@ -28697,10 +28578,10 @@ class Effect6571(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         lvl = src.level
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Capital Autocannon Specialization'),
-                                      'damageMultiplier', src.getModifiedItemAttr('damageMultiplierBonus') * lvl)
+                                      'damageMultiplier', src.getModifiedItemAttr('damageMultiplierBonus') * lvl, **kwargs)
 
 
 class Effect6572(BaseEffect):
@@ -28714,10 +28595,10 @@ class Effect6572(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         lvl = src.level
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Capital Artillery Specialization'),
-                                      'damageMultiplier', src.getModifiedItemAttr('damageMultiplierBonus') * lvl)
+                                      'damageMultiplier', src.getModifiedItemAttr('damageMultiplierBonus') * lvl, **kwargs)
 
 
 class Effect6573(BaseEffect):
@@ -28731,10 +28612,10 @@ class Effect6573(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         lvl = src.level
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Capital Blaster Specialization'),
-                                      'damageMultiplier', src.getModifiedItemAttr('damageMultiplierBonus') * lvl)
+                                      'damageMultiplier', src.getModifiedItemAttr('damageMultiplierBonus') * lvl, **kwargs)
 
 
 class Effect6574(BaseEffect):
@@ -28748,10 +28629,10 @@ class Effect6574(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         lvl = src.level
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Capital Railgun Specialization'),
-                                      'damageMultiplier', src.getModifiedItemAttr('damageMultiplierBonus') * lvl)
+                                      'damageMultiplier', src.getModifiedItemAttr('damageMultiplierBonus') * lvl, **kwargs)
 
 
 class Effect6575(BaseEffect):
@@ -28765,10 +28646,10 @@ class Effect6575(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         lvl = src.level
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Capital Pulse Laser Specialization'),
-                                      'damageMultiplier', src.getModifiedItemAttr('damageMultiplierBonus') * lvl)
+                                      'damageMultiplier', src.getModifiedItemAttr('damageMultiplierBonus') * lvl, **kwargs)
 
 
 class Effect6576(BaseEffect):
@@ -28782,10 +28663,10 @@ class Effect6576(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         lvl = src.level
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Capital Beam Laser Specialization'),
-                                      'damageMultiplier', src.getModifiedItemAttr('damageMultiplierBonus') * lvl)
+                                      'damageMultiplier', src.getModifiedItemAttr('damageMultiplierBonus') * lvl, **kwargs)
 
 
 class Effect6577(BaseEffect):
@@ -28799,10 +28680,10 @@ class Effect6577(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         lvl = src.level
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('XL Cruise Missile Specialization'), 'speed',
-                                      src.getModifiedItemAttr('rofBonus') * lvl)
+                                      src.getModifiedItemAttr('rofBonus') * lvl, **kwargs)
 
 
 class Effect6578(BaseEffect):
@@ -28816,10 +28697,10 @@ class Effect6578(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         lvl = src.level
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('XL Torpedo Specialization'), 'speed',
-                                      src.getModifiedItemAttr('rofBonus') * lvl)
+                                      src.getModifiedItemAttr('rofBonus') * lvl, **kwargs)
 
 
 class Effect6580(BaseEffect):
@@ -28833,13 +28714,13 @@ class Effect6580(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Repair Drone Operation'), 'structureDamageAmount',
-                                     src.getModifiedItemAttr('shipBonusRole2'))
+                                     src.getModifiedItemAttr('shipBonusRole2'), **kwargs)
         fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Repair Drone Operation'), 'armorDamageAmount',
-                                     src.getModifiedItemAttr('shipBonusRole2'))
+                                     src.getModifiedItemAttr('shipBonusRole2'), **kwargs)
         fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Repair Drone Operation'), 'shieldBonus',
-                                     src.getModifiedItemAttr('shipBonusRole2'))
+                                     src.getModifiedItemAttr('shipBonusRole2'), **kwargs)
 
 
 class Effect6581(BaseEffect):
@@ -28854,7 +28735,7 @@ class Effect6581(BaseEffect):
     type = 'active'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         # Remote effect bonuses (duration / amount / range / falloff)
         for skill, amtAttr, stack in (
                 ('Capital Remote Armor Repair Systems', 'armorDamageAmount', True),
@@ -28862,37 +28743,37 @@ class Effect6581(BaseEffect):
                 ('Capital Capacitor Emission Systems', 'powerTransferAmount', False),
                 ('Capital Remote Hull Repair Systems', 'structureDamageAmount', False)):
             fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill(skill), 'duration',
-                                          src.getModifiedItemAttr('siegeRemoteLogisticsDurationBonus'))
+                                          src.getModifiedItemAttr('siegeRemoteLogisticsDurationBonus'), **kwargs)
             fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill(skill), amtAttr,
                                           src.getModifiedItemAttr('siegeRemoteLogisticsAmountBonus'),
-                                          stackingPenalties=stack)
+                                          stackingPenalties=stack, **kwargs)
             fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill(skill), 'maxRange',
-                                          src.getModifiedItemAttr('siegeRemoteLogisticsRangeBonus'), stackingPenalties=True)
+                                          src.getModifiedItemAttr('siegeRemoteLogisticsRangeBonus'), stackingPenalties=True, **kwargs)
             fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill(skill), 'falloffEffectiveness',
-                                          src.getModifiedItemAttr('siegeRemoteLogisticsRangeBonus'), stackingPenalties=True)
+                                          src.getModifiedItemAttr('siegeRemoteLogisticsRangeBonus'), stackingPenalties=True, **kwargs)
 
         # Local armor/shield rep effects (duration / amount)
         for skill, amtAttr in (
                 ('Capital Shield Operation', 'shieldBonus'),
                 ('Capital Repair Systems', 'armorDamageAmount')):
             fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill(skill), 'duration',
-                                          src.getModifiedItemAttr('siegeLocalLogisticsDurationBonus'))
+                                          src.getModifiedItemAttr('siegeLocalLogisticsDurationBonus'), **kwargs)
             fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill(skill), amtAttr,
                                           src.getModifiedItemAttr('siegeLocalLogisticsAmountBonus'),
-                                          stackingPenalties=True)
+                                          stackingPenalties=True, **kwargs)
 
         # Speed bonus
-        fit.ship.boostItemAttr('maxVelocity', src.getModifiedItemAttr('speedFactor'), stackingPenalties=True)
+        fit.ship.boostItemAttr('maxVelocity', src.getModifiedItemAttr('speedFactor'), stackingPenalties=True, **kwargs)
 
         # Scan resolution multiplier
         fit.ship.multiplyItemAttr('scanResolution', src.getModifiedItemAttr('scanResolutionMultiplier'),
-                                  stackingPenalties=True)
+                                  stackingPenalties=True, **kwargs)
 
         # Mass multiplier
-        fit.ship.multiplyItemAttr('mass', src.getModifiedItemAttr('siegeMassMultiplier'), stackingPenalties=True)
+        fit.ship.multiplyItemAttr('mass', src.getModifiedItemAttr('siegeMassMultiplier'), stackingPenalties=True, **kwargs)
 
         # Max locked targets
-        fit.ship.increaseItemAttr('maxLockedTargets', src.getModifiedItemAttr('maxLockedTargetsBonus'))
+        fit.ship.increaseItemAttr('maxLockedTargets', src.getModifiedItemAttr('maxLockedTargetsBonus'), **kwargs)
 
         # EW cap need increase
         groups = [
@@ -28905,24 +28786,24 @@ class Effect6581(BaseEffect):
 
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in groups or
                                                   mod.item.requiresSkill('Propulsion Jamming'),
-                                      'capacitorNeed', src.getModifiedItemAttr('ewCapacitorNeedBonus'))
+                                      'capacitorNeed', src.getModifiedItemAttr('ewCapacitorNeedBonus'), **kwargs)
 
         # todo: test for April 2016 release
         # Block EWAR & projected effects
-        fit.ship.forceItemAttr('disallowOffensiveModifiers', src.getModifiedItemAttr('disallowOffensiveModifiers'))
-        fit.ship.forceItemAttr('disallowAssistance', src.getModifiedItemAttr('disallowAssistance'))
+        fit.ship.forceItemAttr('disallowOffensiveModifiers', src.getModifiedItemAttr('disallowOffensiveModifiers'), **kwargs)
+        fit.ship.forceItemAttr('disallowAssistance', src.getModifiedItemAttr('disallowAssistance'), **kwargs)
 
         # new in April 2016 release
         fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Drones'), 'damageMultiplier',
-                                     src.getModifiedItemAttr('droneDamageBonus'), stackingPenalties=True)
+                                     src.getModifiedItemAttr('droneDamageBonus'), stackingPenalties=True, **kwargs)
 
-        fit.ship.increaseItemAttr('warpScrambleStatus', src.getModifiedItemAttr('siegeModeWarpStatus'))
-        fit.ship.boostItemAttr('sensorDampenerResistance', src.getModifiedItemAttr('sensorDampenerResistanceBonus'))
-        fit.ship.boostItemAttr('remoteAssistanceImpedance', src.getModifiedItemAttr('remoteAssistanceImpedanceBonus'))
-        fit.ship.boostItemAttr('remoteRepairImpedance', src.getModifiedItemAttr('remoteRepairImpedanceBonus'))
+        fit.ship.increaseItemAttr('warpScrambleStatus', src.getModifiedItemAttr('siegeModeWarpStatus'), **kwargs)
+        fit.ship.boostItemAttr('sensorDampenerResistance', src.getModifiedItemAttr('sensorDampenerResistanceBonus'), **kwargs)
+        fit.ship.boostItemAttr('remoteAssistanceImpedance', src.getModifiedItemAttr('remoteAssistanceImpedanceBonus'), **kwargs)
+        fit.ship.boostItemAttr('remoteRepairImpedance', src.getModifiedItemAttr('remoteRepairImpedanceBonus'), **kwargs)
 
-        fit.ship.forceItemAttr('disallowTethering', src.getModifiedItemAttr('disallowTethering'))
-        fit.ship.forceItemAttr('disallowDocking', src.getModifiedItemAttr('disallowDocking'))
+        fit.ship.forceItemAttr('disallowTethering', src.getModifiedItemAttr('disallowTethering'), **kwargs)
+        fit.ship.forceItemAttr('disallowDocking', src.getModifiedItemAttr('disallowDocking'), **kwargs)
 
 
 class Effect6582(BaseEffect):
@@ -28937,61 +28818,61 @@ class Effect6582(BaseEffect):
     type = 'active'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         # Turrets
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Capital Energy Turret') or
                                                   mod.item.requiresSkill('Capital Hybrid Turret') or
                                                   mod.item.requiresSkill('Capital Projectile Turret'),
-                                      'damageMultiplier', src.getModifiedItemAttr('siegeTurretDamageBonus'))
+                                      'damageMultiplier', src.getModifiedItemAttr('siegeTurretDamageBonus'), **kwargs)
 
         fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill('Motion Prediction'),
                                          'damageMultiplier', src.getModifiedItemAttr('siegeHAWTurretDamageBonus'),
-                                         stackingPenalties=True)
+                                         stackingPenalties=True, **kwargs)
 
         # Missiles
         for type in ('kinetic', 'thermal', 'explosive', 'em'):
             fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('XL Torpedoes') or
                                                         mod.charge.requiresSkill('XL Cruise Missiles') or
                                                         mod.charge.requiresSkill('Torpedoes'),
-                                            '%sDamage' % type, src.getModifiedItemAttr('siegeMissileDamageBonus'))
+                                            '%sDamage' % type, src.getModifiedItemAttr('siegeMissileDamageBonus'), **kwargs)
 
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('XL Torpedoes') or
                                                   mod.item.requiresSkill('XL Cruise Missiles'),
-                                      'speed', src.getModifiedItemAttr('siegeLauncherROFBonus'))
+                                      'speed', src.getModifiedItemAttr('siegeLauncherROFBonus'), **kwargs)
 
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Target Navigation Prediction'),
-                                      'speed', src.getModifiedItemAttr('siegeHAWMissileROFBonus'))
+                                      'speed', src.getModifiedItemAttr('siegeHAWMissileROFBonus'), **kwargs)
 
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Torpedoes'),
                                         'maxVelocity', src.getModifiedItemAttr('siegeTorpedoVelocityBonus'),
-                                        stackingPenalties=True)
+                                        stackingPenalties=True, **kwargs)
 
         # Tank
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Capital Shield Operation') or
                                                   mod.item.requiresSkill('Capital Repair Systems'),
-                                      'duration', src.getModifiedItemAttr('siegeLocalLogisticsDurationBonus'))
+                                      'duration', src.getModifiedItemAttr('siegeLocalLogisticsDurationBonus'), **kwargs)
 
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Capital Shield Operation'),
                                       'shieldBonus', src.getModifiedItemAttr('siegeLocalLogisticsAmountBonus'),
-                                      stackingPenalties=True)
+                                      stackingPenalties=True, **kwargs)
 
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Capital Repair Systems'),
                                       'armorDamageAmount', src.getModifiedItemAttr('siegeLocalLogisticsAmountBonus'),
-                                      stackingPenalties=True)
+                                      stackingPenalties=True, **kwargs)
 
         # Mobility & safety penalties
-        fit.ship.boostItemAttr('maxVelocity', src.getModifiedItemAttr('speedFactor'))
+        fit.ship.boostItemAttr('maxVelocity', src.getModifiedItemAttr('speedFactor'), **kwargs)
         fit.ship.multiplyItemAttr('mass', src.getModifiedItemAttr('siegeMassMultiplier'),
-                                  stackingPenalties=True, penaltyGroup='postMul')
-        fit.ship.increaseItemAttr('warpScrambleStatus', src.getModifiedItemAttr('siegeModeWarpStatus'))
-        fit.ship.forceItemAttr('disallowDocking', src.getModifiedItemAttr('disallowDocking'))
-        fit.ship.forceItemAttr('disallowTethering', src.getModifiedItemAttr('disallowTethering'))
+                                  stackingPenalties=True, penaltyGroup='postMul', **kwargs)
+        fit.ship.increaseItemAttr('warpScrambleStatus', src.getModifiedItemAttr('siegeModeWarpStatus'), **kwargs)
+        fit.ship.forceItemAttr('disallowDocking', src.getModifiedItemAttr('disallowDocking'), **kwargs)
+        fit.ship.forceItemAttr('disallowTethering', src.getModifiedItemAttr('disallowTethering'), **kwargs)
 
         # Ewar and assistance resistances
-        fit.ship.boostItemAttr('remoteRepairImpedance', src.getModifiedItemAttr('remoteRepairImpedanceBonus'))
-        fit.ship.boostItemAttr('sensorDampenerResistance', src.getModifiedItemAttr('sensorDampenerResistanceBonus'))
-        fit.ship.boostItemAttr('remoteAssistanceImpedance', src.getModifiedItemAttr('remoteAssistanceImpedanceBonus'))
-        fit.ship.boostItemAttr('weaponDisruptionResistance', src.getModifiedItemAttr('weaponDisruptionResistanceBonus'))
+        fit.ship.boostItemAttr('remoteRepairImpedance', src.getModifiedItemAttr('remoteRepairImpedanceBonus'), **kwargs)
+        fit.ship.boostItemAttr('sensorDampenerResistance', src.getModifiedItemAttr('sensorDampenerResistanceBonus'), **kwargs)
+        fit.ship.boostItemAttr('remoteAssistanceImpedance', src.getModifiedItemAttr('remoteAssistanceImpedanceBonus'), **kwargs)
+        fit.ship.boostItemAttr('weaponDisruptionResistance', src.getModifiedItemAttr('weaponDisruptionResistanceBonus'), **kwargs)
 
 
 class Effect6591(BaseEffect):
@@ -29006,9 +28887,9 @@ class Effect6591(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.ship.increaseItemAttr('warpScrambleStatus', src.getModifiedItemAttr('shipBonusSupercarrierA3'),
-                                  skill='Amarr Carrier')
+                                  skill='Amarr Carrier', **kwargs)
 
 
 class Effect6592(BaseEffect):
@@ -29023,9 +28904,9 @@ class Effect6592(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.ship.increaseItemAttr('warpScrambleStatus', src.getModifiedItemAttr('shipBonusSupercarrierC3'),
-                                  skill='Caldari Carrier')
+                                  skill='Caldari Carrier', **kwargs)
 
 
 class Effect6593(BaseEffect):
@@ -29039,9 +28920,9 @@ class Effect6593(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.ship.increaseItemAttr('warpScrambleStatus', src.getModifiedItemAttr('shipBonusSupercarrierG3'),
-                                  skill='Gallente Carrier')
+                                  skill='Gallente Carrier', **kwargs)
 
 
 class Effect6594(BaseEffect):
@@ -29056,9 +28937,9 @@ class Effect6594(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.ship.increaseItemAttr('warpScrambleStatus', src.getModifiedItemAttr('shipBonusSupercarrierM3'),
-                                  skill='Minmatar Carrier')
+                                  skill='Minmatar Carrier', **kwargs)
 
 
 class Effect6595(BaseEffect):
@@ -29072,22 +28953,22 @@ class Effect6595(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(
             lambda mod: mod.item.requiresSkill('Armored Command') or mod.item.requiresSkill('Information Command'),
-            'buffDuration', src.getModifiedItemAttr('shipBonusCarrierA4'), skill='Amarr Carrier')
+            'buffDuration', src.getModifiedItemAttr('shipBonusCarrierA4'), skill='Amarr Carrier', **kwargs)
         fit.modules.filteredItemBoost(
             lambda mod: mod.item.requiresSkill('Armored Command') or mod.item.requiresSkill('Information Command'),
-            'warfareBuff3Value', src.getModifiedItemAttr('shipBonusCarrierA4'), skill='Amarr Carrier')
+            'warfareBuff3Value', src.getModifiedItemAttr('shipBonusCarrierA4'), skill='Amarr Carrier', **kwargs)
         fit.modules.filteredItemBoost(
             lambda mod: mod.item.requiresSkill('Armored Command') or mod.item.requiresSkill('Information Command'),
-            'warfareBuff1Value', src.getModifiedItemAttr('shipBonusCarrierA4'), skill='Amarr Carrier')
+            'warfareBuff1Value', src.getModifiedItemAttr('shipBonusCarrierA4'), skill='Amarr Carrier', **kwargs)
         fit.modules.filteredItemBoost(
             lambda mod: mod.item.requiresSkill('Armored Command') or mod.item.requiresSkill('Information Command'),
-            'warfareBuff4Value', src.getModifiedItemAttr('shipBonusCarrierA4'), skill='Amarr Carrier')
+            'warfareBuff4Value', src.getModifiedItemAttr('shipBonusCarrierA4'), skill='Amarr Carrier', **kwargs)
         fit.modules.filteredItemBoost(
             lambda mod: mod.item.requiresSkill('Armored Command') or mod.item.requiresSkill('Information Command'),
-            'warfareBuff2Value', src.getModifiedItemAttr('shipBonusCarrierA4'), skill='Amarr Carrier')
+            'warfareBuff2Value', src.getModifiedItemAttr('shipBonusCarrierA4'), skill='Amarr Carrier', **kwargs)
 
 
 class Effect6596(BaseEffect):
@@ -29101,22 +28982,22 @@ class Effect6596(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(
             lambda mod: mod.item.requiresSkill('Shield Command') or mod.item.requiresSkill('Information Command'),
-            'warfareBuff2Value', src.getModifiedItemAttr('shipBonusCarrierC4'), skill='Caldari Carrier')
+            'warfareBuff2Value', src.getModifiedItemAttr('shipBonusCarrierC4'), skill='Caldari Carrier', **kwargs)
         fit.modules.filteredItemBoost(
             lambda mod: mod.item.requiresSkill('Shield Command') or mod.item.requiresSkill('Information Command'),
-            'buffDuration', src.getModifiedItemAttr('shipBonusCarrierC4'), skill='Caldari Carrier')
+            'buffDuration', src.getModifiedItemAttr('shipBonusCarrierC4'), skill='Caldari Carrier', **kwargs)
         fit.modules.filteredItemBoost(
             lambda mod: mod.item.requiresSkill('Shield Command') or mod.item.requiresSkill('Information Command'),
-            'warfareBuff3Value', src.getModifiedItemAttr('shipBonusCarrierC4'), skill='Caldari Carrier')
+            'warfareBuff3Value', src.getModifiedItemAttr('shipBonusCarrierC4'), skill='Caldari Carrier', **kwargs)
         fit.modules.filteredItemBoost(
             lambda mod: mod.item.requiresSkill('Shield Command') or mod.item.requiresSkill('Information Command'),
-            'warfareBuff4Value', src.getModifiedItemAttr('shipBonusCarrierC4'), skill='Caldari Carrier')
+            'warfareBuff4Value', src.getModifiedItemAttr('shipBonusCarrierC4'), skill='Caldari Carrier', **kwargs)
         fit.modules.filteredItemBoost(
             lambda mod: mod.item.requiresSkill('Shield Command') or mod.item.requiresSkill('Information Command'),
-            'warfareBuff1Value', src.getModifiedItemAttr('shipBonusCarrierC4'), skill='Caldari Carrier')
+            'warfareBuff1Value', src.getModifiedItemAttr('shipBonusCarrierC4'), skill='Caldari Carrier', **kwargs)
 
 
 class Effect6597(BaseEffect):
@@ -29130,22 +29011,22 @@ class Effect6597(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(
             lambda mod: mod.item.requiresSkill('Skirmish Command') or mod.item.requiresSkill('Armored Command'),
-            'warfareBuff2Value', src.getModifiedItemAttr('shipBonusCarrierG4'), skill='Gallente Carrier')
+            'warfareBuff2Value', src.getModifiedItemAttr('shipBonusCarrierG4'), skill='Gallente Carrier', **kwargs)
         fit.modules.filteredItemBoost(
             lambda mod: mod.item.requiresSkill('Skirmish Command') or mod.item.requiresSkill('Armored Command'),
-            'warfareBuff3Value', src.getModifiedItemAttr('shipBonusCarrierG4'), skill='Gallente Carrier')
+            'warfareBuff3Value', src.getModifiedItemAttr('shipBonusCarrierG4'), skill='Gallente Carrier', **kwargs)
         fit.modules.filteredItemBoost(
             lambda mod: mod.item.requiresSkill('Skirmish Command') or mod.item.requiresSkill('Armored Command'),
-            'warfareBuff4Value', src.getModifiedItemAttr('shipBonusCarrierG4'), skill='Gallente Carrier')
+            'warfareBuff4Value', src.getModifiedItemAttr('shipBonusCarrierG4'), skill='Gallente Carrier', **kwargs)
         fit.modules.filteredItemBoost(
             lambda mod: mod.item.requiresSkill('Skirmish Command') or mod.item.requiresSkill('Armored Command'),
-            'buffDuration', src.getModifiedItemAttr('shipBonusCarrierG4'), skill='Gallente Carrier')
+            'buffDuration', src.getModifiedItemAttr('shipBonusCarrierG4'), skill='Gallente Carrier', **kwargs)
         fit.modules.filteredItemBoost(
             lambda mod: mod.item.requiresSkill('Skirmish Command') or mod.item.requiresSkill('Armored Command'),
-            'warfareBuff1Value', src.getModifiedItemAttr('shipBonusCarrierG4'), skill='Gallente Carrier')
+            'warfareBuff1Value', src.getModifiedItemAttr('shipBonusCarrierG4'), skill='Gallente Carrier', **kwargs)
 
 
 class Effect6598(BaseEffect):
@@ -29159,22 +29040,22 @@ class Effect6598(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(
             lambda mod: mod.item.requiresSkill('Skirmish Command') or mod.item.requiresSkill('Shield Command'),
-            'warfareBuff4Value', src.getModifiedItemAttr('shipBonusCarrierM4'), skill='Minmatar Carrier')
+            'warfareBuff4Value', src.getModifiedItemAttr('shipBonusCarrierM4'), skill='Minmatar Carrier', **kwargs)
         fit.modules.filteredItemBoost(
             lambda mod: mod.item.requiresSkill('Skirmish Command') or mod.item.requiresSkill('Shield Command'),
-            'warfareBuff2Value', src.getModifiedItemAttr('shipBonusCarrierM4'), skill='Minmatar Carrier')
+            'warfareBuff2Value', src.getModifiedItemAttr('shipBonusCarrierM4'), skill='Minmatar Carrier', **kwargs)
         fit.modules.filteredItemBoost(
             lambda mod: mod.item.requiresSkill('Skirmish Command') or mod.item.requiresSkill('Shield Command'),
-            'warfareBuff3Value', src.getModifiedItemAttr('shipBonusCarrierM4'), skill='Minmatar Carrier')
+            'warfareBuff3Value', src.getModifiedItemAttr('shipBonusCarrierM4'), skill='Minmatar Carrier', **kwargs)
         fit.modules.filteredItemBoost(
             lambda mod: mod.item.requiresSkill('Skirmish Command') or mod.item.requiresSkill('Shield Command'),
-            'warfareBuff1Value', src.getModifiedItemAttr('shipBonusCarrierM4'), skill='Minmatar Carrier')
+            'warfareBuff1Value', src.getModifiedItemAttr('shipBonusCarrierM4'), skill='Minmatar Carrier', **kwargs)
         fit.modules.filteredItemBoost(
             lambda mod: mod.item.requiresSkill('Skirmish Command') or mod.item.requiresSkill('Shield Command'),
-            'buffDuration', src.getModifiedItemAttr('shipBonusCarrierM4'), skill='Minmatar Carrier')
+            'buffDuration', src.getModifiedItemAttr('shipBonusCarrierM4'), skill='Minmatar Carrier', **kwargs)
 
 
 class Effect6599(BaseEffect):
@@ -29188,15 +29069,15 @@ class Effect6599(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.ship.boostItemAttr('armorKineticDamageResonance', src.getModifiedItemAttr('shipBonusCarrierA1'),
-                               skill='Amarr Carrier')
+                               skill='Amarr Carrier', **kwargs)
         fit.ship.boostItemAttr('armorEmDamageResonance', src.getModifiedItemAttr('shipBonusCarrierA1'),
-                               skill='Amarr Carrier')
+                               skill='Amarr Carrier', **kwargs)
         fit.ship.boostItemAttr('armorExplosiveDamageResonance', src.getModifiedItemAttr('shipBonusCarrierA1'),
-                               skill='Amarr Carrier')
+                               skill='Amarr Carrier', **kwargs)
         fit.ship.boostItemAttr('armorThermalDamageResonance', src.getModifiedItemAttr('shipBonusCarrierA1'),
-                               skill='Amarr Carrier')
+                               skill='Amarr Carrier', **kwargs)
 
 
 class Effect6600(BaseEffect):
@@ -29210,15 +29091,15 @@ class Effect6600(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.ship.boostItemAttr('shieldThermalDamageResonance', src.getModifiedItemAttr('shipBonusCarrierC1'),
-                               skill='Caldari Carrier')
+                               skill='Caldari Carrier', **kwargs)
         fit.ship.boostItemAttr('shieldEmDamageResonance', src.getModifiedItemAttr('shipBonusCarrierC1'),
-                               skill='Caldari Carrier')
+                               skill='Caldari Carrier', **kwargs)
         fit.ship.boostItemAttr('shieldKineticDamageResonance', src.getModifiedItemAttr('shipBonusCarrierC1'),
-                               skill='Caldari Carrier')
+                               skill='Caldari Carrier', **kwargs)
         fit.ship.boostItemAttr('shieldExplosiveDamageResonance', src.getModifiedItemAttr('shipBonusCarrierC1'),
-                               skill='Caldari Carrier')
+                               skill='Caldari Carrier', **kwargs)
 
 
 class Effect6601(BaseEffect):
@@ -29232,16 +29113,16 @@ class Effect6601(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'),
                                        'fighterAbilityMissilesDamageMultiplier',
-                                       src.getModifiedItemAttr('shipBonusCarrierG1'), skill='Gallente Carrier')
+                                       src.getModifiedItemAttr('shipBonusCarrierG1'), skill='Gallente Carrier', **kwargs)
         fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'),
                                        'fighterAbilityAttackTurretDamageMultiplier',
-                                       src.getModifiedItemAttr('shipBonusCarrierG1'), skill='Gallente Carrier')
+                                       src.getModifiedItemAttr('shipBonusCarrierG1'), skill='Gallente Carrier', **kwargs)
         fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'),
                                        'fighterAbilityAttackMissileDamageMultiplier',
-                                       src.getModifiedItemAttr('shipBonusCarrierG1'), skill='Gallente Carrier')
+                                       src.getModifiedItemAttr('shipBonusCarrierG1'), skill='Gallente Carrier', **kwargs)
 
 
 class Effect6602(BaseEffect):
@@ -29255,16 +29136,16 @@ class Effect6602(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'),
                                        'fighterAbilityAttackMissileDamageMultiplier',
-                                       src.getModifiedItemAttr('shipBonusCarrierM1'), skill='Minmatar Carrier')
+                                       src.getModifiedItemAttr('shipBonusCarrierM1'), skill='Minmatar Carrier', **kwargs)
         fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'),
                                        'fighterAbilityMissilesDamageMultiplier',
-                                       src.getModifiedItemAttr('shipBonusCarrierM1'), skill='Minmatar Carrier')
+                                       src.getModifiedItemAttr('shipBonusCarrierM1'), skill='Minmatar Carrier', **kwargs)
         fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'),
                                        'fighterAbilityAttackTurretDamageMultiplier',
-                                       src.getModifiedItemAttr('shipBonusCarrierM1'), skill='Minmatar Carrier')
+                                       src.getModifiedItemAttr('shipBonusCarrierM1'), skill='Minmatar Carrier', **kwargs)
 
 
 class Effect6603(BaseEffect):
@@ -29279,16 +29160,16 @@ class Effect6603(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'),
                                        'fighterAbilityMissilesDamageMultiplier',
-                                       src.getModifiedItemAttr('shipBonusSupercarrierA1'), skill='Amarr Carrier')
+                                       src.getModifiedItemAttr('shipBonusSupercarrierA1'), skill='Amarr Carrier', **kwargs)
         fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'),
                                        'fighterAbilityAttackMissileDamageMultiplier',
-                                       src.getModifiedItemAttr('shipBonusSupercarrierA1'), skill='Amarr Carrier')
+                                       src.getModifiedItemAttr('shipBonusSupercarrierA1'), skill='Amarr Carrier', **kwargs)
         fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'),
                                        'fighterAbilityAttackTurretDamageMultiplier',
-                                       src.getModifiedItemAttr('shipBonusSupercarrierA1'), skill='Amarr Carrier')
+                                       src.getModifiedItemAttr('shipBonusSupercarrierA1'), skill='Amarr Carrier', **kwargs)
 
 
 class Effect6604(BaseEffect):
@@ -29303,16 +29184,16 @@ class Effect6604(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'),
                                        'fighterAbilityMissilesDamageMultiplier',
-                                       src.getModifiedItemAttr('shipBonusSupercarrierC1'), skill='Caldari Carrier')
+                                       src.getModifiedItemAttr('shipBonusSupercarrierC1'), skill='Caldari Carrier', **kwargs)
         fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'),
                                        'fighterAbilityAttackTurretDamageMultiplier',
-                                       src.getModifiedItemAttr('shipBonusSupercarrierC1'), skill='Caldari Carrier')
+                                       src.getModifiedItemAttr('shipBonusSupercarrierC1'), skill='Caldari Carrier', **kwargs)
         fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'),
                                        'fighterAbilityAttackMissileDamageMultiplier',
-                                       src.getModifiedItemAttr('shipBonusSupercarrierC1'), skill='Caldari Carrier')
+                                       src.getModifiedItemAttr('shipBonusSupercarrierC1'), skill='Caldari Carrier', **kwargs)
 
 
 class Effect6605(BaseEffect):
@@ -29326,16 +29207,16 @@ class Effect6605(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'),
                                        'fighterAbilityAttackTurretDamageMultiplier',
-                                       src.getModifiedItemAttr('shipBonusSupercarrierG1'), skill='Gallente Carrier')
+                                       src.getModifiedItemAttr('shipBonusSupercarrierG1'), skill='Gallente Carrier', **kwargs)
         fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'),
                                        'fighterAbilityMissilesDamageMultiplier',
-                                       src.getModifiedItemAttr('shipBonusSupercarrierG1'), skill='Gallente Carrier')
+                                       src.getModifiedItemAttr('shipBonusSupercarrierG1'), skill='Gallente Carrier', **kwargs)
         fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'),
                                        'fighterAbilityAttackMissileDamageMultiplier',
-                                       src.getModifiedItemAttr('shipBonusSupercarrierG1'), skill='Gallente Carrier')
+                                       src.getModifiedItemAttr('shipBonusSupercarrierG1'), skill='Gallente Carrier', **kwargs)
 
 
 class Effect6606(BaseEffect):
@@ -29349,16 +29230,16 @@ class Effect6606(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'),
                                        'fighterAbilityAttackMissileDamageMultiplier',
-                                       src.getModifiedItemAttr('shipBonusSupercarrierM1'), skill='Minmatar Carrier')
+                                       src.getModifiedItemAttr('shipBonusSupercarrierM1'), skill='Minmatar Carrier', **kwargs)
         fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'),
                                        'fighterAbilityMissilesDamageMultiplier',
-                                       src.getModifiedItemAttr('shipBonusSupercarrierM1'), skill='Minmatar Carrier')
+                                       src.getModifiedItemAttr('shipBonusSupercarrierM1'), skill='Minmatar Carrier', **kwargs)
         fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'),
                                        'fighterAbilityAttackTurretDamageMultiplier',
-                                       src.getModifiedItemAttr('shipBonusSupercarrierM1'), skill='Minmatar Carrier')
+                                       src.getModifiedItemAttr('shipBonusSupercarrierM1'), skill='Minmatar Carrier', **kwargs)
 
 
 class Effect6607(BaseEffect):
@@ -29372,22 +29253,22 @@ class Effect6607(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(
             lambda mod: mod.item.requiresSkill('Armored Command') or mod.item.requiresSkill('Information Command'),
-            'warfareBuff4Value', src.getModifiedItemAttr('shipBonusSupercarrierA5'), skill='Amarr Carrier')
+            'warfareBuff4Value', src.getModifiedItemAttr('shipBonusSupercarrierA5'), skill='Amarr Carrier', **kwargs)
         fit.modules.filteredItemBoost(
             lambda mod: mod.item.requiresSkill('Armored Command') or mod.item.requiresSkill('Information Command'),
-            'warfareBuff3Value', src.getModifiedItemAttr('shipBonusSupercarrierA5'), skill='Amarr Carrier')
+            'warfareBuff3Value', src.getModifiedItemAttr('shipBonusSupercarrierA5'), skill='Amarr Carrier', **kwargs)
         fit.modules.filteredItemBoost(
             lambda mod: mod.item.requiresSkill('Armored Command') or mod.item.requiresSkill('Information Command'),
-            'buffDuration', src.getModifiedItemAttr('shipBonusSupercarrierA5'), skill='Amarr Carrier')
+            'buffDuration', src.getModifiedItemAttr('shipBonusSupercarrierA5'), skill='Amarr Carrier', **kwargs)
         fit.modules.filteredItemBoost(
             lambda mod: mod.item.requiresSkill('Armored Command') or mod.item.requiresSkill('Information Command'),
-            'warfareBuff2Value', src.getModifiedItemAttr('shipBonusSupercarrierA5'), skill='Amarr Carrier')
+            'warfareBuff2Value', src.getModifiedItemAttr('shipBonusSupercarrierA5'), skill='Amarr Carrier', **kwargs)
         fit.modules.filteredItemBoost(
             lambda mod: mod.item.requiresSkill('Armored Command') or mod.item.requiresSkill('Information Command'),
-            'warfareBuff1Value', src.getModifiedItemAttr('shipBonusSupercarrierA5'), skill='Amarr Carrier')
+            'warfareBuff1Value', src.getModifiedItemAttr('shipBonusSupercarrierA5'), skill='Amarr Carrier', **kwargs)
 
 
 class Effect6608(BaseEffect):
@@ -29401,22 +29282,22 @@ class Effect6608(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(
             lambda mod: mod.item.requiresSkill('Shield Command') or mod.item.requiresSkill('Information Command'),
-            'buffDuration', src.getModifiedItemAttr('shipBonusSupercarrierC5'), skill='Caldari Carrier')
+            'buffDuration', src.getModifiedItemAttr('shipBonusSupercarrierC5'), skill='Caldari Carrier', **kwargs)
         fit.modules.filteredItemBoost(
             lambda mod: mod.item.requiresSkill('Shield Command') or mod.item.requiresSkill('Information Command'),
-            'warfareBuff2Value', src.getModifiedItemAttr('shipBonusSupercarrierC5'), skill='Caldari Carrier')
+            'warfareBuff2Value', src.getModifiedItemAttr('shipBonusSupercarrierC5'), skill='Caldari Carrier', **kwargs)
         fit.modules.filteredItemBoost(
             lambda mod: mod.item.requiresSkill('Shield Command') or mod.item.requiresSkill('Information Command'),
-            'warfareBuff1Value', src.getModifiedItemAttr('shipBonusSupercarrierC5'), skill='Caldari Carrier')
+            'warfareBuff1Value', src.getModifiedItemAttr('shipBonusSupercarrierC5'), skill='Caldari Carrier', **kwargs)
         fit.modules.filteredItemBoost(
             lambda mod: mod.item.requiresSkill('Shield Command') or mod.item.requiresSkill('Information Command'),
-            'warfareBuff4Value', src.getModifiedItemAttr('shipBonusSupercarrierC5'), skill='Caldari Carrier')
+            'warfareBuff4Value', src.getModifiedItemAttr('shipBonusSupercarrierC5'), skill='Caldari Carrier', **kwargs)
         fit.modules.filteredItemBoost(
             lambda mod: mod.item.requiresSkill('Shield Command') or mod.item.requiresSkill('Information Command'),
-            'warfareBuff3Value', src.getModifiedItemAttr('shipBonusSupercarrierC5'), skill='Caldari Carrier')
+            'warfareBuff3Value', src.getModifiedItemAttr('shipBonusSupercarrierC5'), skill='Caldari Carrier', **kwargs)
 
 
 class Effect6609(BaseEffect):
@@ -29430,22 +29311,22 @@ class Effect6609(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(
             lambda mod: mod.item.requiresSkill('Skirmish Command') or mod.item.requiresSkill('Armored Command'),
-            'warfareBuff2Value', src.getModifiedItemAttr('shipBonusSupercarrierG5'), skill='Gallente Carrier')
+            'warfareBuff2Value', src.getModifiedItemAttr('shipBonusSupercarrierG5'), skill='Gallente Carrier', **kwargs)
         fit.modules.filteredItemBoost(
             lambda mod: mod.item.requiresSkill('Skirmish Command') or mod.item.requiresSkill('Armored Command'),
-            'buffDuration', src.getModifiedItemAttr('shipBonusSupercarrierG5'), skill='Gallente Carrier')
+            'buffDuration', src.getModifiedItemAttr('shipBonusSupercarrierG5'), skill='Gallente Carrier', **kwargs)
         fit.modules.filteredItemBoost(
             lambda mod: mod.item.requiresSkill('Skirmish Command') or mod.item.requiresSkill('Armored Command'),
-            'warfareBuff1Value', src.getModifiedItemAttr('shipBonusSupercarrierG5'), skill='Gallente Carrier')
+            'warfareBuff1Value', src.getModifiedItemAttr('shipBonusSupercarrierG5'), skill='Gallente Carrier', **kwargs)
         fit.modules.filteredItemBoost(
             lambda mod: mod.item.requiresSkill('Skirmish Command') or mod.item.requiresSkill('Armored Command'),
-            'warfareBuff3Value', src.getModifiedItemAttr('shipBonusSupercarrierG5'), skill='Gallente Carrier')
+            'warfareBuff3Value', src.getModifiedItemAttr('shipBonusSupercarrierG5'), skill='Gallente Carrier', **kwargs)
         fit.modules.filteredItemBoost(
             lambda mod: mod.item.requiresSkill('Skirmish Command') or mod.item.requiresSkill('Armored Command'),
-            'warfareBuff4Value', src.getModifiedItemAttr('shipBonusSupercarrierG5'), skill='Gallente Carrier')
+            'warfareBuff4Value', src.getModifiedItemAttr('shipBonusSupercarrierG5'), skill='Gallente Carrier', **kwargs)
 
 
 class Effect6610(BaseEffect):
@@ -29459,22 +29340,22 @@ class Effect6610(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(
             lambda mod: mod.item.requiresSkill('Skirmish Command') or mod.item.requiresSkill('Shield Command'),
-            'warfareBuff4Value', src.getModifiedItemAttr('shipBonusSupercarrierM5'), skill='Minmatar Carrier')
+            'warfareBuff4Value', src.getModifiedItemAttr('shipBonusSupercarrierM5'), skill='Minmatar Carrier', **kwargs)
         fit.modules.filteredItemBoost(
             lambda mod: mod.item.requiresSkill('Skirmish Command') or mod.item.requiresSkill('Shield Command'),
-            'warfareBuff1Value', src.getModifiedItemAttr('shipBonusSupercarrierM5'), skill='Minmatar Carrier')
+            'warfareBuff1Value', src.getModifiedItemAttr('shipBonusSupercarrierM5'), skill='Minmatar Carrier', **kwargs)
         fit.modules.filteredItemBoost(
             lambda mod: mod.item.requiresSkill('Skirmish Command') or mod.item.requiresSkill('Shield Command'),
-            'warfareBuff3Value', src.getModifiedItemAttr('shipBonusSupercarrierM5'), skill='Minmatar Carrier')
+            'warfareBuff3Value', src.getModifiedItemAttr('shipBonusSupercarrierM5'), skill='Minmatar Carrier', **kwargs)
         fit.modules.filteredItemBoost(
             lambda mod: mod.item.requiresSkill('Skirmish Command') or mod.item.requiresSkill('Shield Command'),
-            'buffDuration', src.getModifiedItemAttr('shipBonusSupercarrierM5'), skill='Minmatar Carrier')
+            'buffDuration', src.getModifiedItemAttr('shipBonusSupercarrierM5'), skill='Minmatar Carrier', **kwargs)
         fit.modules.filteredItemBoost(
             lambda mod: mod.item.requiresSkill('Skirmish Command') or mod.item.requiresSkill('Shield Command'),
-            'warfareBuff2Value', src.getModifiedItemAttr('shipBonusSupercarrierM5'), skill='Minmatar Carrier')
+            'warfareBuff2Value', src.getModifiedItemAttr('shipBonusSupercarrierM5'), skill='Minmatar Carrier', **kwargs)
 
 
 class Effect6611(BaseEffect):
@@ -29488,9 +29369,9 @@ class Effect6611(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Afterburner'), 'speedFactor',
-                                      src.getModifiedItemAttr('shipBonusSupercarrierC2'), skill='Caldari Carrier')
+                                      src.getModifiedItemAttr('shipBonusSupercarrierC2'), skill='Caldari Carrier', **kwargs)
 
 
 class Effect6612(BaseEffect):
@@ -29504,13 +29385,13 @@ class Effect6612(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'),
                                        'fighterAbilityMissilesExplosionVelocity',
-                                       src.getModifiedItemAttr('shipBonusSupercarrierA2'), skill='Amarr Carrier')
+                                       src.getModifiedItemAttr('shipBonusSupercarrierA2'), skill='Amarr Carrier', **kwargs)
         fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'),
                                        'fighterAbilityAttackMissileExplosionVelocity',
-                                       src.getModifiedItemAttr('shipBonusSupercarrierA2'), skill='Amarr Carrier')
+                                       src.getModifiedItemAttr('shipBonusSupercarrierA2'), skill='Amarr Carrier', **kwargs)
 
 
 class Effect6613(BaseEffect):
@@ -29524,9 +29405,9 @@ class Effect6613(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemIncrease(lambda mod: mod.item.requiresSkill('Leadership'), 'maxGroupActive',
-                                         src.getModifiedItemAttr('shipBonusRole1'))
+                                         src.getModifiedItemAttr('shipBonusRole1'), **kwargs)
 
 
 class Effect6614(BaseEffect):
@@ -29540,11 +29421,11 @@ class Effect6614(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Hull Upgrades'), 'armorHPBonusAdd',
-                                      src.getModifiedItemAttr('shipBonusRole2'))
+                                      src.getModifiedItemAttr('shipBonusRole2'), **kwargs)
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Upgrades'), 'capacityBonus',
-                                      src.getModifiedItemAttr('shipBonusRole2'))
+                                      src.getModifiedItemAttr('shipBonusRole2'), **kwargs)
 
 
 class Effect6615(BaseEffect):
@@ -29558,10 +29439,10 @@ class Effect6615(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Burst Projector Operation'),
                                       'durationWeaponDisruptionBurstProjector',
-                                      src.getModifiedItemAttr('shipBonusSupercarrierA4'), skill='Amarr Carrier')
+                                      src.getModifiedItemAttr('shipBonusSupercarrierA4'), skill='Amarr Carrier', **kwargs)
 
 
 class Effect6616(BaseEffect):
@@ -29575,10 +29456,10 @@ class Effect6616(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Burst Projector Operation'),
                                       'durationECMJammerBurstProjector', src.getModifiedItemAttr('shipBonusSupercarrierC4'),
-                                      skill='Caldari Carrier')
+                                      skill='Caldari Carrier', **kwargs)
 
 
 class Effect6617(BaseEffect):
@@ -29592,10 +29473,10 @@ class Effect6617(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Burst Projector Operation'),
                                       'durationSensorDampeningBurstProjector',
-                                      src.getModifiedItemAttr('shipBonusSupercarrierG4'), skill='Gallente Carrier')
+                                      src.getModifiedItemAttr('shipBonusSupercarrierG4'), skill='Gallente Carrier', **kwargs)
 
 
 class Effect6618(BaseEffect):
@@ -29609,10 +29490,10 @@ class Effect6618(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Burst Projector Operation'),
                                       'durationTargetIlluminationBurstProjector',
-                                      src.getModifiedItemAttr('shipBonusSupercarrierM4'), skill='Minmatar Carrier')
+                                      src.getModifiedItemAttr('shipBonusSupercarrierM4'), skill='Minmatar Carrier', **kwargs)
 
 
 class Effect6619(BaseEffect):
@@ -29626,9 +29507,9 @@ class Effect6619(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemIncrease(lambda mod: mod.item.requiresSkill('Leadership'), 'maxGroupActive',
-                                         src.getModifiedItemAttr('shipBonusRole1'))
+                                         src.getModifiedItemAttr('shipBonusRole1'), **kwargs)
 
 
 class Effect6620(BaseEffect):
@@ -29642,9 +29523,9 @@ class Effect6620(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Missile Launcher Operation'), 'reloadTime',
-                                      src.getModifiedItemAttr('shipBonusDreadnoughtC3'), skill='Caldari Dreadnought')
+                                      src.getModifiedItemAttr('shipBonusDreadnoughtC3'), skill='Caldari Dreadnought', **kwargs)
 
 
 class Effect6621(BaseEffect):
@@ -29658,15 +29539,15 @@ class Effect6621(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.ship.boostItemAttr('armorExplosiveDamageResonance', src.getModifiedItemAttr('shipBonusSupercarrierA2'),
-                               skill='Amarr Carrier')
+                               skill='Amarr Carrier', **kwargs)
         fit.ship.boostItemAttr('armorEmDamageResonance', src.getModifiedItemAttr('shipBonusSupercarrierA2'),
-                               skill='Amarr Carrier')
+                               skill='Amarr Carrier', **kwargs)
         fit.ship.boostItemAttr('armorThermalDamageResonance', src.getModifiedItemAttr('shipBonusSupercarrierA2'),
-                               skill='Amarr Carrier')
+                               skill='Amarr Carrier', **kwargs)
         fit.ship.boostItemAttr('armorKineticDamageResonance', src.getModifiedItemAttr('shipBonusSupercarrierA2'),
-                               skill='Amarr Carrier')
+                               skill='Amarr Carrier', **kwargs)
 
 
 class Effect6622(BaseEffect):
@@ -29680,15 +29561,15 @@ class Effect6622(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.ship.boostItemAttr('shieldThermalDamageResonance', src.getModifiedItemAttr('shipBonusSupercarrierC2'),
-                               skill='Caldari Carrier')
+                               skill='Caldari Carrier', **kwargs)
         fit.ship.boostItemAttr('shieldEmDamageResonance', src.getModifiedItemAttr('shipBonusSupercarrierC2'),
-                               skill='Caldari Carrier')
+                               skill='Caldari Carrier', **kwargs)
         fit.ship.boostItemAttr('shieldKineticDamageResonance', src.getModifiedItemAttr('shipBonusSupercarrierC2'),
-                               skill='Caldari Carrier')
+                               skill='Caldari Carrier', **kwargs)
         fit.ship.boostItemAttr('shieldExplosiveDamageResonance', src.getModifiedItemAttr('shipBonusSupercarrierC2'),
-                               skill='Caldari Carrier')
+                               skill='Caldari Carrier', **kwargs)
 
 
 class Effect6623(BaseEffect):
@@ -29702,9 +29583,9 @@ class Effect6623(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'), 'shieldCapacity',
-                                       src.getModifiedItemAttr('shipBonusSupercarrierG2'), skill='Gallente Carrier')
+                                       src.getModifiedItemAttr('shipBonusSupercarrierG2'), skill='Gallente Carrier', **kwargs)
 
 
 class Effect6624(BaseEffect):
@@ -29719,9 +29600,9 @@ class Effect6624(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'), 'maxVelocity',
-                                       src.getModifiedItemAttr('shipBonusSupercarrierM2'), skill='Minmatar Carrier')
+                                       src.getModifiedItemAttr('shipBonusSupercarrierM2'), skill='Minmatar Carrier', **kwargs)
 
 
 class Effect6625(BaseEffect):
@@ -29735,12 +29616,12 @@ class Effect6625(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Support Fighters'), 'fighterSquadronOrbitRange',
-                                       src.getModifiedItemAttr('shipBonusCarrierA2'), skill='Amarr Carrier')
+                                       src.getModifiedItemAttr('shipBonusCarrierA2'), skill='Amarr Carrier', **kwargs)
         fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Support Fighters'),
                                        'fighterAbilityEnergyNeutralizerOptimalRange',
-                                       src.getModifiedItemAttr('shipBonusCarrierA2'), skill='Amarr Carrier')
+                                       src.getModifiedItemAttr('shipBonusCarrierA2'), skill='Amarr Carrier', **kwargs)
 
 
 class Effect6626(BaseEffect):
@@ -29754,12 +29635,12 @@ class Effect6626(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Support Fighters'), 'fighterSquadronOrbitRange',
-                                       src.getModifiedItemAttr('shipBonusCarrierC2'), skill='Caldari Carrier')
+                                       src.getModifiedItemAttr('shipBonusCarrierC2'), skill='Caldari Carrier', **kwargs)
         fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Support Fighters'),
                                        'fighterAbilityECMRangeOptimal', src.getModifiedItemAttr('shipBonusCarrierC2'),
-                                       skill='Caldari Carrier')
+                                       skill='Caldari Carrier', **kwargs)
 
 
 class Effect6627(BaseEffect):
@@ -29773,12 +29654,12 @@ class Effect6627(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Support Fighters'), 'fighterSquadronOrbitRange',
-                                       src.getModifiedItemAttr('shipBonusCarrierG2'), skill='Gallente Carrier')
+                                       src.getModifiedItemAttr('shipBonusCarrierG2'), skill='Gallente Carrier', **kwargs)
         fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Support Fighters'),
                                        'fighterAbilityWarpDisruptionRange', src.getModifiedItemAttr('shipBonusCarrierG2'),
-                                       skill='Gallente Carrier')
+                                       skill='Gallente Carrier', **kwargs)
 
 
 class Effect6628(BaseEffect):
@@ -29792,12 +29673,12 @@ class Effect6628(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Support Fighters'), 'fighterSquadronOrbitRange',
-                                       src.getModifiedItemAttr('shipBonusCarrierM2'), skill='Minmatar Carrier')
+                                       src.getModifiedItemAttr('shipBonusCarrierM2'), skill='Minmatar Carrier', **kwargs)
         fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Support Fighters'),
                                        'fighterAbilityStasisWebifierOptimalRange',
-                                       src.getModifiedItemAttr('shipBonusCarrierM2'), skill='Minmatar Carrier')
+                                       src.getModifiedItemAttr('shipBonusCarrierM2'), skill='Minmatar Carrier', **kwargs)
 
 
 class Effect6629(BaseEffect):
@@ -29811,12 +29692,12 @@ class Effect6629(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
-        src.boostItemAttr('emDamageResistanceBonus', src.getModifiedChargeAttr('emDamageResistanceBonusBonus'))
+    def handler(fit, src, context, **kwargs):
+        src.boostItemAttr('emDamageResistanceBonus', src.getModifiedChargeAttr('emDamageResistanceBonusBonus'), **kwargs)
         src.boostItemAttr('explosiveDamageResistanceBonus',
-                          src.getModifiedChargeAttr('explosiveDamageResistanceBonusBonus'))
-        src.boostItemAttr('kineticDamageResistanceBonus', src.getModifiedChargeAttr('kineticDamageResistanceBonusBonus'))
-        src.boostItemAttr('thermalDamageResistanceBonus', src.getModifiedChargeAttr('thermalDamageResistanceBonusBonus'))
+                          src.getModifiedChargeAttr('explosiveDamageResistanceBonusBonus'), **kwargs)
+        src.boostItemAttr('kineticDamageResistanceBonus', src.getModifiedChargeAttr('kineticDamageResistanceBonusBonus'), **kwargs)
+        src.boostItemAttr('thermalDamageResistanceBonus', src.getModifiedChargeAttr('thermalDamageResistanceBonusBonus'), **kwargs)
 
 
 class Effect6634(BaseEffect):
@@ -29830,9 +29711,9 @@ class Effect6634(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Capital Energy Turret'), 'damageMultiplier',
-                                      src.getModifiedItemAttr('shipBonusTitanA1'), skill='Amarr Titan')
+                                      src.getModifiedItemAttr('shipBonusTitanA1'), skill='Amarr Titan', **kwargs)
 
 
 class Effect6635(BaseEffect):
@@ -29846,13 +29727,13 @@ class Effect6635(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('XL Torpedoes'), 'kineticDamage',
-                                        src.getModifiedItemAttr('shipBonusTitanC1'), skill='Caldari Titan')
+                                        src.getModifiedItemAttr('shipBonusTitanC1'), skill='Caldari Titan', **kwargs)
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('XL Cruise Missiles'), 'kineticDamage',
-                                        src.getModifiedItemAttr('shipBonusTitanC1'), skill='Caldari Titan')
+                                        src.getModifiedItemAttr('shipBonusTitanC1'), skill='Caldari Titan', **kwargs)
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Torpedoes'), 'kineticDamage',
-                                        src.getModifiedItemAttr('shipBonusTitanC1'), skill='Caldari Titan')
+                                        src.getModifiedItemAttr('shipBonusTitanC1'), skill='Caldari Titan', **kwargs)
 
 
 class Effect6636(BaseEffect):
@@ -29866,9 +29747,9 @@ class Effect6636(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Capital Hybrid Turret'), 'damageMultiplier',
-                                      src.getModifiedItemAttr('shipBonusTitanG1'), skill='Gallente Titan')
+                                      src.getModifiedItemAttr('shipBonusTitanG1'), skill='Gallente Titan', **kwargs)
 
 
 class Effect6637(BaseEffect):
@@ -29882,9 +29763,9 @@ class Effect6637(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Capital Projectile Turret'), 'damageMultiplier',
-                                      src.getModifiedItemAttr('shipBonusTitanM1'), skill='Minmatar Titan')
+                                      src.getModifiedItemAttr('shipBonusTitanM1'), skill='Minmatar Titan', **kwargs)
 
 
 class Effect6638(BaseEffect):
@@ -29898,13 +29779,13 @@ class Effect6638(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Missile Launcher XL Cruise', 'speed',
-                                      src.getModifiedItemAttr('shipBonusTitanC2'), skill='Caldari Titan')
+                                      src.getModifiedItemAttr('shipBonusTitanC2'), skill='Caldari Titan', **kwargs)
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Missile Launcher Rapid Torpedo', 'speed',
-                                      src.getModifiedItemAttr('shipBonusTitanC2'), skill='Caldari Titan')
+                                      src.getModifiedItemAttr('shipBonusTitanC2'), skill='Caldari Titan', **kwargs)
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Missile Launcher XL Torpedo', 'speed',
-                                      src.getModifiedItemAttr('shipBonusTitanC2'), skill='Caldari Titan')
+                                      src.getModifiedItemAttr('shipBonusTitanC2'), skill='Caldari Titan', **kwargs)
 
 
 class Effect6639(BaseEffect):
@@ -29918,13 +29799,13 @@ class Effect6639(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'),
                                        'fighterAbilityMissilesExplosionRadius',
-                                       src.getModifiedItemAttr('shipBonusSupercarrierA4'), skill='Amarr Carrier')
+                                       src.getModifiedItemAttr('shipBonusSupercarrierA4'), skill='Amarr Carrier', **kwargs)
         fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'),
                                        'fighterAbilityAttackMissileExplosionRadius',
-                                       src.getModifiedItemAttr('shipBonusSupercarrierA4'), skill='Amarr Carrier')
+                                       src.getModifiedItemAttr('shipBonusSupercarrierA4'), skill='Amarr Carrier', **kwargs)
 
 
 class Effect6640(BaseEffect):
@@ -29938,9 +29819,9 @@ class Effect6640(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemIncrease(lambda mod: mod.item.requiresSkill('Leadership'), 'maxGroupActive',
-                                         src.getModifiedItemAttr('shipBonusRole1'))
+                                         src.getModifiedItemAttr('shipBonusRole1'), **kwargs)
 
 
 class Effect6641(BaseEffect):
@@ -29954,11 +29835,11 @@ class Effect6641(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Hull Upgrades'), 'armorHPBonusAdd',
-                                      src.getModifiedItemAttr('shipBonusRole2'))
+                                      src.getModifiedItemAttr('shipBonusRole2'), **kwargs)
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Upgrades'), 'capacityBonus',
-                                      src.getModifiedItemAttr('shipBonusRole2'))
+                                      src.getModifiedItemAttr('shipBonusRole2'), **kwargs)
 
 
 class Effect6642(BaseEffect):
@@ -29972,10 +29853,10 @@ class Effect6642(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         lvl = src.level
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Doomsday Operation'), 'duration',
-                                      src.getModifiedItemAttr('rofBonus') * lvl)
+                                      src.getModifiedItemAttr('rofBonus') * lvl, **kwargs)
 
 
 class Effect6647(BaseEffect):
@@ -29989,8 +29870,8 @@ class Effect6647(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
-        fit.ship.increaseItemAttr('warpScrambleStatus', src.getModifiedItemAttr('shipBonusTitanA3'), skill='Amarr Titan')
+    def handler(fit, src, context, **kwargs):
+        fit.ship.increaseItemAttr('warpScrambleStatus', src.getModifiedItemAttr('shipBonusTitanA3'), skill='Amarr Titan', **kwargs)
 
 
 class Effect6648(BaseEffect):
@@ -30004,8 +29885,8 @@ class Effect6648(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
-        fit.ship.increaseItemAttr('warpScrambleStatus', src.getModifiedItemAttr('shipBonusTitanC3'), skill='Caldari Titan')
+    def handler(fit, src, context, **kwargs):
+        fit.ship.increaseItemAttr('warpScrambleStatus', src.getModifiedItemAttr('shipBonusTitanC3'), skill='Caldari Titan', **kwargs)
 
 
 class Effect6649(BaseEffect):
@@ -30020,8 +29901,8 @@ class Effect6649(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
-        fit.ship.increaseItemAttr('warpScrambleStatus', src.getModifiedItemAttr('shipBonusTitanG3'), skill='Gallente Titan')
+    def handler(fit, src, context, **kwargs):
+        fit.ship.increaseItemAttr('warpScrambleStatus', src.getModifiedItemAttr('shipBonusTitanG3'), skill='Gallente Titan', **kwargs)
 
 
 class Effect6650(BaseEffect):
@@ -30035,8 +29916,8 @@ class Effect6650(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
-        fit.ship.increaseItemAttr('warpScrambleStatus', src.getModifiedItemAttr('shipBonusTitanM3'), skill='Minmatar Titan')
+    def handler(fit, src, context, **kwargs):
+        fit.ship.increaseItemAttr('warpScrambleStatus', src.getModifiedItemAttr('shipBonusTitanM3'), skill='Minmatar Titan', **kwargs)
 
 
 class Effect6651(BaseEffect):
@@ -30063,9 +29944,9 @@ class Effect6651(BaseEffect):
         amount = module.getModifiedItemAttr('armorDamageAmount') * multiplier
         speed = module.getModifiedItemAttr('duration') / 1000.0
         rps = amount / speed
-        fit.extraAttributes.increase('armorRepair', rps)
-        fit.extraAttributes.increase('armorRepairPreSpool', rps)
-        fit.extraAttributes.increase('armorRepairFullSpool', rps)
+        fit.extraAttributes.increase('armorRepair', rps, **kwargs)
+        fit.extraAttributes.increase('armorRepairPreSpool', rps, **kwargs)
+        fit.extraAttributes.increase('armorRepairFullSpool', rps, **kwargs)
 
 
 class Effect6652(BaseEffect):
@@ -30099,9 +29980,9 @@ class Effect6653(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Capital Energy Turret'), 'capacitorNeed',
-                                      src.getModifiedItemAttr('shipBonusTitanA2'), skill='Amarr Titan')
+                                      src.getModifiedItemAttr('shipBonusTitanA2'), skill='Amarr Titan', **kwargs)
 
 
 class Effect6654(BaseEffect):
@@ -30115,9 +29996,9 @@ class Effect6654(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Capital Hybrid Turret'), 'speed',
-                                      src.getModifiedItemAttr('shipBonusTitanG2'), skill='Gallente Titan')
+                                      src.getModifiedItemAttr('shipBonusTitanG2'), skill='Gallente Titan', **kwargs)
 
 
 class Effect6655(BaseEffect):
@@ -30131,9 +30012,9 @@ class Effect6655(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Capital Projectile Turret'), 'speed',
-                                      src.getModifiedItemAttr('shipBonusTitanM2'), skill='Minmatar Titan')
+                                      src.getModifiedItemAttr('shipBonusTitanM2'), skill='Minmatar Titan', **kwargs)
 
 
 class Effect6656(BaseEffect):
@@ -30147,9 +30028,9 @@ class Effect6656(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Torpedoes'), 'maxVelocity',
-                                        src.getModifiedItemAttr('shipBonusRole3'))
+                                        src.getModifiedItemAttr('shipBonusRole3'), **kwargs)
 
 
 class Effect6657(BaseEffect):
@@ -30163,25 +30044,25 @@ class Effect6657(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Torpedoes'), 'emDamage',
-                                        src.getModifiedItemAttr('shipBonusTitanC5'), skill='Caldari Titan')
+                                        src.getModifiedItemAttr('shipBonusTitanC5'), skill='Caldari Titan', **kwargs)
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Torpedoes'), 'explosiveDamage',
-                                        src.getModifiedItemAttr('shipBonusTitanC5'), skill='Caldari Titan')
+                                        src.getModifiedItemAttr('shipBonusTitanC5'), skill='Caldari Titan', **kwargs)
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Torpedoes'), 'thermalDamage',
-                                        src.getModifiedItemAttr('shipBonusTitanC5'), skill='Caldari Titan')
+                                        src.getModifiedItemAttr('shipBonusTitanC5'), skill='Caldari Titan', **kwargs)
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('XL Cruise Missiles'), 'explosiveDamage',
-                                        src.getModifiedItemAttr('shipBonusTitanC5'), skill='Caldari Titan')
+                                        src.getModifiedItemAttr('shipBonusTitanC5'), skill='Caldari Titan', **kwargs)
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('XL Cruise Missiles'), 'thermalDamage',
-                                        src.getModifiedItemAttr('shipBonusTitanC5'), skill='Caldari Titan')
+                                        src.getModifiedItemAttr('shipBonusTitanC5'), skill='Caldari Titan', **kwargs)
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('XL Cruise Missiles'), 'emDamage',
-                                        src.getModifiedItemAttr('shipBonusTitanC5'), skill='Caldari Titan')
+                                        src.getModifiedItemAttr('shipBonusTitanC5'), skill='Caldari Titan', **kwargs)
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('XL Torpedoes'), 'thermalDamage',
-                                        src.getModifiedItemAttr('shipBonusTitanC5'), skill='Caldari Titan')
+                                        src.getModifiedItemAttr('shipBonusTitanC5'), skill='Caldari Titan', **kwargs)
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('XL Torpedoes'), 'emDamage',
-                                        src.getModifiedItemAttr('shipBonusTitanC5'), skill='Caldari Titan')
+                                        src.getModifiedItemAttr('shipBonusTitanC5'), skill='Caldari Titan', **kwargs)
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('XL Torpedoes'), 'explosiveDamage',
-                                        src.getModifiedItemAttr('shipBonusTitanC5'), skill='Caldari Titan')
+                                        src.getModifiedItemAttr('shipBonusTitanC5'), skill='Caldari Titan', **kwargs)
 
 
 class Effect6658(BaseEffect):
@@ -30196,7 +30077,7 @@ class Effect6658(BaseEffect):
     type = 'active'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         # Resistances
         for layer, attrPrefix in (('shield', 'shield'), ('armor', 'armor'), ('hull', '')):
             for damageType in ('Kinetic', 'Thermal', 'Explosive', 'Em'):
@@ -30205,61 +30086,58 @@ class Effect6658(BaseEffect):
                 booster = '%s%sDamageResonance' % (layer, damageType)
                 penalize = False if layer == 'hull' else True
                 fit.ship.multiplyItemAttr(bonus, src.getModifiedItemAttr(booster),
-                                          stackingPenalties=penalize, penaltyGroup='preMul')
+                                          stackingPenalties=penalize, penaltyGroup='preMul', **kwargs)
 
         # Turrets
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Large Energy Turret') or
                                                   mod.item.requiresSkill('Large Hybrid Turret') or
                                                   mod.item.requiresSkill('Large Projectile Turret'),
                                       'maxRange', src.getModifiedItemAttr('maxRangeBonus'),
-                                      stackingPenalties=True)
+                                      stackingPenalties=True, **kwargs)
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Large Energy Turret') or
                                                   mod.item.requiresSkill('Large Hybrid Turret') or
                                                   mod.item.requiresSkill('Large Projectile Turret'),
                                       'falloff', src.getModifiedItemAttr('falloffBonus'),
-                                      stackingPenalties=True)
+                                      stackingPenalties=True, **kwargs)
 
         # Missiles
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Torpedoes') or
                                                     mod.charge.requiresSkill('Cruise Missiles') or
                                                     mod.charge.requiresSkill('Heavy Missiles'),
-                                        'maxVelocity', src.getModifiedItemAttr('missileVelocityBonus'))
+                                        'maxVelocity', src.getModifiedItemAttr('missileVelocityBonus'), **kwargs)
 
         # Tanking
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Repair Systems'),
                                       'armorDamageAmount', src.getModifiedItemAttr('armorDamageAmountBonus'),
-                                      stackingPenalties=True)
+                                      stackingPenalties=True, **kwargs)
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Operation'),
                                       'shieldBonus', src.getModifiedItemAttr('shieldBoostMultiplier'),
-                                      stackingPenalties=True)
+                                      stackingPenalties=True, **kwargs)
 
         # Speed penalty
-        fit.ship.boostItemAttr('maxVelocity', src.getModifiedItemAttr('speedFactor'))
+        fit.ship.boostItemAttr('maxVelocity', src.getModifiedItemAttr('speedFactor'), **kwargs)
 
         # @todo: test these for April 2016 release
         # Max locked targets
-        fit.ship.forceItemAttr('maxLockedTargets', src.getModifiedItemAttr('maxLockedTargets'))
-
-        # Block Hostile ewar
-        fit.ship.forceItemAttr('disallowOffensiveModifiers', src.getModifiedItemAttr('disallowOffensiveModifiers'))
+        fit.ship.forceItemAttr('maxLockedTargets', src.getModifiedItemAttr('maxLockedTargets'), **kwargs)
 
         # new with April 2016 release
         for scanType in ('Magnetometric', 'Ladar', 'Gravimetric', 'Radar'):
             fit.ship.boostItemAttr('scan{}Strength'.format(scanType),
                                    src.getModifiedItemAttr('scan{}StrengthPercent'.format(scanType)),
-                                   stackingPenalties=True)
+                                   stackingPenalties=True, **kwargs)
 
-        fit.ship.boostItemAttr('remoteRepairImpedance', src.getModifiedItemAttr('remoteRepairImpedanceBonus'))
-        fit.ship.boostItemAttr('remoteAssistanceImpedance', src.getModifiedItemAttr('remoteAssistanceImpedanceBonus'))
-        fit.ship.boostItemAttr('sensorDampenerResistance', src.getModifiedItemAttr('sensorDampenerResistanceBonus'))
+        fit.ship.boostItemAttr('remoteRepairImpedance', src.getModifiedItemAttr('remoteRepairImpedanceBonus'), **kwargs)
+        fit.ship.boostItemAttr('remoteAssistanceImpedance', src.getModifiedItemAttr('remoteAssistanceImpedanceBonus'), **kwargs)
+        fit.ship.boostItemAttr('sensorDampenerResistance', src.getModifiedItemAttr('sensorDampenerResistanceBonus'), **kwargs)
         fit.modules.filteredItemIncrease(lambda mod: mod.item.requiresSkill('Micro Jump Drive Operation'),
-                                         'activationBlocked', src.getModifiedItemAttr('activationBlockedStrenght'))
-        fit.ship.boostItemAttr('targetPainterResistance', src.getModifiedItemAttr('targetPainterResistanceBonus'))
-        fit.ship.boostItemAttr('weaponDisruptionResistance', src.getModifiedItemAttr('weaponDisruptionResistanceBonus'))
-        fit.ship.increaseItemAttr('warpScrambleStatus', src.getModifiedItemAttr('siegeModeWarpStatus'))
+                                         'activationBlocked', src.getModifiedItemAttr('activationBlockedStrenght'), **kwargs)
+        fit.ship.boostItemAttr('targetPainterResistance', src.getModifiedItemAttr('targetPainterResistanceBonus'), **kwargs)
+        fit.ship.boostItemAttr('weaponDisruptionResistance', src.getModifiedItemAttr('weaponDisruptionResistanceBonus'), **kwargs)
+        fit.ship.increaseItemAttr('warpScrambleStatus', src.getModifiedItemAttr('siegeModeWarpStatus'), **kwargs)
 
-        fit.ship.forceItemAttr('disallowDocking', src.getModifiedItemAttr('disallowDocking'))
-        fit.ship.forceItemAttr('disallowTethering', src.getModifiedItemAttr('disallowTethering'))
+        fit.ship.forceItemAttr('disallowDocking', src.getModifiedItemAttr('disallowDocking'), **kwargs)
+        fit.ship.forceItemAttr('disallowTethering', src.getModifiedItemAttr('disallowTethering'), **kwargs)
 
 
 class Effect6661(BaseEffect):
@@ -30273,9 +30151,9 @@ class Effect6661(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'), 'maxVelocity',
-                                       src.getModifiedItemAttr('shipBonusCarrierM3'), skill='Minmatar Carrier')
+                                       src.getModifiedItemAttr('shipBonusCarrierM3'), skill='Minmatar Carrier', **kwargs)
 
 
 class Effect6662(BaseEffect):
@@ -30289,9 +30167,9 @@ class Effect6662(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'), 'shieldCapacity',
-                                       src.getModifiedItemAttr('shipBonusCarrierG3'), skill='Gallente Carrier')
+                                       src.getModifiedItemAttr('shipBonusCarrierG3'), skill='Gallente Carrier', **kwargs)
 
 
 class Effect6663(BaseEffect):
@@ -30305,21 +30183,21 @@ class Effect6663(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         lvl = src.level if 'skill' in context else 1
         fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Drones'), 'damageMultiplier',
-                                     src.getModifiedItemAttr('damageMultiplierBonus') * lvl)
+                                     src.getModifiedItemAttr('damageMultiplierBonus') * lvl, **kwargs)
         fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'),
                                        'fighterAbilityAttackMissileDamageMultiplier',
-                                       src.getModifiedItemAttr('damageMultiplierBonus') * lvl)
+                                       src.getModifiedItemAttr('damageMultiplierBonus') * lvl, **kwargs)
         fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'),
                                        'fighterAbilityAttackTurretDamageMultiplier',
-                                       src.getModifiedItemAttr('damageMultiplierBonus') * lvl)
+                                       src.getModifiedItemAttr('damageMultiplierBonus') * lvl, **kwargs)
         fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'),
                                        'fighterAbilityMissilesDamageMultiplier',
-                                       src.getModifiedItemAttr('damageMultiplierBonus') * lvl)
+                                       src.getModifiedItemAttr('damageMultiplierBonus') * lvl, **kwargs)
         fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Mining Drone Operation'), 'miningDroneAmountPercent',
-                                     src.getModifiedItemAttr('miningAmountBonus') * lvl)
+                                     src.getModifiedItemAttr('miningAmountBonus') * lvl, **kwargs)
 
 
 class Effect6664(BaseEffect):
@@ -30333,18 +30211,18 @@ class Effect6664(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         lvl = src.level if 'skill' in context else 1
         fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Drones'), 'maxRange',
-                                     src.getModifiedItemAttr('rangeSkillBonus') * lvl)
+                                     src.getModifiedItemAttr('rangeSkillBonus') * lvl, **kwargs)
         fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'), 'fighterAbilityMissilesRange',
-                                       src.getModifiedItemAttr('rangeSkillBonus') * lvl)
+                                       src.getModifiedItemAttr('rangeSkillBonus') * lvl, **kwargs)
         fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'),
                                        'fighterAbilityAttackTurretRangeOptimal',
-                                       src.getModifiedItemAttr('rangeSkillBonus') * lvl)
+                                       src.getModifiedItemAttr('rangeSkillBonus') * lvl, **kwargs)
         fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'),
                                        'fighterAbilityAttackMissileRangeOptimal',
-                                       src.getModifiedItemAttr('rangeSkillBonus') * lvl)
+                                       src.getModifiedItemAttr('rangeSkillBonus') * lvl, **kwargs)
 
 
 class Effect6665(BaseEffect):
@@ -30358,16 +30236,16 @@ class Effect6665(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         lvl = src.level if 'skill' in context else 1
         fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Drones'), 'hp',
-                                     src.getModifiedItemAttr('hullHpBonus') * lvl)
+                                     src.getModifiedItemAttr('hullHpBonus') * lvl, **kwargs)
         fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Drones'), 'armorHP',
-                                     src.getModifiedItemAttr('armorHpBonus') * lvl)
+                                     src.getModifiedItemAttr('armorHpBonus') * lvl, **kwargs)
         fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Drones'), 'shieldCapacity',
-                                     src.getModifiedItemAttr('shieldCapacityBonus') * lvl)
+                                     src.getModifiedItemAttr('shieldCapacityBonus') * lvl, **kwargs)
         fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'), 'shieldCapacity',
-                                       src.getModifiedItemAttr('shieldCapacityBonus') * lvl)
+                                       src.getModifiedItemAttr('shieldCapacityBonus') * lvl, **kwargs)
 
 
 class Effect6667(BaseEffect):
@@ -30381,12 +30259,12 @@ class Effect6667(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         lvl = src.level if 'skill' in context else 1
         fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Drones'), 'maxVelocity',
-                                     src.getModifiedItemAttr('maxVelocityBonus') * lvl)
+                                     src.getModifiedItemAttr('maxVelocityBonus') * lvl, **kwargs)
         fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'), 'maxVelocity',
-                                       src.getModifiedItemAttr('maxVelocityBonus') * lvl)
+                                       src.getModifiedItemAttr('maxVelocityBonus') * lvl, **kwargs)
 
 
 class Effect6669(BaseEffect):
@@ -30400,16 +30278,16 @@ class Effect6669(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Drones'), 'armorHP',
-                                     src.getModifiedItemAttr('hullHpBonus'))
+                                     src.getModifiedItemAttr('hullHpBonus'), **kwargs)
         fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Drones'), 'hp',
-                                     src.getModifiedItemAttr('hullHpBonus'))
+                                     src.getModifiedItemAttr('hullHpBonus'), **kwargs)
         fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Drones'), 'shieldCapacity',
-                                     src.getModifiedItemAttr('hullHpBonus'))
+                                     src.getModifiedItemAttr('hullHpBonus'), **kwargs)
         fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'), 'shieldCapacity',
-                                       src.getModifiedItemAttr('hullHpBonus'))
-        fit.ship.boostItemAttr('cpuOutput', src.getModifiedItemAttr('drawback'))
+                                       src.getModifiedItemAttr('hullHpBonus'), **kwargs)
+        fit.ship.boostItemAttr('cpuOutput', src.getModifiedItemAttr('drawback'), **kwargs)
 
 
 class Effect6670(BaseEffect):
@@ -30423,18 +30301,18 @@ class Effect6670(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Drones'), 'maxRange',
-                                     src.getModifiedItemAttr('rangeSkillBonus'), stackingPenalties=True)
+                                     src.getModifiedItemAttr('rangeSkillBonus'), stackingPenalties=True, **kwargs)
         fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'), 'fighterAbilityMissilesRange',
-                                       src.getModifiedItemAttr('rangeSkillBonus'), stackingPenalties=True)
+                                       src.getModifiedItemAttr('rangeSkillBonus'), stackingPenalties=True, **kwargs)
         fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'),
                                        'fighterAbilityAttackTurretRangeOptimal', src.getModifiedItemAttr('rangeSkillBonus'),
-                                       stackingPenalties=True)
+                                       stackingPenalties=True, **kwargs)
         fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'),
                                        'fighterAbilityAttackMissileRangeOptimal',
-                                       src.getModifiedItemAttr('rangeSkillBonus'), stackingPenalties=True)
-        fit.ship.boostItemAttr('cpuOutput', src.getModifiedItemAttr('drawback'))
+                                       src.getModifiedItemAttr('rangeSkillBonus'), stackingPenalties=True, **kwargs)
+        fit.ship.boostItemAttr('cpuOutput', src.getModifiedItemAttr('drawback'), **kwargs)
 
 
 class Effect6671(BaseEffect):
@@ -30448,12 +30326,12 @@ class Effect6671(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Drones'), 'maxVelocity',
-                                     src.getModifiedItemAttr('droneMaxVelocityBonus'), stackingPenalties=True)
+                                     src.getModifiedItemAttr('droneMaxVelocityBonus'), stackingPenalties=True, **kwargs)
         fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'), 'maxVelocity',
-                                       src.getModifiedItemAttr('droneMaxVelocityBonus'), stackingPenalties=True)
-        fit.ship.boostItemAttr('cpuOutput', src.getModifiedItemAttr('drawback'))
+                                       src.getModifiedItemAttr('droneMaxVelocityBonus'), stackingPenalties=True, **kwargs)
+        fit.ship.boostItemAttr('cpuOutput', src.getModifiedItemAttr('drawback'), **kwargs)
 
 
 class Effect6672(BaseEffect):
@@ -30468,7 +30346,7 @@ class Effect6672(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         secMap = {
             FitSystemSecurity.HISEC: 'hiSecModifier',
             FitSystemSecurity.LOWSEC: 'lowSecModifier',
@@ -30477,17 +30355,17 @@ class Effect6672(BaseEffect):
         fitSec = fit.getSystemSecurity()
         attrName = secMap[fitSec]
         secModifier = module.getModifiedItemAttr(attrName)
-        module.multiplyItemAttr('structureRigDoomsdayDamageLossTargetBonus', secModifier)
-        module.multiplyItemAttr('structureRigScanResBonus', secModifier)
-        module.multiplyItemAttr('structureRigPDRangeBonus', secModifier)
-        module.multiplyItemAttr('structureRigPDCapUseBonus', secModifier)
-        module.multiplyItemAttr('structureRigMissileExploVeloBonus', secModifier)
-        module.multiplyItemAttr('structureRigMissileVelocityBonus', secModifier)
-        module.multiplyItemAttr('structureRigEwarOptimalBonus', secModifier)
-        module.multiplyItemAttr('structureRigEwarFalloffBonus', secModifier)
-        module.multiplyItemAttr('structureRigEwarCapUseBonus', secModifier)
-        module.multiplyItemAttr('structureRigMissileExplosionRadiusBonus', secModifier)
-        module.multiplyItemAttr('structureRigMaxTargetRangeBonus', secModifier)
+        module.multiplyItemAttr('structureRigDoomsdayDamageLossTargetBonus', secModifier, **kwargs)
+        module.multiplyItemAttr('structureRigScanResBonus', secModifier, **kwargs)
+        module.multiplyItemAttr('structureRigPDRangeBonus', secModifier, **kwargs)
+        module.multiplyItemAttr('structureRigPDCapUseBonus', secModifier, **kwargs)
+        module.multiplyItemAttr('structureRigMissileExploVeloBonus', secModifier, **kwargs)
+        module.multiplyItemAttr('structureRigMissileVelocityBonus', secModifier, **kwargs)
+        module.multiplyItemAttr('structureRigEwarOptimalBonus', secModifier, **kwargs)
+        module.multiplyItemAttr('structureRigEwarFalloffBonus', secModifier, **kwargs)
+        module.multiplyItemAttr('structureRigEwarCapUseBonus', secModifier, **kwargs)
+        module.multiplyItemAttr('structureRigMissileExplosionRadiusBonus', secModifier, **kwargs)
+        module.multiplyItemAttr('structureRigMaxTargetRangeBonus', secModifier, **kwargs)
 
 
 class Effect6679(BaseEffect):
@@ -30501,10 +30379,10 @@ class Effect6679(BaseEffect):
     type = 'passive', 'structure'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Structure Doomsday Weapon',
                                       'duration', src.getModifiedItemAttr('durationBonus'),
-                                      skill='Structure Doomsday Operation')
+                                      skill='Structure Doomsday Operation', **kwargs)
 
 
 class Effect6681(BaseEffect):
@@ -30518,9 +30396,9 @@ class Effect6681(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemIncrease(lambda mod: mod.item.requiresSkill('Leadership'), 'maxGroupActive',
-                                         src.getModifiedItemAttr('shipBonusRole3'))
+                                         src.getModifiedItemAttr('shipBonusRole3'), **kwargs)
 
 
 class Effect6682(BaseEffect):
@@ -30534,11 +30412,11 @@ class Effect6682(BaseEffect):
     type = 'active', 'projected'
 
     @staticmethod
-    def handler(fit, module, context, *args, **kwargs):
+    def handler(fit, module, context, **kwargs):
         if 'projected' not in context:
             return
         fit.ship.boostItemAttr('maxVelocity', module.getModifiedItemAttr('speedFactor'),
-                               stackingPenalties=True, *args, **kwargs)
+                               stackingPenalties=True, **kwargs)
 
 
 class Effect6683(BaseEffect):
@@ -30552,10 +30430,10 @@ class Effect6683(BaseEffect):
     type = 'projected', 'active'
 
     @staticmethod
-    def handler(fit, container, context, *args, **kwargs):
+    def handler(fit, container, context, **kwargs):
         if 'projected' in context:
             fit.ship.boostItemAttr('signatureRadius', container.getModifiedItemAttr('signatureRadiusBonus'),
-                                   stackingPenalties=True, *args, **kwargs)
+                                   stackingPenalties=True, **kwargs)
 
 
 class Effect6684(BaseEffect):
@@ -30569,15 +30447,15 @@ class Effect6684(BaseEffect):
     type = 'projected', 'active'
 
     @staticmethod
-    def handler(fit, module, context, *args, **kwargs):
+    def handler(fit, module, context, **kwargs):
         if 'projected' not in context:
             return
 
         fit.ship.boostItemAttr('maxTargetRange', module.getModifiedItemAttr('maxTargetRangeBonus'),
-                               stackingPenalties=True, *args, **kwargs)
+                               stackingPenalties=True, **kwargs)
 
         fit.ship.boostItemAttr('scanResolution', module.getModifiedItemAttr('scanResolutionBonus'),
-                               stackingPenalties=True, *args, **kwargs)
+                               stackingPenalties=True, **kwargs)
 
 
 class Effect6685(BaseEffect):
@@ -30591,7 +30469,7 @@ class Effect6685(BaseEffect):
     type = 'projected', 'active'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         if 'projected' in context:
             # jam formula: 1 - (1- (jammer str/ship str))^(# of jam mods with same str))
             strModifier = 1 - module.getModifiedItemAttr('scan{0}StrengthBonus'.format(fit.scanType)) / fit.scanStrength
@@ -30610,7 +30488,7 @@ class Effect6686(BaseEffect):
     type = 'active', 'projected'
 
     @staticmethod
-    def handler(fit, module, context, *args, **kwargs):
+    def handler(fit, module, context, **kwargs):
         if 'projected' in context:
             for srcAttr, tgtAttr in (
                     ('aoeCloudSizeBonus', 'aoeCloudSize'),
@@ -30620,17 +30498,17 @@ class Effect6686(BaseEffect):
             ):
                 fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
                                                 tgtAttr, module.getModifiedItemAttr(srcAttr),
-                                                stackingPenalties=True, *args, **kwargs)
+                                                stackingPenalties=True, **kwargs)
 
             fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Gunnery'),
                                           'trackingSpeed', module.getModifiedItemAttr('trackingSpeedBonus'),
-                                          stackingPenalties=True, *args, **kwargs)
+                                          stackingPenalties=True, **kwargs)
             fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Gunnery'),
                                           'maxRange', module.getModifiedItemAttr('maxRangeBonus'),
-                                          stackingPenalties=True, *args, **kwargs)
+                                          stackingPenalties=True, **kwargs)
             fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Gunnery'),
                                           'falloff', module.getModifiedItemAttr('falloffBonus'),
-                                          stackingPenalties=True, *args, **kwargs)
+                                          stackingPenalties=True, **kwargs)
 
 
 class Effect6687(BaseEffect):
@@ -30644,14 +30522,14 @@ class Effect6687(BaseEffect):
     type = 'projected', 'active'
 
     @staticmethod
-    def handler(fit, container, context):
+    def handler(fit, container, context, **kwargs):
         if 'projected' in context:
             bonus = container.getModifiedItemAttr('armorDamageAmount')
             duration = container.getModifiedItemAttr('duration') / 1000.0
             rps = bonus / duration
-            fit.extraAttributes.increase('armorRepair', rps)
-            fit.extraAttributes.increase('armorRepairPreSpool', rps)
-            fit.extraAttributes.increase('armorRepairFullSpool', rps)
+            fit.extraAttributes.increase('armorRepair', rps, **kwargs)
+            fit.extraAttributes.increase('armorRepairPreSpool', rps, **kwargs)
+            fit.extraAttributes.increase('armorRepairFullSpool', rps, **kwargs)
 
 
 class Effect6688(BaseEffect):
@@ -30665,11 +30543,11 @@ class Effect6688(BaseEffect):
     type = 'projected', 'active'
 
     @staticmethod
-    def handler(fit, container, context):
+    def handler(fit, container, context, **kwargs):
         if 'projected' in context:
             bonus = container.getModifiedItemAttr('shieldBonus')
             duration = container.getModifiedItemAttr('duration') / 1000.0
-            fit.extraAttributes.increase('shieldRepair', bonus / duration)
+            fit.extraAttributes.increase('shieldRepair', bonus / duration, **kwargs)
 
 
 class Effect6689(BaseEffect):
@@ -30684,12 +30562,12 @@ class Effect6689(BaseEffect):
     type = 'projected', 'active'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         if 'projected' not in context:
             return
         bonus = module.getModifiedItemAttr('structureDamageAmount')
         duration = module.getModifiedItemAttr('duration') / 1000.0
-        fit.extraAttributes.increase('hullRepair', bonus / duration)
+        fit.extraAttributes.increase('hullRepair', bonus / duration, **kwargs)
 
 
 class Effect6690(BaseEffect):
@@ -30703,11 +30581,11 @@ class Effect6690(BaseEffect):
     type = 'active', 'projected'
 
     @staticmethod
-    def handler(fit, module, context, *args, **kwargs):
+    def handler(fit, module, context, **kwargs):
         if 'projected' not in context:
             return
         fit.ship.boostItemAttr('maxVelocity', module.getModifiedItemAttr('speedFactor'),
-                               stackingPenalties=True, *args, **kwargs)
+                               stackingPenalties=True, **kwargs)
 
 
 class Effect6691(BaseEffect):
@@ -30745,10 +30623,10 @@ class Effect6692(BaseEffect):
     type = 'projected', 'active'
 
     @staticmethod
-    def handler(fit, container, context, *args, **kwargs):
+    def handler(fit, container, context, **kwargs):
         if 'projected' in context:
             fit.ship.boostItemAttr('signatureRadius', container.getModifiedItemAttr('signatureRadiusBonus'),
-                                   stackingPenalties=True, *args, **kwargs)
+                                   stackingPenalties=True, **kwargs)
 
 
 class Effect6693(BaseEffect):
@@ -30762,15 +30640,15 @@ class Effect6693(BaseEffect):
     type = 'projected', 'active'
 
     @staticmethod
-    def handler(fit, module, context, *args, **kwargs):
+    def handler(fit, module, context, **kwargs):
         if 'projected' not in context:
             return
 
         fit.ship.boostItemAttr('maxTargetRange', module.getModifiedItemAttr('maxTargetRangeBonus'),
-                               stackingPenalties=True, *args, **kwargs)
+                               stackingPenalties=True, **kwargs)
 
         fit.ship.boostItemAttr('scanResolution', module.getModifiedItemAttr('scanResolutionBonus'),
-                               stackingPenalties=True, *args, **kwargs)
+                               stackingPenalties=True, **kwargs)
 
 
 class Effect6694(BaseEffect):
@@ -30784,17 +30662,17 @@ class Effect6694(BaseEffect):
     type = 'projected', 'active'
 
     @staticmethod
-    def handler(fit, module, context, *args, **kwargs):
+    def handler(fit, module, context, **kwargs):
         if 'projected' in context:
             fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Gunnery'),
                                           'trackingSpeed', module.getModifiedItemAttr('trackingSpeedBonus'),
-                                          stackingPenalties=True, *args, **kwargs)
+                                          stackingPenalties=True, **kwargs)
             fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Gunnery'),
                                           'maxRange', module.getModifiedItemAttr('maxRangeBonus'),
-                                          stackingPenalties=True, *args, **kwargs)
+                                          stackingPenalties=True, **kwargs)
             fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Gunnery'),
                                           'falloff', module.getModifiedItemAttr('falloffBonus'),
-                                          stackingPenalties=True, *args, **kwargs)
+                                          stackingPenalties=True, **kwargs)
 
 
 class Effect6695(BaseEffect):
@@ -30831,12 +30709,12 @@ class Effect6697(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         lvl = src.level
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Rig Armor', 'drawback',
-                                      src.getModifiedItemAttr('rigDrawbackBonus') * lvl)
+                                      src.getModifiedItemAttr('rigDrawbackBonus') * lvl, **kwargs)
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Rig Resource Processing', 'drawback',
-                                      src.getModifiedItemAttr('rigDrawbackBonus') * lvl)
+                                      src.getModifiedItemAttr('rigDrawbackBonus') * lvl, **kwargs)
 
 
 class Effect6698(BaseEffect):
@@ -30850,12 +30728,12 @@ class Effect6698(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         lvl = src.level
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Rig Navigation', 'drawback',
-                                      src.getModifiedItemAttr('rigDrawbackBonus') * lvl)
+                                      src.getModifiedItemAttr('rigDrawbackBonus') * lvl, **kwargs)
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Rig Anchor', 'drawback',
-                                      src.getModifiedItemAttr('rigDrawbackBonus') * lvl)
+                                      src.getModifiedItemAttr('rigDrawbackBonus') * lvl, **kwargs)
 
 
 class Effect6699(BaseEffect):
@@ -30869,10 +30747,10 @@ class Effect6699(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         lvl = src.level
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Rig Drones', 'drawback',
-                                      src.getModifiedItemAttr('rigDrawbackBonus') * lvl)
+                                      src.getModifiedItemAttr('rigDrawbackBonus') * lvl, **kwargs)
 
 
 class Effect6700(BaseEffect):
@@ -30886,14 +30764,14 @@ class Effect6700(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         lvl = src.level
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Rig Electronic Systems', 'drawback',
-                                      src.getModifiedItemAttr('rigDrawbackBonus') * lvl)
+                                      src.getModifiedItemAttr('rigDrawbackBonus') * lvl, **kwargs)
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Rig Scanning', 'drawback',
-                                      src.getModifiedItemAttr('rigDrawbackBonus') * lvl)
+                                      src.getModifiedItemAttr('rigDrawbackBonus') * lvl, **kwargs)
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Rig Targeting', 'drawback',
-                                      src.getModifiedItemAttr('rigDrawbackBonus') * lvl)
+                                      src.getModifiedItemAttr('rigDrawbackBonus') * lvl, **kwargs)
 
 
 class Effect6701(BaseEffect):
@@ -30907,10 +30785,10 @@ class Effect6701(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         lvl = src.level
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Rig Projectile Weapon', 'drawback',
-                                      src.getModifiedItemAttr('rigDrawbackBonus') * lvl)
+                                      src.getModifiedItemAttr('rigDrawbackBonus') * lvl, **kwargs)
 
 
 class Effect6702(BaseEffect):
@@ -30924,10 +30802,10 @@ class Effect6702(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         lvl = src.level
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Rig Energy Weapon', 'drawback',
-                                      src.getModifiedItemAttr('rigDrawbackBonus') * lvl)
+                                      src.getModifiedItemAttr('rigDrawbackBonus') * lvl, **kwargs)
 
 
 class Effect6703(BaseEffect):
@@ -30941,10 +30819,10 @@ class Effect6703(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         lvl = src.level
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Rig Hybrid Weapon', 'drawback',
-                                      src.getModifiedItemAttr('rigDrawbackBonus') * lvl)
+                                      src.getModifiedItemAttr('rigDrawbackBonus') * lvl, **kwargs)
 
 
 class Effect6704(BaseEffect):
@@ -30958,10 +30836,10 @@ class Effect6704(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         lvl = src.level
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Rig Launcher', 'drawback',
-                                      src.getModifiedItemAttr('rigDrawbackBonus') * lvl)
+                                      src.getModifiedItemAttr('rigDrawbackBonus') * lvl, **kwargs)
 
 
 class Effect6705(BaseEffect):
@@ -30975,10 +30853,10 @@ class Effect6705(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         lvl = src.level
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Rig Shield', 'drawback',
-                                      src.getModifiedItemAttr('rigDrawbackBonus') * lvl)
+                                      src.getModifiedItemAttr('rigDrawbackBonus') * lvl, **kwargs)
 
 
 class Effect6706(BaseEffect):
@@ -30993,9 +30871,9 @@ class Effect6706(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.appliedImplants.filteredItemMultiply(lambda mod: mod.item.requiresSkill('Cybernetics'),
-                                                 'armorRepairBonus', src.getModifiedItemAttr('implantSetSerpentis2'))
+                                                 'armorRepairBonus', src.getModifiedItemAttr('implantSetSerpentis2'), **kwargs)
 
 
 class Effect6708(BaseEffect):
@@ -31009,9 +30887,9 @@ class Effect6708(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Repair Systems'),
-                                      'armorDamageAmount', src.getModifiedItemAttr('armorRepairBonus'))
+                                      'armorDamageAmount', src.getModifiedItemAttr('armorRepairBonus'), **kwargs)
 
 
 class Effect6709(BaseEffect):
@@ -31025,9 +30903,9 @@ class Effect6709(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Capital Hybrid Turret'),
-                                      'damageMultiplier', ship.getModifiedItemAttr('shipBonusRole1'))
+                                      'damageMultiplier', ship.getModifiedItemAttr('shipBonusRole1'), **kwargs)
 
 
 class Effect6710(BaseEffect):
@@ -31041,9 +30919,9 @@ class Effect6710(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Stasis Web', 'speedFactor',
-                                      src.getModifiedItemAttr('shipBonusDreadnoughtM1'), skill='Minmatar Dreadnought')
+                                      src.getModifiedItemAttr('shipBonusDreadnoughtM1'), skill='Minmatar Dreadnought', **kwargs)
 
 
 class Effect6711(BaseEffect):
@@ -31057,9 +30935,9 @@ class Effect6711(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Capital Hybrid Turret'), 'damageMultiplier',
-                                      src.getModifiedItemAttr('shipBonusRole3'))
+                                      src.getModifiedItemAttr('shipBonusRole3'), **kwargs)
 
 
 class Effect6712(BaseEffect):
@@ -31073,9 +30951,9 @@ class Effect6712(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Stasis Web', 'speedFactor',
-                                      src.getModifiedItemAttr('shipBonusTitanM1'), skill='Minmatar Titan')
+                                      src.getModifiedItemAttr('shipBonusTitanM1'), skill='Minmatar Titan', **kwargs)
 
 
 class Effect6713(BaseEffect):
@@ -31090,9 +30968,9 @@ class Effect6713(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Burst Projector Operation'), 'speedFactor',
-                                      src.getModifiedItemAttr('shipBonusSupercarrierM1'), skill='Minmatar Carrier')
+                                      src.getModifiedItemAttr('shipBonusSupercarrierM1'), skill='Minmatar Carrier', **kwargs)
 
 
 class Effect6714(BaseEffect):
@@ -31129,15 +31007,15 @@ class Effect6717(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Mining'), 'capacitorNeed',
-                                      src.getModifiedItemAttr('miningDurationRoleBonus'))
+                                      src.getModifiedItemAttr('miningDurationRoleBonus'), **kwargs)
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Mining'), 'duration',
-                                      src.getModifiedItemAttr('miningDurationRoleBonus'))
+                                      src.getModifiedItemAttr('miningDurationRoleBonus'), **kwargs)
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Ice Harvesting'), 'duration',
-                                      src.getModifiedItemAttr('miningDurationRoleBonus'))
+                                      src.getModifiedItemAttr('miningDurationRoleBonus'), **kwargs)
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Ice Harvesting'), 'capacitorNeed',
-                                      src.getModifiedItemAttr('miningDurationRoleBonus'))
+                                      src.getModifiedItemAttr('miningDurationRoleBonus'), **kwargs)
 
 
 class Effect6720(BaseEffect):
@@ -31151,13 +31029,13 @@ class Effect6720(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Drones'), 'shieldBonus',
-                                     src.getModifiedItemAttr('shipBonusMC'), skill='Minmatar Cruiser')
+                                     src.getModifiedItemAttr('shipBonusMC'), skill='Minmatar Cruiser', **kwargs)
         fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Drones'), 'structureDamageAmount',
-                                     src.getModifiedItemAttr('shipBonusMC'), skill='Minmatar Cruiser')
+                                     src.getModifiedItemAttr('shipBonusMC'), skill='Minmatar Cruiser', **kwargs)
         fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Drones'), 'armorDamageAmount',
-                                     src.getModifiedItemAttr('shipBonusMC'), skill='Minmatar Cruiser')
+                                     src.getModifiedItemAttr('shipBonusMC'), skill='Minmatar Cruiser', **kwargs)
 
 
 class Effect6721(BaseEffect):
@@ -31171,15 +31049,15 @@ class Effect6721(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Remote Armor Repair Systems'),
                                       'falloffEffectiveness',
                                       src.getModifiedItemAttr('eliteBonusLogistics1'),
-                                      skill='Logistics Cruisers')
+                                      skill='Logistics Cruisers', **kwargs)
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Remote Armor Repair Systems'),
                                       'maxRange',
                                       src.getModifiedItemAttr('eliteBonusLogistics1'),
-                                      skill='Logistics Cruisers')
+                                      skill='Logistics Cruisers', **kwargs)
 
 
 class Effect6722(BaseEffect):
@@ -31193,13 +31071,13 @@ class Effect6722(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Remote Armor Repair Systems'),
                                       'falloffEffectiveness',
-                                      src.getModifiedItemAttr('roleBonusRepairRange'))
+                                      src.getModifiedItemAttr('roleBonusRepairRange'), **kwargs)
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Remote Armor Repair Systems'),
                                       'maxRange',
-                                      src.getModifiedItemAttr('roleBonusRepairRange'))
+                                      src.getModifiedItemAttr('roleBonusRepairRange'), **kwargs)
 
 
 class Effect6723(BaseEffect):
@@ -31213,9 +31091,9 @@ class Effect6723(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Cloaking'), 'cpu',
-                                      src.getModifiedItemAttr('shipBonusMC2'), skill='Minmatar Cruiser')
+                                      src.getModifiedItemAttr('shipBonusMC2'), skill='Minmatar Cruiser', **kwargs)
 
 
 class Effect6724(BaseEffect):
@@ -31229,9 +31107,9 @@ class Effect6724(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Remote Armor Repair Systems'), 'duration',
-                                      src.getModifiedItemAttr('eliteBonusLogistics3'), skill='Logistics Cruisers')
+                                      src.getModifiedItemAttr('eliteBonusLogistics3'), skill='Logistics Cruisers', **kwargs)
 
 
 class Effect6725(BaseEffect):
@@ -31245,9 +31123,9 @@ class Effect6725(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Energy Turret'), 'falloff',
-                                      src.getModifiedItemAttr('shipBonus2AF'), skill='Amarr Frigate')
+                                      src.getModifiedItemAttr('shipBonus2AF'), skill='Amarr Frigate', **kwargs)
 
 
 class Effect6726(BaseEffect):
@@ -31261,9 +31139,9 @@ class Effect6726(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Cloaking'), 'cpu',
-                                      src.getModifiedItemAttr('shipBonusMF'), skill='Minmatar Frigate')
+                                      src.getModifiedItemAttr('shipBonusMF'), skill='Minmatar Frigate', **kwargs)
 
 
 class Effect6727(BaseEffect):
@@ -31277,10 +31155,10 @@ class Effect6727(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in ('Energy Nosferatu', 'Energy Neutralizer'),
                                       'falloffEffectiveness', src.getModifiedItemAttr('eliteBonusCovertOps1'),
-                                      stackingPenalties=True, skill='Covert Ops')
+                                      stackingPenalties=True, skill='Covert Ops', **kwargs)
 
 
 class Effect6730(BaseEffect):
@@ -31295,14 +31173,14 @@ class Effect6730(BaseEffect):
     type = 'active'
 
     @staticmethod
-    def handler(fit, module, context):
-        fit.ship.increaseItemAttr('mass', module.getModifiedItemAttr('massAddition'))
+    def handler(fit, module, context, **kwargs):
+        fit.ship.increaseItemAttr('mass', module.getModifiedItemAttr('massAddition'), **kwargs)
         speedBoost = module.getModifiedItemAttr('speedFactor')
         mass = fit.ship.getModifiedItemAttr('mass')
         thrust = module.getModifiedItemAttr('speedBoostFactor')
-        fit.ship.boostItemAttr('maxVelocity', speedBoost * thrust / mass)
+        fit.ship.boostItemAttr('maxVelocity', speedBoost * thrust / mass, **kwargs)
         fit.ship.boostItemAttr('signatureRadius', module.getModifiedItemAttr('signatureRadiusBonus'),
-                               stackingPenalties=True)
+                               stackingPenalties=True, **kwargs)
 
 
 class Effect6731(BaseEffect):
@@ -31317,12 +31195,12 @@ class Effect6731(BaseEffect):
     type = 'active'
 
     @staticmethod
-    def handler(fit, module, context):
-        fit.ship.increaseItemAttr('mass', module.getModifiedItemAttr('massAddition'))
+    def handler(fit, module, context, **kwargs):
+        fit.ship.increaseItemAttr('mass', module.getModifiedItemAttr('massAddition'), **kwargs)
         speedBoost = module.getModifiedItemAttr('speedFactor')
         mass = fit.ship.getModifiedItemAttr('mass')
         thrust = module.getModifiedItemAttr('speedBoostFactor')
-        fit.ship.boostItemAttr('maxVelocity', speedBoost * thrust / mass)
+        fit.ship.boostItemAttr('maxVelocity', speedBoost * thrust / mass, **kwargs)
 
 
 class Effect6732(BaseEffect):
@@ -31441,10 +31319,10 @@ class Effect6737(BaseEffect):
     type = 'active'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         for x in range(1, 4):
             value = module.getModifiedChargeAttr('warfareBuff{}Multiplier'.format(x))
-            module.multiplyItemAttr('warfareBuff{}Value'.format(x), value)
+            module.multiplyItemAttr('warfareBuff{}Value'.format(x), value, **kwargs)
 
 
 class Effect6753(BaseEffect):
@@ -31479,12 +31357,12 @@ class Effect6762(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         lvl = src.level
         fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Mining Drone Specialization'), 'miningAmount',
-                                     src.getModifiedItemAttr('miningAmountBonus') * lvl)
+                                     src.getModifiedItemAttr('miningAmountBonus') * lvl, **kwargs)
         fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Mining Drone Specialization'), 'maxVelocity',
-                                     src.getModifiedItemAttr('maxVelocityBonus') * lvl)
+                                     src.getModifiedItemAttr('maxVelocityBonus') * lvl, **kwargs)
 
 
 class Effect6763(BaseEffect):
@@ -31499,9 +31377,9 @@ class Effect6763(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         lvl = src.level if 'skill' in context else 1
-        fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Ice Harvesting Drone Operation'), 'duration', src.getModifiedItemAttr('rofBonus') * lvl)
+        fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Ice Harvesting Drone Operation'), 'duration', src.getModifiedItemAttr('rofBonus') * lvl, **kwargs)
 
 
 class Effect6764(BaseEffect):
@@ -31515,12 +31393,12 @@ class Effect6764(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         lvl = src.level
         fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Ice Harvesting Drone Specialization'), 'duration',
-                                     src.getModifiedItemAttr('rofBonus') * lvl)
+                                     src.getModifiedItemAttr('rofBonus') * lvl, **kwargs)
         fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Ice Harvesting Drone Specialization'),
-                                     'maxVelocity', src.getModifiedItemAttr('maxVelocityBonus') * lvl)
+                                     'maxVelocity', src.getModifiedItemAttr('maxVelocityBonus') * lvl, **kwargs)
 
 
 class Effect6765(BaseEffect):
@@ -31534,10 +31412,10 @@ class Effect6765(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         lvl = src.level
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Spatial Phenomena Generation'), 'buffDuration',
-                                      src.getModifiedItemAttr('durationBonus') * lvl)
+                                      src.getModifiedItemAttr('durationBonus') * lvl, **kwargs)
 
 
 class Effect6766(BaseEffect):
@@ -31551,11 +31429,11 @@ class Effect6766(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemIncrease(lambda mod: mod.item.requiresSkill('Leadership'), 'maxGroupActive',
-                                         src.getModifiedItemAttr('maxGangModules'))
+                                         src.getModifiedItemAttr('maxGangModules'), **kwargs)
         fit.modules.filteredItemIncrease(lambda mod: mod.item.requiresSkill('Leadership'), 'maxGroupOnline',
-                                         src.getModifiedItemAttr('maxGangModules'))
+                                         src.getModifiedItemAttr('maxGangModules'), **kwargs)
 
 
 class Effect6769(BaseEffect):
@@ -31571,9 +31449,9 @@ class Effect6769(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Leadership'), 'maxRange',
-                                      src.getModifiedItemAttr('areaOfEffectBonus') * src.level)
+                                      src.getModifiedItemAttr('areaOfEffectBonus') * src.level, **kwargs)
 
 
 class Effect6770(BaseEffect):
@@ -31587,10 +31465,10 @@ class Effect6770(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         lvl = src.level
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Armored Command'), 'buffDuration',
-                                      src.getModifiedItemAttr('durationBonus') * lvl)
+                                      src.getModifiedItemAttr('durationBonus') * lvl, **kwargs)
 
 
 class Effect6771(BaseEffect):
@@ -31604,10 +31482,10 @@ class Effect6771(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         lvl = src.level
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Command'), 'buffDuration',
-                                      src.getModifiedItemAttr('durationBonus') * lvl)
+                                      src.getModifiedItemAttr('durationBonus') * lvl, **kwargs)
 
 
 class Effect6772(BaseEffect):
@@ -31621,10 +31499,10 @@ class Effect6772(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         lvl = src.level
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Information Command'), 'buffDuration',
-                                      src.getModifiedItemAttr('durationBonus') * lvl)
+                                      src.getModifiedItemAttr('durationBonus') * lvl, **kwargs)
 
 
 class Effect6773(BaseEffect):
@@ -31638,10 +31516,10 @@ class Effect6773(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         lvl = src.level
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Skirmish Command'), 'buffDuration',
-                                      src.getModifiedItemAttr('durationBonus') * lvl)
+                                      src.getModifiedItemAttr('durationBonus') * lvl, **kwargs)
 
 
 class Effect6774(BaseEffect):
@@ -31655,10 +31533,10 @@ class Effect6774(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         lvl = src.level
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Mining Foreman'), 'buffDuration',
-                                      src.getModifiedItemAttr('durationBonus') * lvl)
+                                      src.getModifiedItemAttr('durationBonus') * lvl, **kwargs)
 
 
 class Effect6776(BaseEffect):
@@ -31672,16 +31550,16 @@ class Effect6776(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         lvl = src.level
         fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill('Armored Command'), 'warfareBuff1Multiplier',
-                                        src.getModifiedItemAttr('commandStrengthBonus') * lvl)
+                                        src.getModifiedItemAttr('commandStrengthBonus') * lvl, **kwargs)
         fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill('Armored Command'), 'warfareBuff2Multiplier',
-                                        src.getModifiedItemAttr('commandStrengthBonus') * lvl)
+                                        src.getModifiedItemAttr('commandStrengthBonus') * lvl, **kwargs)
         fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill('Armored Command'), 'warfareBuff4Multiplier',
-                                        src.getModifiedItemAttr('commandStrengthBonus') * lvl)
+                                        src.getModifiedItemAttr('commandStrengthBonus') * lvl, **kwargs)
         fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill('Armored Command'), 'warfareBuff3Multiplier',
-                                        src.getModifiedItemAttr('commandStrengthBonus') * lvl)
+                                        src.getModifiedItemAttr('commandStrengthBonus') * lvl, **kwargs)
 
 
 class Effect6777(BaseEffect):
@@ -31695,16 +31573,16 @@ class Effect6777(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         lvl = src.level
         fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill('Shield Command'), 'warfareBuff3Multiplier',
-                                        src.getModifiedItemAttr('commandStrengthBonus') * lvl)
+                                        src.getModifiedItemAttr('commandStrengthBonus') * lvl, **kwargs)
         fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill('Shield Command'), 'warfareBuff1Multiplier',
-                                        src.getModifiedItemAttr('commandStrengthBonus') * lvl)
+                                        src.getModifiedItemAttr('commandStrengthBonus') * lvl, **kwargs)
         fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill('Shield Command'), 'warfareBuff2Multiplier',
-                                        src.getModifiedItemAttr('commandStrengthBonus') * lvl)
+                                        src.getModifiedItemAttr('commandStrengthBonus') * lvl, **kwargs)
         fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill('Shield Command'), 'warfareBuff4Multiplier',
-                                        src.getModifiedItemAttr('commandStrengthBonus') * lvl)
+                                        src.getModifiedItemAttr('commandStrengthBonus') * lvl, **kwargs)
 
 
 class Effect6778(BaseEffect):
@@ -31718,16 +31596,16 @@ class Effect6778(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         lvl = src.level
         fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill('Information Command'), 'warfareBuff2Multiplier',
-                                        src.getModifiedItemAttr('commandStrengthBonus') * lvl)
+                                        src.getModifiedItemAttr('commandStrengthBonus') * lvl, **kwargs)
         fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill('Information Command'), 'warfareBuff1Multiplier',
-                                        src.getModifiedItemAttr('commandStrengthBonus') * lvl)
+                                        src.getModifiedItemAttr('commandStrengthBonus') * lvl, **kwargs)
         fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill('Information Command'), 'warfareBuff3Multiplier',
-                                        src.getModifiedItemAttr('commandStrengthBonus') * lvl)
+                                        src.getModifiedItemAttr('commandStrengthBonus') * lvl, **kwargs)
         fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill('Information Command'), 'warfareBuff4Multiplier',
-                                        src.getModifiedItemAttr('commandStrengthBonus') * lvl)
+                                        src.getModifiedItemAttr('commandStrengthBonus') * lvl, **kwargs)
 
 
 class Effect6779(BaseEffect):
@@ -31741,16 +31619,16 @@ class Effect6779(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         lvl = src.level
         fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill('Skirmish Command'), 'warfareBuff3Multiplier',
-                                        src.getModifiedItemAttr('commandStrengthBonus') * lvl)
+                                        src.getModifiedItemAttr('commandStrengthBonus') * lvl, **kwargs)
         fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill('Skirmish Command'), 'warfareBuff4Multiplier',
-                                        src.getModifiedItemAttr('commandStrengthBonus') * lvl)
+                                        src.getModifiedItemAttr('commandStrengthBonus') * lvl, **kwargs)
         fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill('Skirmish Command'), 'warfareBuff1Multiplier',
-                                        src.getModifiedItemAttr('commandStrengthBonus') * lvl)
+                                        src.getModifiedItemAttr('commandStrengthBonus') * lvl, **kwargs)
         fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill('Skirmish Command'), 'warfareBuff2Multiplier',
-                                        src.getModifiedItemAttr('commandStrengthBonus') * lvl)
+                                        src.getModifiedItemAttr('commandStrengthBonus') * lvl, **kwargs)
 
 
 class Effect6780(BaseEffect):
@@ -31764,12 +31642,12 @@ class Effect6780(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         lvl = src.level
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Mining Foreman'), 'warfareBuff4Value', src.getModifiedItemAttr('commandStrengthBonus') * lvl)
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Mining Foreman'), 'warfareBuff3Value', src.getModifiedItemAttr('commandStrengthBonus') * lvl)
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Mining Foreman'), 'warfareBuff2Value', src.getModifiedItemAttr('commandStrengthBonus') * lvl)
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Mining Foreman'), 'warfareBuff1Value', src.getModifiedItemAttr('commandStrengthBonus') * lvl)
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Mining Foreman'), 'warfareBuff4Value', src.getModifiedItemAttr('commandStrengthBonus') * lvl, **kwargs)
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Mining Foreman'), 'warfareBuff3Value', src.getModifiedItemAttr('commandStrengthBonus') * lvl, **kwargs)
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Mining Foreman'), 'warfareBuff2Value', src.getModifiedItemAttr('commandStrengthBonus') * lvl, **kwargs)
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Mining Foreman'), 'warfareBuff1Value', src.getModifiedItemAttr('commandStrengthBonus') * lvl, **kwargs)
 
 
 class Effect6782(BaseEffect):
@@ -31783,11 +31661,11 @@ class Effect6782(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         lvl = src.level
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Leadership'),
                                       'reloadTime',
-                                      src.getModifiedItemAttr('reloadTimeBonus') * lvl)
+                                      src.getModifiedItemAttr('reloadTimeBonus') * lvl, **kwargs)
 
 
 class Effect6783(BaseEffect):
@@ -31809,9 +31687,9 @@ class Effect6783(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Leadership'), 'maxRange',
-                                      src.getModifiedItemAttr('roleBonusCommandBurstAoERange'))
+                                      src.getModifiedItemAttr('roleBonusCommandBurstAoERange'), **kwargs)
 
 
 class Effect6786(BaseEffect):
@@ -31825,17 +31703,17 @@ class Effect6786(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Command'), 'warfareBuff4Multiplier',
-                                      src.getModifiedItemAttr('shipBonusICS3'), skill='Industrial Command Ships')
+                                      src.getModifiedItemAttr('shipBonusICS3'), skill='Industrial Command Ships', **kwargs)
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Command'), 'warfareBuff1Multiplier',
-                                      src.getModifiedItemAttr('shipBonusICS3'), skill='Industrial Command Ships')
+                                      src.getModifiedItemAttr('shipBonusICS3'), skill='Industrial Command Ships', **kwargs)
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Command'), 'warfareBuff2Multiplier',
-                                      src.getModifiedItemAttr('shipBonusICS3'), skill='Industrial Command Ships')
+                                      src.getModifiedItemAttr('shipBonusICS3'), skill='Industrial Command Ships', **kwargs)
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Command'), 'warfareBuff3Multiplier',
-                                      src.getModifiedItemAttr('shipBonusICS3'), skill='Industrial Command Ships')
+                                      src.getModifiedItemAttr('shipBonusICS3'), skill='Industrial Command Ships', **kwargs)
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Command'), 'buffDuration',
-                                      src.getModifiedItemAttr('shipBonusICS3'), skill='Industrial Command Ships')
+                                      src.getModifiedItemAttr('shipBonusICS3'), skill='Industrial Command Ships', **kwargs)
 
 
 class Effect6787(BaseEffect):
@@ -31849,36 +31727,31 @@ class Effect6787(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Drones'),
                                      'damageMultiplier',
                                      src.getModifiedItemAttr('shipBonusICS4'),
-                                     skill='Industrial Command Ships'
-                                     )
+                                     skill='Industrial Command Ships', **kwargs)
 
         fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Drones'),
                                      'shieldCapacity',
                                      src.getModifiedItemAttr('shipBonusICS4'),
-                                     skill='Industrial Command Ships'
-                                     )
+                                     skill='Industrial Command Ships', **kwargs)
 
         fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Drones'),
                                      'armorHP',
                                      src.getModifiedItemAttr('shipBonusICS4'),
-                                     skill='Industrial Command Ships'
-                                     )
+                                     skill='Industrial Command Ships', **kwargs)
 
         fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Drones'),
                                      'hp',
                                      src.getModifiedItemAttr('shipBonusICS4'),
-                                     skill='Industrial Command Ships'
-                                     )
+                                     skill='Industrial Command Ships', **kwargs)
 
         fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Mining Drone Operation'),
                                      'miningAmount',
                                      src.getModifiedItemAttr('shipBonusICS4'),
-                                     skill='Industrial Command Ships'
-                                     )
+                                     skill='Industrial Command Ships', **kwargs)
 
 
 class Effect6788(BaseEffect):
@@ -31892,12 +31765,11 @@ class Effect6788(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Ice Harvesting Drone Operation'),
                                      'duration',
                                      src.getModifiedItemAttr('shipBonusICS5'),
-                                     skill='Industrial Command Ships'
-                                     )
+                                     skill='Industrial Command Ships', **kwargs)
 
 
 class Effect6789(BaseEffect):
@@ -31918,10 +31790,10 @@ class Effect6789(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Drones'),
                                      'damageMultiplier',
-                                     src.getModifiedItemAttr('industrialBonusDroneDamage'))
+                                     src.getModifiedItemAttr('industrialBonusDroneDamage'), **kwargs)
 
 
 class Effect6790(BaseEffect):
@@ -31935,9 +31807,9 @@ class Effect6790(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Ice Harvesting Drone Operation'), 'duration',
-                                     src.getModifiedItemAttr('roleBonusDroneIceHarvestingSpeed'))
+                                     src.getModifiedItemAttr('roleBonusDroneIceHarvestingSpeed'), **kwargs)
 
 
 class Effect6792(BaseEffect):
@@ -31951,36 +31823,31 @@ class Effect6792(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Drones'),
                                      'damageMultiplier',
                                      src.getModifiedItemAttr('shipBonusORECapital4'),
-                                     skill='Capital Industrial Ships'
-                                     )
+                                     skill='Capital Industrial Ships', **kwargs)
 
         fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Drones'),
                                      'shieldCapacity',
                                      src.getModifiedItemAttr('shipBonusORECapital4'),
-                                     skill='Capital Industrial Ships'
-                                     )
+                                     skill='Capital Industrial Ships', **kwargs)
 
         fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Drones'),
                                      'armorHP',
                                      src.getModifiedItemAttr('shipBonusORECapital4'),
-                                     skill='Capital Industrial Ships'
-                                     )
+                                     skill='Capital Industrial Ships', **kwargs)
 
         fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Drones'),
                                      'hp',
                                      src.getModifiedItemAttr('shipBonusORECapital4'),
-                                     skill='Capital Industrial Ships'
-                                     )
+                                     skill='Capital Industrial Ships', **kwargs)
 
         fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Mining Drone Operation'),
                                      'miningAmount',
                                      src.getModifiedItemAttr('shipBonusORECapital4'),
-                                     skill='Capital Industrial Ships'
-                                     )
+                                     skill='Capital Industrial Ships', **kwargs)
 
 
 class Effect6793(BaseEffect):
@@ -31994,17 +31861,17 @@ class Effect6793(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Mining Foreman'), 'warfareBuff1Value',
-                                      src.getModifiedItemAttr('shipBonusORECapital2'), skill='Capital Industrial Ships')
+                                      src.getModifiedItemAttr('shipBonusORECapital2'), skill='Capital Industrial Ships', **kwargs)
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Mining Foreman'), 'warfareBuff2Value',
-                                      src.getModifiedItemAttr('shipBonusORECapital2'), skill='Capital Industrial Ships')
+                                      src.getModifiedItemAttr('shipBonusORECapital2'), skill='Capital Industrial Ships', **kwargs)
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Mining Foreman'), 'warfareBuff4Value',
-                                      src.getModifiedItemAttr('shipBonusORECapital2'), skill='Capital Industrial Ships')
+                                      src.getModifiedItemAttr('shipBonusORECapital2'), skill='Capital Industrial Ships', **kwargs)
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Mining Foreman'), 'warfareBuff3Value',
-                                      src.getModifiedItemAttr('shipBonusORECapital2'), skill='Capital Industrial Ships')
+                                      src.getModifiedItemAttr('shipBonusORECapital2'), skill='Capital Industrial Ships', **kwargs)
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Mining Foreman'), 'buffDuration',
-                                      src.getModifiedItemAttr('shipBonusORECapital2'), skill='Capital Industrial Ships')
+                                      src.getModifiedItemAttr('shipBonusORECapital2'), skill='Capital Industrial Ships', **kwargs)
 
 
 class Effect6794(BaseEffect):
@@ -32018,17 +31885,17 @@ class Effect6794(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Command'), 'warfareBuff4Value',
-                                      src.getModifiedItemAttr('shipBonusORECapital3'), skill='Capital Industrial Ships')
+                                      src.getModifiedItemAttr('shipBonusORECapital3'), skill='Capital Industrial Ships', **kwargs)
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Command'), 'buffDuration',
-                                      src.getModifiedItemAttr('shipBonusORECapital3'), skill='Capital Industrial Ships')
+                                      src.getModifiedItemAttr('shipBonusORECapital3'), skill='Capital Industrial Ships', **kwargs)
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Command'), 'warfareBuff1Value',
-                                      src.getModifiedItemAttr('shipBonusORECapital3'), skill='Capital Industrial Ships')
+                                      src.getModifiedItemAttr('shipBonusORECapital3'), skill='Capital Industrial Ships', **kwargs)
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Command'), 'warfareBuff3Value',
-                                      src.getModifiedItemAttr('shipBonusORECapital3'), skill='Capital Industrial Ships')
+                                      src.getModifiedItemAttr('shipBonusORECapital3'), skill='Capital Industrial Ships', **kwargs)
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Command'), 'warfareBuff2Value',
-                                      src.getModifiedItemAttr('shipBonusORECapital3'), skill='Capital Industrial Ships')
+                                      src.getModifiedItemAttr('shipBonusORECapital3'), skill='Capital Industrial Ships', **kwargs)
 
 
 class Effect6795(BaseEffect):
@@ -32042,12 +31909,11 @@ class Effect6795(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Ice Harvesting Drone Operation'),
                                      'duration',
                                      src.getModifiedItemAttr('shipBonusORECapital5'),
-                                     skill='Capital Industrial Ships'
-                                     )
+                                     skill='Capital Industrial Ships', **kwargs)
 
 
 class Effect6796(BaseEffect):
@@ -32061,14 +31927,13 @@ class Effect6796(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         fit.modules.filteredItemMultiply(
             lambda mod: mod.item.requiresSkill('Small Hybrid Turret'),
             'damageMultiplier',
             1 / module.getModifiedItemAttr('modeDamageBonusPostDiv'),
             stackingPenalties=True,
-            penaltyGroup='postDiv'
-        )
+            penaltyGroup='postDiv', **kwargs)
 
 
 class Effect6797(BaseEffect):
@@ -32082,14 +31947,13 @@ class Effect6797(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         fit.modules.filteredItemMultiply(
             lambda mod: mod.item.requiresSkill('Small Projectile Turret'),
             'damageMultiplier',
             1 / module.getModifiedItemAttr('modeDamageBonusPostDiv'),
             stackingPenalties=True,
-            penaltyGroup='postDiv'
-        )
+            penaltyGroup='postDiv', **kwargs)
 
 
 class Effect6798(BaseEffect):
@@ -32103,14 +31967,13 @@ class Effect6798(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         fit.modules.filteredItemMultiply(
             lambda mod: mod.item.requiresSkill('Small Energy Turret'),
             'damageMultiplier',
             1 / module.getModifiedItemAttr('modeDamageBonusPostDiv'),
             stackingPenalties=True,
-            penaltyGroup='postDiv'
-        )
+            penaltyGroup='postDiv', **kwargs)
 
 
 class Effect6799(BaseEffect):
@@ -32124,14 +31987,14 @@ class Effect6799(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         types = ('thermal', 'em', 'explosive', 'kinetic')
         for type in types:
             fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill('Rockets') or mod.charge.requiresSkill('Light Missiles'),
                                                '{}Damage'.format(type),
                                                1 / module.getModifiedItemAttr('modeDamageBonusPostDiv'),
                                                stackingPenalties=True,
-                                               penaltyGroup='postDiv')
+                                               penaltyGroup='postDiv', **kwargs)
 
 
 class Effect6800(BaseEffect):
@@ -32145,9 +32008,9 @@ class Effect6800(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
-        fit.ship.multiplyItemAttr('weaponDisruptionResistance', 1 / module.getModifiedItemAttr('modeEwarResistancePostDiv'))
-        fit.ship.multiplyItemAttr('sensorDampenerResistance', 1 / module.getModifiedItemAttr('modeEwarResistancePostDiv'))
+    def handler(fit, module, context, **kwargs):
+        fit.ship.multiplyItemAttr('weaponDisruptionResistance', 1 / module.getModifiedItemAttr('modeEwarResistancePostDiv'), **kwargs)
+        fit.ship.multiplyItemAttr('sensorDampenerResistance', 1 / module.getModifiedItemAttr('modeEwarResistancePostDiv'), **kwargs)
 
 
 class Effect6801(BaseEffect):
@@ -32162,14 +32025,13 @@ class Effect6801(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         fit.modules.filteredItemMultiply(
             lambda mod: mod.item.requiresSkill('High Speed Maneuvering') or mod.item.requiresSkill('Afterburner'),
             'speedFactor',
             1 / module.getModifiedItemAttr('modeVelocityPostDiv'),
             stackingPenalties=True,
-            penaltyGroup='postDiv'
-        )
+            penaltyGroup='postDiv', **kwargs)
 
 
 class Effect6807(BaseEffect):
@@ -32183,12 +32045,12 @@ class Effect6807(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         lvl = src.level
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Invulnerability Core Operation'), 'buffDuration',
-                                      src.getModifiedItemAttr('durationBonus') * lvl)
+                                      src.getModifiedItemAttr('durationBonus') * lvl, **kwargs)
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Invulnerability Core Operation'), 'duration',
-                                      src.getModifiedItemAttr('durationBonus') * lvl)
+                                      src.getModifiedItemAttr('durationBonus') * lvl, **kwargs)
 
 
 class Effect6844(BaseEffect):
@@ -32202,9 +32064,9 @@ class Effect6844(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, skill, context):
+    def handler(fit, skill, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Defender Missiles'),
-                                        'maxVelocity', skill.getModifiedItemAttr('missileVelocityBonus') * skill.level)
+                                        'maxVelocity', skill.getModifiedItemAttr('missileVelocityBonus') * skill.level, **kwargs)
 
 
 class Effect6845(BaseEffect):
@@ -32218,9 +32080,9 @@ class Effect6845(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Defender Missiles'),
-                                      'moduleReactivationDelay', ship.getModifiedItemAttr('shipBonusRole1'))
+                                      'moduleReactivationDelay', ship.getModifiedItemAttr('shipBonusRole1'), **kwargs)
 
 
 class Effect6851(BaseEffect):
@@ -32235,8 +32097,8 @@ class Effect6851(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Capital Energy Turret'), 'damageMultiplier', src.getModifiedItemAttr('shipBonusRole3'))
+    def handler(fit, src, context, **kwargs):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Capital Energy Turret'), 'damageMultiplier', src.getModifiedItemAttr('shipBonusRole3'), **kwargs)
 
 
 class Effect6852(BaseEffect):
@@ -32250,9 +32112,9 @@ class Effect6852(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Stasis Web',
-                                      'maxRange', src.getModifiedItemAttr('shipBonusTitanM1'), skill='Minmatar Titan')
+                                      'maxRange', src.getModifiedItemAttr('shipBonusTitanM1'), skill='Minmatar Titan', **kwargs)
 
 
 class Effect6853(BaseEffect):
@@ -32266,11 +32128,11 @@ class Effect6853(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Energy Nosferatu',
-                                      'powerTransferAmount', src.getModifiedItemAttr('shipBonusTitanA1'), skill='Amarr Titan')
+                                      'powerTransferAmount', src.getModifiedItemAttr('shipBonusTitanA1'), skill='Amarr Titan', **kwargs)
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Energy Neutralizer',
-                                      'energyNeutralizerAmount', src.getModifiedItemAttr('shipBonusTitanA1'), skill='Amarr Titan')
+                                      'energyNeutralizerAmount', src.getModifiedItemAttr('shipBonusTitanA1'), skill='Amarr Titan', **kwargs)
 
 
 class Effect6855(BaseEffect):
@@ -32284,11 +32146,11 @@ class Effect6855(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Energy Nosferatu',
-                                      'powerTransferAmount', src.getModifiedItemAttr('shipBonusDreadnoughtA1'), skill='Amarr Dreadnought')
+                                      'powerTransferAmount', src.getModifiedItemAttr('shipBonusDreadnoughtA1'), skill='Amarr Dreadnought', **kwargs)
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Energy Neutralizer',
-                                      'energyNeutralizerAmount', src.getModifiedItemAttr('shipBonusDreadnoughtA1'), skill='Amarr Dreadnought')
+                                      'energyNeutralizerAmount', src.getModifiedItemAttr('shipBonusDreadnoughtA1'), skill='Amarr Dreadnought', **kwargs)
 
 
 class Effect6856(BaseEffect):
@@ -32302,9 +32164,9 @@ class Effect6856(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Stasis Web',
-                                      'maxRange', src.getModifiedItemAttr('shipBonusDreadnoughtM1'), skill='Minmatar Dreadnought')
+                                      'maxRange', src.getModifiedItemAttr('shipBonusDreadnoughtM1'), skill='Minmatar Dreadnought', **kwargs)
 
 
 class Effect6857(BaseEffect):
@@ -32318,11 +32180,11 @@ class Effect6857(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Energy Nosferatu',
-                                      'maxRange', src.getModifiedItemAttr('shipBonusForceAuxiliaryA1'), skill='Amarr Carrier')
+                                      'maxRange', src.getModifiedItemAttr('shipBonusForceAuxiliaryA1'), skill='Amarr Carrier', **kwargs)
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Energy Nosferatu',
-                                      'falloffEffectiveness', src.getModifiedItemAttr('shipBonusForceAuxiliaryA1'), skill='Amarr Carrier')
+                                      'falloffEffectiveness', src.getModifiedItemAttr('shipBonusForceAuxiliaryA1'), skill='Amarr Carrier', **kwargs)
 
 
 class Effect6858(BaseEffect):
@@ -32336,9 +32198,9 @@ class Effect6858(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Energy Nosferatu',
-                                      'powerTransferAmount', src.getModifiedItemAttr('shipBonusForceAuxiliaryA1'), skill='Amarr Carrier')
+                                      'powerTransferAmount', src.getModifiedItemAttr('shipBonusForceAuxiliaryA1'), skill='Amarr Carrier', **kwargs)
 
 
 class Effect6859(BaseEffect):
@@ -32353,8 +32215,8 @@ class Effect6859(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
-        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Energy Nosferatu', 'cpu', src.getModifiedItemAttr('shipBonusRole4'))
+    def handler(fit, src, context, **kwargs):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Energy Nosferatu', 'cpu', src.getModifiedItemAttr('shipBonusRole4'), **kwargs)
 
 
 class Effect6860(BaseEffect):
@@ -32368,9 +32230,9 @@ class Effect6860(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Remote Armor Repair Systems'), 'power',
-                                      src.getModifiedItemAttr('shipBonusRole5'))
+                                      src.getModifiedItemAttr('shipBonusRole5'), **kwargs)
 
 
 class Effect6861(BaseEffect):
@@ -32384,8 +32246,8 @@ class Effect6861(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Capital Remote Armor Repair Systems'), 'power', src.getModifiedItemAttr('shipBonusRole5'))
+    def handler(fit, src, context, **kwargs):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Capital Remote Armor Repair Systems'), 'power', src.getModifiedItemAttr('shipBonusRole5'), **kwargs)
 
 
 class Effect6862(BaseEffect):
@@ -32399,9 +32261,9 @@ class Effect6862(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Remote Armor Repair Systems'),
-                                      'duration', src.getModifiedItemAttr('shipBonusForceAuxiliaryM1'), skill='Minmatar Carrier')
+                                      'duration', src.getModifiedItemAttr('shipBonusForceAuxiliaryM1'), skill='Minmatar Carrier', **kwargs)
 
 
 class Effect6865(BaseEffect):
@@ -32415,8 +32277,8 @@ class Effect6865(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
-        fit.ship.boostItemAttr('warpSpeedMultiplier', src.getModifiedItemAttr('eliteBonusCovertOps1'), skill='Covert Ops')
+    def handler(fit, src, context, **kwargs):
+        fit.ship.boostItemAttr('warpSpeedMultiplier', src.getModifiedItemAttr('eliteBonusCovertOps1'), skill='Covert Ops', **kwargs)
 
 
 class Effect6866(BaseEffect):
@@ -32430,11 +32292,11 @@ class Effect6866(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Rockets'),
-                                        'explosionDelay', src.getModifiedItemAttr('shipBonusCF'), skill='Caldari Frigate')
+                                        'explosionDelay', src.getModifiedItemAttr('shipBonusCF'), skill='Caldari Frigate', **kwargs)
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Light Missiles'),
-                                        'explosionDelay', src.getModifiedItemAttr('shipBonusCF'), skill='Caldari Frigate')
+                                        'explosionDelay', src.getModifiedItemAttr('shipBonusCF'), skill='Caldari Frigate', **kwargs)
 
 
 class Effect6867(BaseEffect):
@@ -32448,9 +32310,9 @@ class Effect6867(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Projectile Turret'),
-                                      'speed', src.getModifiedItemAttr('shipBonusMF'), skill='Minmatar Frigate')
+                                      'speed', src.getModifiedItemAttr('shipBonusMF'), skill='Minmatar Frigate', **kwargs)
 
 
 class Effect6871(BaseEffect):
@@ -32466,7 +32328,7 @@ class Effect6871(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
 
         # Get pilot sec status bonus directly here, instead of going through the intermediary effects
         # via https://forums.eveonline.com/default.aspx?g=posts&t=515826
@@ -32477,9 +32339,9 @@ class Effect6871(BaseEffect):
 
         if bonus is not None:
             fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Repair Systems'),
-                                      'armorDamageAmount', bonus, stackingPenalties=True)
+                                      'armorDamageAmount', bonus, stackingPenalties=True, **kwargs)
             fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Operation'),
-                                      'shieldBonus', bonus, stackingPenalties=True)
+                                      'shieldBonus', bonus, stackingPenalties=True, **kwargs)
 
 
 class Effect6872(BaseEffect):
@@ -32493,8 +32355,8 @@ class Effect6872(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
-        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Stasis Web', 'maxRange', src.getModifiedItemAttr('eliteBonusReconShip1'), skill='Recon Ships')
+    def handler(fit, src, context, **kwargs):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Stasis Web', 'maxRange', src.getModifiedItemAttr('eliteBonusReconShip1'), skill='Recon Ships', **kwargs)
 
 
 class Effect6873(BaseEffect):
@@ -32508,8 +32370,8 @@ class Effect6873(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
-        fit.ship.boostItemAttr('warpSpeedMultiplier', src.getModifiedItemAttr('eliteBonusReconShip3'), skill='Recon Ships')
+    def handler(fit, src, context, **kwargs):
+        fit.ship.boostItemAttr('warpSpeedMultiplier', src.getModifiedItemAttr('eliteBonusReconShip3'), skill='Recon Ships', **kwargs)
 
 
 class Effect6874(BaseEffect):
@@ -32523,11 +32385,11 @@ class Effect6874(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Missiles'),
-                                        'explosionDelay', src.getModifiedItemAttr('shipBonusCC2'), skill='Caldari Cruiser')
+                                        'explosionDelay', src.getModifiedItemAttr('shipBonusCC2'), skill='Caldari Cruiser', **kwargs)
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Assault Missiles'),
-                                        'explosionDelay', src.getModifiedItemAttr('shipBonusCC2'), skill='Caldari Cruiser')
+                                        'explosionDelay', src.getModifiedItemAttr('shipBonusCC2'), skill='Caldari Cruiser', **kwargs)
 
 
 class Effect6877(BaseEffect):
@@ -32541,8 +32403,8 @@ class Effect6877(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
-        fit.ship.boostItemAttr('warpSpeedMultiplier', src.getModifiedItemAttr('eliteBonusBlackOps1'), stackingPenalties=True, skill='Black Ops')
+    def handler(fit, src, context, **kwargs):
+        fit.ship.boostItemAttr('warpSpeedMultiplier', src.getModifiedItemAttr('eliteBonusBlackOps1'), stackingPenalties=True, skill='Black Ops', **kwargs)
 
 
 class Effect6878(BaseEffect):
@@ -32556,9 +32418,9 @@ class Effect6878(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Warp Scrambler', 'maxRange',
-                                      src.getModifiedItemAttr('eliteBonusBlackOps4'), stackingPenalties=True, skill='Black Ops')
+                                      src.getModifiedItemAttr('eliteBonusBlackOps4'), stackingPenalties=True, skill='Black Ops', **kwargs)
 
 
 class Effect6879(BaseEffect):
@@ -32572,9 +32434,9 @@ class Effect6879(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Stasis Web', 'maxRange',
-                                      src.getModifiedItemAttr('eliteBonusBlackOps3'), stackingPenalties=True, skill='Black Ops')
+                                      src.getModifiedItemAttr('eliteBonusBlackOps3'), stackingPenalties=True, skill='Black Ops', **kwargs)
 
 
 class Effect6880(BaseEffect):
@@ -32588,13 +32450,13 @@ class Effect6880(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Missile Launcher Cruise', 'speed',
-                                      src.getModifiedItemAttr('shipBonus2CB'), skill='Caldari Battleship')
+                                      src.getModifiedItemAttr('shipBonus2CB'), skill='Caldari Battleship', **kwargs)
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Missile Launcher Torpedo', 'speed',
-                                      src.getModifiedItemAttr('shipBonus2CB'), skill='Caldari Battleship')
+                                      src.getModifiedItemAttr('shipBonus2CB'), skill='Caldari Battleship', **kwargs)
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Missile Launcher Rapid Heavy', 'speed',
-                                      src.getModifiedItemAttr('shipBonus2CB'), skill='Caldari Battleship')
+                                      src.getModifiedItemAttr('shipBonus2CB'), skill='Caldari Battleship', **kwargs)
 
 
 class Effect6881(BaseEffect):
@@ -32608,11 +32470,11 @@ class Effect6881(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Torpedoes'), 'explosionDelay',
-                                        src.getModifiedItemAttr('shipBonusCB'), skill='Caldari Battleship')
+                                        src.getModifiedItemAttr('shipBonusCB'), skill='Caldari Battleship', **kwargs)
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Cruise Missiles'), 'explosionDelay',
-                                        src.getModifiedItemAttr('shipBonusCB'), skill='Caldari Battleship')
+                                        src.getModifiedItemAttr('shipBonusCB'), skill='Caldari Battleship', **kwargs)
 
 
 class Effect6883(BaseEffect):
@@ -32626,11 +32488,11 @@ class Effect6883(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Repair Systems'),
-                                      'armorDamageAmount', src.getModifiedItemAttr('shipBonusForceAuxiliaryM2'), skill='Minmatar Carrier')
+                                      'armorDamageAmount', src.getModifiedItemAttr('shipBonusForceAuxiliaryM2'), skill='Minmatar Carrier', **kwargs)
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Capital Repair Systems'),
-                                      'armorDamageAmount', src.getModifiedItemAttr('shipBonusForceAuxiliaryM2'), skill='Minmatar Carrier')
+                                      'armorDamageAmount', src.getModifiedItemAttr('shipBonusForceAuxiliaryM2'), skill='Minmatar Carrier', **kwargs)
 
 
 class Effect6894(BaseEffect):
@@ -32644,11 +32506,11 @@ class Effect6894(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in ('Energy Nosferatu', 'Energy Neutralizer'),
-        'cpu', src.getModifiedItemAttr('subsystemEnergyNeutFittingReduction'))
+        'cpu', src.getModifiedItemAttr('subsystemEnergyNeutFittingReduction'), **kwargs)
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in ('Energy Nosferatu', 'Energy Neutralizer'),
-                                      'power', src.getModifiedItemAttr('subsystemEnergyNeutFittingReduction'))
+                                      'power', src.getModifiedItemAttr('subsystemEnergyNeutFittingReduction'), **kwargs)
 
 
 class Effect6895(BaseEffect):
@@ -32662,11 +32524,11 @@ class Effect6895(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Energy Turret'),
-                                      'cpu', src.getModifiedItemAttr('subsystemMETFittingReduction'))
+                                      'cpu', src.getModifiedItemAttr('subsystemMETFittingReduction'), **kwargs)
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Energy Turret'),
-                                      'power', src.getModifiedItemAttr('subsystemMETFittingReduction'))
+                                      'power', src.getModifiedItemAttr('subsystemMETFittingReduction'), **kwargs)
 
 
 class Effect6896(BaseEffect):
@@ -32682,11 +32544,11 @@ class Effect6896(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Hybrid Turret'),
-                                      'cpu', src.getModifiedItemAttr('subsystemMHTFittingReduction'))
+                                      'cpu', src.getModifiedItemAttr('subsystemMHTFittingReduction'), **kwargs)
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Hybrid Turret'),
-                                      'power', src.getModifiedItemAttr('subsystemMHTFittingReduction'))
+                                      'power', src.getModifiedItemAttr('subsystemMHTFittingReduction'), **kwargs)
 
 
 class Effect6897(BaseEffect):
@@ -32700,11 +32562,11 @@ class Effect6897(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Projectile Turret'),
-                                      'power', src.getModifiedItemAttr('subsystemMPTFittingReduction'))
+                                      'power', src.getModifiedItemAttr('subsystemMPTFittingReduction'), **kwargs)
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Projectile Turret'),
-                                      'cpu', src.getModifiedItemAttr('subsystemMPTFittingReduction'))
+                                      'cpu', src.getModifiedItemAttr('subsystemMPTFittingReduction'), **kwargs)
 
 
 class Effect6898(BaseEffect):
@@ -32718,13 +32580,13 @@ class Effect6898(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Remote Armor Repair Systems') and
                                                   mod.getModifiedItemAttr('mediumRemoteRepFittingMultiplier', 0) == 1,
-                                      'cpu', src.getModifiedItemAttr('subsystemMRARFittingReduction'))
+                                      'cpu', src.getModifiedItemAttr('subsystemMRARFittingReduction'), **kwargs)
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Remote Armor Repair Systems') and
                                                   mod.getModifiedItemAttr('mediumRemoteRepFittingMultiplier', 0) == 1,
-                                      'power', src.getModifiedItemAttr('subsystemMRARFittingReduction'))
+                                      'power', src.getModifiedItemAttr('subsystemMRARFittingReduction'), **kwargs)
 
 
 class Effect6899(BaseEffect):
@@ -32739,13 +32601,13 @@ class Effect6899(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Emission Systems') and
                                                   mod.getModifiedItemAttr('mediumRemoteRepFittingMultiplier', 0) == 1,
-                                      'cpu', src.getModifiedItemAttr('subsystemMRSBFittingReduction'))
+                                      'cpu', src.getModifiedItemAttr('subsystemMRSBFittingReduction'), **kwargs)
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Emission Systems') and
                                                   mod.getModifiedItemAttr('mediumRemoteRepFittingMultiplier', 0) == 1,
-                                      'power', src.getModifiedItemAttr('subsystemMRSBFittingReduction'))
+                                      'power', src.getModifiedItemAttr('subsystemMRSBFittingReduction'), **kwargs)
 
 
 class Effect6900(BaseEffect):
@@ -32761,12 +32623,12 @@ class Effect6900(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         groups = ('Missile Launcher Heavy', 'Missile Launcher Rapid Light', 'Missile Launcher Heavy Assault')
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in groups,
-                                      'cpu', src.getModifiedItemAttr('subsystemMMissileFittingReduction'))
+                                      'cpu', src.getModifiedItemAttr('subsystemMMissileFittingReduction'), **kwargs)
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in groups,
-                                      'power', src.getModifiedItemAttr('subsystemMMissileFittingReduction'))
+                                      'power', src.getModifiedItemAttr('subsystemMMissileFittingReduction'), **kwargs)
 
 
 class Effect6908(BaseEffect):
@@ -32780,10 +32642,10 @@ class Effect6908(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: True, 'moduleRepairRate',
                                       ship.getModifiedItemAttr('shipBonusStrategicCruiserCaldari2'),
-                                      skill='Caldari Strategic Cruiser')
+                                      skill='Caldari Strategic Cruiser', **kwargs)
 
 
 class Effect6909(BaseEffect):
@@ -32797,10 +32659,10 @@ class Effect6909(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: True, 'moduleRepairRate',
                                       ship.getModifiedItemAttr('shipBonusStrategicCruiserAmarr2'),
-                                      skill='Amarr Strategic Cruiser')
+                                      skill='Amarr Strategic Cruiser', **kwargs)
 
 
 class Effect6910(BaseEffect):
@@ -32814,10 +32676,10 @@ class Effect6910(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: True, 'moduleRepairRate',
                                       ship.getModifiedItemAttr('shipBonusStrategicCruiserGallente2'),
-                                      skill='Gallente Strategic Cruiser')
+                                      skill='Gallente Strategic Cruiser', **kwargs)
 
 
 class Effect6911(BaseEffect):
@@ -32831,10 +32693,10 @@ class Effect6911(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: True, 'moduleRepairRate',
                                       ship.getModifiedItemAttr('shipBonusStrategicCruiserMinmatar2'),
-                                      skill='Minmatar Strategic Cruiser')
+                                      skill='Minmatar Strategic Cruiser', **kwargs)
 
 
 class Effect6920(BaseEffect):
@@ -32849,8 +32711,8 @@ class Effect6920(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
-        fit.ship.increaseItemAttr('hp', module.getModifiedItemAttr('structureHPBonusAdd') or 0)
+    def handler(fit, module, context, **kwargs):
+        fit.ship.increaseItemAttr('hp', module.getModifiedItemAttr('structureHPBonusAdd') or 0, **kwargs)
 
 
 class Effect6921(BaseEffect):
@@ -32864,10 +32726,10 @@ class Effect6921(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Astrometrics'),
                                         'baseSensorStrength', src.getModifiedItemAttr('subsystemBonusAmarrDefensive2'),
-                                        skill='Amarr Defensive Systems')
+                                        skill='Amarr Defensive Systems', **kwargs)
 
 
 class Effect6923(BaseEffect):
@@ -32881,10 +32743,10 @@ class Effect6923(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, container, context):
+    def handler(fit, container, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Missiles') or mod.charge.requiresSkill('Heavy Assault Missiles'),
                                       'maxVelocity', container.getModifiedItemAttr('subsystemBonusMinmatarOffensive'),
-                                      skill='Minmatar Offensive Systems')
+                                      skill='Minmatar Offensive Systems', **kwargs)
 
 
 class Effect6924(BaseEffect):
@@ -32898,10 +32760,10 @@ class Effect6924(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, container, context):
+    def handler(fit, container, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
                                       'aoeVelocity', container.getModifiedItemAttr('subsystemBonusMinmatarOffensive3'),
-                                      skill='Minmatar Offensive Systems')
+                                      skill='Minmatar Offensive Systems', **kwargs)
 
 
 class Effect6925(BaseEffect):
@@ -32915,13 +32777,13 @@ class Effect6925(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Drones'),
                                      'maxVelocity', src.getModifiedItemAttr('subsystemBonusGallenteOffensive2'),
-                                     skill='Gallente Offensive Systems')
+                                     skill='Gallente Offensive Systems', **kwargs)
         fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Drones'),
                                      'trackingSpeed', src.getModifiedItemAttr('subsystemBonusGallenteOffensive2'),
-                                     skill='Gallente Offensive Systems')
+                                     skill='Gallente Offensive Systems', **kwargs)
 
 
 class Effect6926(BaseEffect):
@@ -32935,8 +32797,8 @@ class Effect6926(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
-        fit.ship.boostItemAttr('warpCapacitorNeed', src.getModifiedItemAttr('subsystemBonusAmarrPropulsion'), skill='Amarr Propulsion Systems')
+    def handler(fit, src, context, **kwargs):
+        fit.ship.boostItemAttr('warpCapacitorNeed', src.getModifiedItemAttr('subsystemBonusAmarrPropulsion'), skill='Amarr Propulsion Systems', **kwargs)
 
 
 class Effect6927(BaseEffect):
@@ -32950,9 +32812,9 @@ class Effect6927(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.ship.boostItemAttr('warpCapacitorNeed', src.getModifiedItemAttr('subsystemBonusMinmatarPropulsion'),
-                               skill='Minmatar Propulsion Systems')
+                               skill='Minmatar Propulsion Systems', **kwargs)
 
 
 class Effect6928(BaseEffect):
@@ -32966,10 +32828,10 @@ class Effect6928(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Afterburner') or mod.item.requiresSkill('High Speed Maneuvering'),
                                       'overloadSpeedFactorBonus', src.getModifiedItemAttr('subsystemBonusCaldariPropulsion2'),
-                                      skill='Caldari Propulsion Systems')
+                                      skill='Caldari Propulsion Systems', **kwargs)
 
 
 class Effect6929(BaseEffect):
@@ -32984,10 +32846,10 @@ class Effect6929(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Afterburner') or mod.item.requiresSkill('High Speed Maneuvering'),
                                       'overloadSpeedFactorBonus', src.getModifiedItemAttr('subsystemBonusGallentePropulsion2'),
-                                      skill='Gallente Propulsion Systems')
+                                      skill='Gallente Propulsion Systems', **kwargs)
 
 
 class Effect6930(BaseEffect):
@@ -33001,8 +32863,8 @@ class Effect6930(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
-        fit.ship.boostItemAttr('energyWarfareResistance', src.getModifiedItemAttr('subsystemBonusAmarrCore2'), skill='Amarr Core Systems')
+    def handler(fit, src, context, **kwargs):
+        fit.ship.boostItemAttr('energyWarfareResistance', src.getModifiedItemAttr('subsystemBonusAmarrCore2'), skill='Amarr Core Systems', **kwargs)
 
 
 class Effect6931(BaseEffect):
@@ -33016,9 +32878,9 @@ class Effect6931(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.ship.boostItemAttr('energyWarfareResistance', src.getModifiedItemAttr('subsystemBonusMinmatarCore2'),
-                               skill='Minmatar Core Systems')
+                               skill='Minmatar Core Systems', **kwargs)
 
 
 class Effect6932(BaseEffect):
@@ -33032,9 +32894,9 @@ class Effect6932(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.ship.boostItemAttr('energyWarfareResistance', src.getModifiedItemAttr('subsystemBonusGallenteCore2'),
-                               skill='Gallente Core Systems')
+                               skill='Gallente Core Systems', **kwargs)
 
 
 class Effect6933(BaseEffect):
@@ -33048,9 +32910,9 @@ class Effect6933(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.ship.boostItemAttr('energyWarfareResistance', src.getModifiedItemAttr('subsystemBonusCaldariCore2'),
-                               skill='Caldari Core Systems')
+                               skill='Caldari Core Systems', **kwargs)
 
 
 class Effect6934(BaseEffect):
@@ -33066,8 +32928,8 @@ class Effect6934(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
-        fit.ship.increaseItemAttr('maxLockedTargets', src.getModifiedItemAttr('maxLockedTargetsBonus'))
+    def handler(fit, src, context, **kwargs):
+        fit.ship.increaseItemAttr('maxLockedTargets', src.getModifiedItemAttr('maxLockedTargetsBonus'), **kwargs)
 
 
 class Effect6935(BaseEffect):
@@ -33081,9 +32943,9 @@ class Effect6935(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in ('Energy Nosferatu', 'Energy Neutralizer'), 'overloadSelfDurationBonus',
-                                      src.getModifiedItemAttr('subsystemBonusAmarrCore3'), skill='Amarr Core Systems')
+                                      src.getModifiedItemAttr('subsystemBonusAmarrCore3'), skill='Amarr Core Systems', **kwargs)
 
 
 class Effect6936(BaseEffect):
@@ -33097,10 +32959,10 @@ class Effect6936(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Stasis Web',
                                       'overloadRangeBonus', src.getModifiedItemAttr('subsystemBonusMinmatarCore3'),
-                                      skill='Minmatar Core Systems')
+                                      skill='Minmatar Core Systems', **kwargs)
 
 
 class Effect6937(BaseEffect):
@@ -33114,9 +32976,9 @@ class Effect6937(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Warp Scrambler', 'overloadRangeBonus',
-                                      src.getModifiedItemAttr('subsystemBonusGallenteCore3'), skill='Gallente Core Systems')
+                                      src.getModifiedItemAttr('subsystemBonusGallenteCore3'), skill='Gallente Core Systems', **kwargs)
 
 
 class Effect6938(BaseEffect):
@@ -33130,9 +32992,9 @@ class Effect6938(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'ECM', 'overloadECMStrengthBonus',
-                                      src.getModifiedItemAttr('subsystemBonusCaldariCore3'), skill='Caldari Core Systems')
+                                      src.getModifiedItemAttr('subsystemBonusCaldariCore3'), skill='Caldari Core Systems', **kwargs)
 
 
 class Effect6939(BaseEffect):
@@ -33146,11 +33008,11 @@ class Effect6939(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Hull Upgrades'), 'overloadSelfDurationBonus',
-                                      src.getModifiedItemAttr('subsystemBonusAmarrDefensive2'), skill='Amarr Defensive Systems')
+                                      src.getModifiedItemAttr('subsystemBonusAmarrDefensive2'), skill='Amarr Defensive Systems', **kwargs)
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Hull Upgrades'), 'overloadHardeningBonus',
-                                      src.getModifiedItemAttr('subsystemBonusAmarrDefensive2'), skill='Amarr Defensive Systems')
+                                      src.getModifiedItemAttr('subsystemBonusAmarrDefensive2'), skill='Amarr Defensive Systems', **kwargs)
 
 
 class Effect6940(BaseEffect):
@@ -33164,11 +33026,11 @@ class Effect6940(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Hull Upgrades'), 'overloadHardeningBonus',
-                                      src.getModifiedItemAttr('subsystemBonusGallenteDefensive2'), skill='Gallente Defensive Systems')
+                                      src.getModifiedItemAttr('subsystemBonusGallenteDefensive2'), skill='Gallente Defensive Systems', **kwargs)
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Hull Upgrades'), 'overloadSelfDurationBonus',
-                                      src.getModifiedItemAttr('subsystemBonusGallenteDefensive2'), skill='Gallente Defensive Systems')
+                                      src.getModifiedItemAttr('subsystemBonusGallenteDefensive2'), skill='Gallente Defensive Systems', **kwargs)
 
 
 class Effect6941(BaseEffect):
@@ -33182,10 +33044,10 @@ class Effect6941(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Tactical Shield Manipulation'),
                                       'overloadHardeningBonus', src.getModifiedItemAttr('subsystemBonusCaldariDefensive2'),
-                                      skill='Caldari Defensive Systems')
+                                      skill='Caldari Defensive Systems', **kwargs)
 
 
 class Effect6942(BaseEffect):
@@ -33199,13 +33061,13 @@ class Effect6942(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Hull Upgrades'), 'overloadSelfDurationBonus',
-                                      src.getModifiedItemAttr('subsystemBonusMinmatarDefensive2'), skill='Minmatar Defensive Systems')
+                                      src.getModifiedItemAttr('subsystemBonusMinmatarDefensive2'), skill='Minmatar Defensive Systems', **kwargs)
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Hull Upgrades'), 'overloadHardeningBonus',
-                                      src.getModifiedItemAttr('subsystemBonusMinmatarDefensive2'), skill='Minmatar Defensive Systems')
+                                      src.getModifiedItemAttr('subsystemBonusMinmatarDefensive2'), skill='Minmatar Defensive Systems', **kwargs)
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Tactical Shield Manipulation'), 'overloadHardeningBonus',
-                                      src.getModifiedItemAttr('subsystemBonusMinmatarDefensive2'), skill='Minmatar Defensive Systems')
+                                      src.getModifiedItemAttr('subsystemBonusMinmatarDefensive2'), skill='Minmatar Defensive Systems', **kwargs)
 
 
 class Effect6943(BaseEffect):
@@ -33220,13 +33082,13 @@ class Effect6943(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Repair Systems'),
                                       'overloadSelfDurationBonus', src.getModifiedItemAttr('subsystemBonusAmarrDefensive3'),
-                                      skill='Amarr Defensive Systems')
+                                      skill='Amarr Defensive Systems', **kwargs)
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Repair Systems'),
                                       'overloadArmorDamageAmount', src.getModifiedItemAttr('subsystemBonusAmarrDefensive3'),
-                                      skill='Amarr Defensive Systems')
+                                      skill='Amarr Defensive Systems', **kwargs)
 
 
 class Effect6944(BaseEffect):
@@ -33241,13 +33103,13 @@ class Effect6944(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Repair Systems'),
                                       'overloadSelfDurationBonus', src.getModifiedItemAttr('subsystemBonusGallenteDefensive3'),
-                                      skill='Gallente Defensive Systems')
+                                      skill='Gallente Defensive Systems', **kwargs)
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Repair Systems'),
                                       'overloadArmorDamageAmount', src.getModifiedItemAttr('subsystemBonusGallenteDefensive3'),
-                                      skill='Gallente Defensive Systems')
+                                      skill='Gallente Defensive Systems', **kwargs)
 
 
 class Effect6945(BaseEffect):
@@ -33262,13 +33124,13 @@ class Effect6945(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Operation'),
                                       'overloadShieldBonus', src.getModifiedItemAttr('subsystemBonusCaldariDefensive3'),
-                                      skill='Caldari Defensive Systems')
+                                      skill='Caldari Defensive Systems', **kwargs)
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Operation'),
                                       'overloadSelfDurationBonus', src.getModifiedItemAttr('subsystemBonusCaldariDefensive3'),
-                                      skill='Caldari Defensive Systems')
+                                      skill='Caldari Defensive Systems', **kwargs)
 
 
 class Effect6946(BaseEffect):
@@ -33283,13 +33145,13 @@ class Effect6946(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Repair Systems') or mod.item.requiresSkill('Shield Operation'),
                                       'overloadArmorDamageAmount', src.getModifiedItemAttr('subsystemBonusMinmatarDefensive3'),
-                                      skill='Minmatar Defensive Systems')
+                                      skill='Minmatar Defensive Systems', **kwargs)
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Repair Systems') or mod.item.requiresSkill('Shield Operation'),
                                       'overloadSelfDurationBonus', src.getModifiedItemAttr('subsystemBonusMinmatarDefensive3'),
-                                      skill='Minmatar Defensive Systems')
+                                      skill='Minmatar Defensive Systems', **kwargs)
 
 
 class Effect6947(BaseEffect):
@@ -33303,10 +33165,10 @@ class Effect6947(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Astrometrics'),
                                         'baseSensorStrength', src.getModifiedItemAttr('subsystemBonusCaldariDefensive2'),
-                                        skill='Caldari Defensive Systems')
+                                        skill='Caldari Defensive Systems', **kwargs)
 
 
 class Effect6949(BaseEffect):
@@ -33320,9 +33182,9 @@ class Effect6949(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Astrometrics'), 'baseSensorStrength',
-                                        src.getModifiedItemAttr('subsystemBonusGallenteDefensive2'), skill='Gallente Defensive Systems')
+                                        src.getModifiedItemAttr('subsystemBonusGallenteDefensive2'), skill='Gallente Defensive Systems', **kwargs)
 
 
 class Effect6951(BaseEffect):
@@ -33336,9 +33198,9 @@ class Effect6951(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Astrometrics'), 'baseSensorStrength',
-                                        src.getModifiedItemAttr('subsystemBonusMinmatarDefensive2'), skill='Minmatar Defensive Systems')
+                                        src.getModifiedItemAttr('subsystemBonusMinmatarDefensive2'), skill='Minmatar Defensive Systems', **kwargs)
 
 
 class Effect6953(BaseEffect):
@@ -33355,9 +33217,9 @@ class Effect6953(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
-        module.multiplyItemAttr('power', module.getModifiedItemAttr('mediumRemoteRepFittingMultiplier'))
-        module.multiplyItemAttr('cpu', module.getModifiedItemAttr('mediumRemoteRepFittingMultiplier'))
+    def handler(fit, module, context, **kwargs):
+        module.multiplyItemAttr('power', module.getModifiedItemAttr('mediumRemoteRepFittingMultiplier'), **kwargs)
+        module.multiplyItemAttr('cpu', module.getModifiedItemAttr('mediumRemoteRepFittingMultiplier'), **kwargs)
 
 
 class Effect6954(BaseEffect):
@@ -33371,11 +33233,11 @@ class Effect6954(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Leadership'), 'power',
-                                      src.getModifiedItemAttr('subsystemCommandBurstFittingReduction'))
+                                      src.getModifiedItemAttr('subsystemCommandBurstFittingReduction'), **kwargs)
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Leadership'), 'cpu',
-                                      src.getModifiedItemAttr('subsystemCommandBurstFittingReduction'))
+                                      src.getModifiedItemAttr('subsystemCommandBurstFittingReduction'), **kwargs)
 
 
 class Effect6955(BaseEffect):
@@ -33390,9 +33252,9 @@ class Effect6955(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in ('Remote Shield Booster', 'Ancillary Remote Shield Booster'),
-                                      'falloffEffectiveness', src.getModifiedItemAttr('remoteShieldBoosterFalloffBonus'))
+                                      'falloffEffectiveness', src.getModifiedItemAttr('remoteShieldBoosterFalloffBonus'), **kwargs)
 
 
 class Effect6956(BaseEffect):
@@ -33406,9 +33268,9 @@ class Effect6956(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in ('Remote Armor Repairer', 'Ancillary Remote Armor Repairer'),
-                                      'maxRange', src.getModifiedItemAttr('remoteArmorRepairerOptimalBonus'))
+                                      'maxRange', src.getModifiedItemAttr('remoteArmorRepairerOptimalBonus'), **kwargs)
 
 
 class Effect6957(BaseEffect):
@@ -33422,9 +33284,9 @@ class Effect6957(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in ('Remote Armor Repairer', 'Ancillary Remote Armor Repairer'),
-                                      'falloffEffectiveness', src.getModifiedItemAttr('remoteArmorRepairerFalloffBonus'))
+                                      'falloffEffectiveness', src.getModifiedItemAttr('remoteArmorRepairerFalloffBonus'), **kwargs)
 
 
 class Effect6958(BaseEffect):
@@ -33438,9 +33300,9 @@ class Effect6958(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Remote Armor Repair Systems'), 'overloadSelfDurationBonus',
-                                      src.getModifiedItemAttr('subsystemBonusAmarrOffensive3'), skill='Amarr Offensive Systems')
+                                      src.getModifiedItemAttr('subsystemBonusAmarrOffensive3'), skill='Amarr Offensive Systems', **kwargs)
 
 
 class Effect6959(BaseEffect):
@@ -33454,9 +33316,9 @@ class Effect6959(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Remote Armor Repair Systems'), 'overloadSelfDurationBonus',
-                                      src.getModifiedItemAttr('subsystemBonusGallenteOffensive3'), skill='Gallente Offensive Systems')
+                                      src.getModifiedItemAttr('subsystemBonusGallenteOffensive3'), skill='Gallente Offensive Systems', **kwargs)
 
 
 class Effect6960(BaseEffect):
@@ -33470,10 +33332,10 @@ class Effect6960(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Emission Systems'),
                                       'overloadSelfDurationBonus', src.getModifiedItemAttr('subsystemBonusCaldariOffensive3'),
-                                      skill='Caldari Offensive Systems')
+                                      skill='Caldari Offensive Systems', **kwargs)
 
 
 class Effect6961(BaseEffect):
@@ -33487,10 +33349,10 @@ class Effect6961(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Emission Systems') or mod.item.requiresSkill('Remote Armor Repair Systems'),
                                       'overloadSelfDurationBonus', src.getModifiedItemAttr('subsystemBonusMinmatarOffensive3'),
-                                      skill='Minmatar Offensive Systems')
+                                      skill='Minmatar Offensive Systems', **kwargs)
 
 
 class Effect6962(BaseEffect):
@@ -33504,9 +33366,9 @@ class Effect6962(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.ship.boostItemAttr('warpSpeedMultiplier', src.getModifiedItemAttr('subsystemBonusAmarrPropulsion2'),
-                               skill='Amarr Propulsion Systems')
+                               skill='Amarr Propulsion Systems', **kwargs)
 
 
 class Effect6963(BaseEffect):
@@ -33520,9 +33382,9 @@ class Effect6963(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.ship.boostItemAttr('warpSpeedMultiplier', src.getModifiedItemAttr('subsystemBonusMinmatarPropulsion2'),
-                               skill='Minmatar Propulsion Systems')
+                               skill='Minmatar Propulsion Systems', **kwargs)
 
 
 class Effect6964(BaseEffect):
@@ -33536,9 +33398,9 @@ class Effect6964(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         fit.ship.boostItemAttr('baseWarpSpeed', module.getModifiedItemAttr('subsystemBonusGallentePropulsion'),
-                               skill='Gallente Propulsion Systems')
+                               skill='Gallente Propulsion Systems', **kwargs)
 
 
 class Effect6981(BaseEffect):
@@ -33552,19 +33414,19 @@ class Effect6981(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill('Torpedoes'), 'thermalDamage',
-                                      src.getModifiedItemAttr('shipBonusTitanG1'), skill='Gallente Titan')
+                                      src.getModifiedItemAttr('shipBonusTitanG1'), skill='Gallente Titan', **kwargs)
         fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill('Torpedoes'), 'kineticDamage',
-                                      src.getModifiedItemAttr('shipBonusTitanG1'), skill='Gallente Titan')
+                                      src.getModifiedItemAttr('shipBonusTitanG1'), skill='Gallente Titan', **kwargs)
         fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill('XL Torpedoes'), 'thermalDamage',
-                                      src.getModifiedItemAttr('shipBonusTitanG1'), skill='Gallente Titan')
+                                      src.getModifiedItemAttr('shipBonusTitanG1'), skill='Gallente Titan', **kwargs)
         fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill('XL Torpedoes'), 'kineticDamage',
-                                      src.getModifiedItemAttr('shipBonusTitanG1'), skill='Gallente Titan')
+                                      src.getModifiedItemAttr('shipBonusTitanG1'), skill='Gallente Titan', **kwargs)
         fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill('XL Cruise Missiles'), 'thermalDamage',
-                                      src.getModifiedItemAttr('shipBonusTitanG1'), skill='Gallente Titan')
+                                      src.getModifiedItemAttr('shipBonusTitanG1'), skill='Gallente Titan', **kwargs)
         fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill('XL Cruise Missiles'), 'kineticDamage',
-                                      src.getModifiedItemAttr('shipBonusTitanG1'), skill='Gallente Titan')
+                                      src.getModifiedItemAttr('shipBonusTitanG1'), skill='Gallente Titan', **kwargs)
 
 
 class Effect6982(BaseEffect):
@@ -33578,19 +33440,19 @@ class Effect6982(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill('Torpedoes'), 'explosiveDamage',
-                                      src.getModifiedItemAttr('shipBonusTitanG2'), skill='Gallente Titan')
+                                      src.getModifiedItemAttr('shipBonusTitanG2'), skill='Gallente Titan', **kwargs)
         fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill('Torpedoes'), 'emDamage',
-                                      src.getModifiedItemAttr('shipBonusTitanG2'), skill='Gallente Titan')
+                                      src.getModifiedItemAttr('shipBonusTitanG2'), skill='Gallente Titan', **kwargs)
         fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill('XL Torpedoes'), 'emDamage',
-                                      src.getModifiedItemAttr('shipBonusTitanG2'), skill='Gallente Titan')
+                                      src.getModifiedItemAttr('shipBonusTitanG2'), skill='Gallente Titan', **kwargs)
         fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill('XL Torpedoes'), 'explosiveDamage',
-                                      src.getModifiedItemAttr('shipBonusTitanG2'), skill='Gallente Titan')
+                                      src.getModifiedItemAttr('shipBonusTitanG2'), skill='Gallente Titan', **kwargs)
         fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill('XL Cruise Missiles'), 'emDamage',
-                                      src.getModifiedItemAttr('shipBonusTitanG2'), skill='Gallente Titan')
+                                      src.getModifiedItemAttr('shipBonusTitanG2'), skill='Gallente Titan', **kwargs)
         fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill('XL Cruise Missiles'), 'explosiveDamage',
-                                      src.getModifiedItemAttr('shipBonusTitanG2'), skill='Gallente Titan')
+                                      src.getModifiedItemAttr('shipBonusTitanG2'), skill='Gallente Titan', **kwargs)
 
 
 class Effect6983(BaseEffect):
@@ -33604,11 +33466,11 @@ class Effect6983(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
-        fit.ship.boostItemAttr('shieldKineticDamageResonance', src.getModifiedItemAttr('shipBonusTitanC1'), skill='Caldari Titan')
-        fit.ship.boostItemAttr('shieldEmDamageResonance', src.getModifiedItemAttr('shipBonusTitanC1'), skill='Caldari Titan')
-        fit.ship.boostItemAttr('shieldExplosiveDamageResonance', src.getModifiedItemAttr('shipBonusTitanC1'), skill='Caldari Titan')
-        fit.ship.boostItemAttr('shieldThermalDamageResonance', src.getModifiedItemAttr('shipBonusTitanC1'), skill='Caldari Titan')
+    def handler(fit, src, context, **kwargs):
+        fit.ship.boostItemAttr('shieldKineticDamageResonance', src.getModifiedItemAttr('shipBonusTitanC1'), skill='Caldari Titan', **kwargs)
+        fit.ship.boostItemAttr('shieldEmDamageResonance', src.getModifiedItemAttr('shipBonusTitanC1'), skill='Caldari Titan', **kwargs)
+        fit.ship.boostItemAttr('shieldExplosiveDamageResonance', src.getModifiedItemAttr('shipBonusTitanC1'), skill='Caldari Titan', **kwargs)
+        fit.ship.boostItemAttr('shieldThermalDamageResonance', src.getModifiedItemAttr('shipBonusTitanC1'), skill='Caldari Titan', **kwargs)
 
 
 class Effect6984(BaseEffect):
@@ -33623,15 +33485,15 @@ class Effect6984(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'), 'shieldCapacity',
-                                       src.getModifiedItemAttr('shipBonusRole4'))
+                                       src.getModifiedItemAttr('shipBonusRole4'), **kwargs)
         fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'), 'fighterAbilityAttackTurretDamageMultiplier',
-                                       src.getModifiedItemAttr('shipBonusRole4'))
+                                       src.getModifiedItemAttr('shipBonusRole4'), **kwargs)
         fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'), 'fighterAbilityAttackMissileDamageMultiplier',
-                                       src.getModifiedItemAttr('shipBonusRole4'))
+                                       src.getModifiedItemAttr('shipBonusRole4'), **kwargs)
         fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'), 'fighterAbilityMissilesDamageMultiplier',
-                                       src.getModifiedItemAttr('shipBonusRole4'))
+                                       src.getModifiedItemAttr('shipBonusRole4'), **kwargs)
 
 
 class Effect6985(BaseEffect):
@@ -33645,19 +33507,19 @@ class Effect6985(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill('Torpedoes'), 'kineticDamage',
-                                      src.getModifiedItemAttr('shipBonusDreadnoughtG1'), skill='Gallente Dreadnought')
+                                      src.getModifiedItemAttr('shipBonusDreadnoughtG1'), skill='Gallente Dreadnought', **kwargs)
         fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill('Torpedoes'), 'thermalDamage',
-                                      src.getModifiedItemAttr('shipBonusDreadnoughtG1'), skill='Gallente Dreadnought')
+                                      src.getModifiedItemAttr('shipBonusDreadnoughtG1'), skill='Gallente Dreadnought', **kwargs)
         fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill('XL Torpedoes'), 'kineticDamage',
-                                      src.getModifiedItemAttr('shipBonusDreadnoughtG1'), skill='Gallente Dreadnought')
+                                      src.getModifiedItemAttr('shipBonusDreadnoughtG1'), skill='Gallente Dreadnought', **kwargs)
         fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill('XL Torpedoes'), 'thermalDamage',
-                                      src.getModifiedItemAttr('shipBonusDreadnoughtG1'), skill='Gallente Dreadnought')
+                                      src.getModifiedItemAttr('shipBonusDreadnoughtG1'), skill='Gallente Dreadnought', **kwargs)
         fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill('XL Cruise Missiles'), 'thermalDamage',
-                                      src.getModifiedItemAttr('shipBonusDreadnoughtG1'), skill='Gallente Dreadnought')
+                                      src.getModifiedItemAttr('shipBonusDreadnoughtG1'), skill='Gallente Dreadnought', **kwargs)
         fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill('XL Cruise Missiles'), 'kineticDamage',
-                                      src.getModifiedItemAttr('shipBonusDreadnoughtG1'), skill='Gallente Dreadnought')
+                                      src.getModifiedItemAttr('shipBonusDreadnoughtG1'), skill='Gallente Dreadnought', **kwargs)
 
 
 class Effect6986(BaseEffect):
@@ -33671,9 +33533,9 @@ class Effect6986(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Capital Shield Emission Systems'), 'shieldBonus',
-                                      src.getModifiedItemAttr('shipBonusForceAuxiliaryG1'), skill='Gallente Carrier')
+                                      src.getModifiedItemAttr('shipBonusForceAuxiliaryG1'), skill='Gallente Carrier', **kwargs)
 
 
 class Effect6987(BaseEffect):
@@ -33687,19 +33549,19 @@ class Effect6987(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Repair Drone Operation'),
-                                        'structureDamageAmount', src.getModifiedItemAttr('shipBonusRole2'))
+                                        'structureDamageAmount', src.getModifiedItemAttr('shipBonusRole2'), **kwargs)
         fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Repair Drone Operation'),
-                                        'shieldBonus', src.getModifiedItemAttr('shipBonusRole2'))
+                                        'shieldBonus', src.getModifiedItemAttr('shipBonusRole2'), **kwargs)
         fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Repair Drone Operation'),
-                                        'armorDamageAmount', src.getModifiedItemAttr('shipBonusRole2'))
+                                        'armorDamageAmount', src.getModifiedItemAttr('shipBonusRole2'), **kwargs)
         fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Repair Drone Operation'),
-                                        'armorHP', src.getModifiedItemAttr('shipBonusRole2'))
+                                        'armorHP', src.getModifiedItemAttr('shipBonusRole2'), **kwargs)
         fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Repair Drone Operation'),
-                                        'shieldCapacity', src.getModifiedItemAttr('shipBonusRole2'))
+                                        'shieldCapacity', src.getModifiedItemAttr('shipBonusRole2'), **kwargs)
         fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Repair Drone Operation'),
-                                        'hp', src.getModifiedItemAttr('shipBonusRole2'))
+                                        'hp', src.getModifiedItemAttr('shipBonusRole2'), **kwargs)
 
 
 class Effect6992(BaseEffect):
@@ -33713,8 +33575,8 @@ class Effect6992(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Hybrid Turret'), 'damageMultiplier', src.getModifiedItemAttr('shipBonusRole1'))
+    def handler(fit, src, context, **kwargs):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Hybrid Turret'), 'damageMultiplier', src.getModifiedItemAttr('shipBonusRole1'), **kwargs)
 
 
 class Effect6993(BaseEffect):
@@ -33729,19 +33591,19 @@ class Effect6993(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
-        fit.boosters.filteredItemBoost(lambda mod: mod.item.group.name == 'Booster', 'boosterMissileAOECloudPenalty', src.getModifiedItemAttr('shipBonusRole2'))
-        fit.boosters.filteredItemBoost(lambda mod: mod.item.group.name == 'Booster', 'boosterCapacitorCapacityPenalty', src.getModifiedItemAttr('shipBonusRole2'))
-        fit.boosters.filteredItemBoost(lambda mod: mod.item.group.name == 'Booster', 'boosterAOEVelocityPenalty', src.getModifiedItemAttr('shipBonusRole2'))
-        fit.boosters.filteredItemBoost(lambda mod: mod.item.group.name == 'Booster', 'boosterArmorRepairAmountPenalty', src.getModifiedItemAttr('shipBonusRole2'))
-        fit.boosters.filteredItemBoost(lambda mod: mod.item.group.name == 'Booster', 'boosterMissileVelocityPenalty', src.getModifiedItemAttr('shipBonusRole2'))
-        fit.boosters.filteredItemBoost(lambda mod: mod.item.group.name == 'Booster', 'boosterTurretTrackingPenalty', src.getModifiedItemAttr('shipBonusRole2'))
-        fit.boosters.filteredItemBoost(lambda mod: mod.item.group.name == 'Booster', 'boosterShieldCapacityPenalty', src.getModifiedItemAttr('shipBonusRole2'))
-        fit.boosters.filteredItemBoost(lambda mod: mod.item.group.name == 'Booster', 'boosterTurretOptimalRangePenalty', src.getModifiedItemAttr('shipBonusRole2'))
-        fit.boosters.filteredItemBoost(lambda mod: mod.item.group.name == 'Booster', 'boosterShieldBoostAmountPenalty', src.getModifiedItemAttr('shipBonusRole2'))
-        fit.boosters.filteredItemBoost(lambda mod: mod.item.group.name == 'Booster', 'boosterTurretFalloffPenalty', src.getModifiedItemAttr('shipBonusRole2'))
-        fit.boosters.filteredItemBoost(lambda mod: mod.item.group.name == 'Booster', 'boosterArmorHPPenalty', src.getModifiedItemAttr('shipBonusRole2'))
-        fit.boosters.filteredItemBoost(lambda mod: mod.item.group.name == 'Booster', 'boosterMaxVelocityPenalty', src.getModifiedItemAttr('shipBonusRole2'))
+    def handler(fit, src, context, **kwargs):
+        fit.boosters.filteredItemBoost(lambda mod: mod.item.group.name == 'Booster', 'boosterMissileAOECloudPenalty', src.getModifiedItemAttr('shipBonusRole2'), **kwargs)
+        fit.boosters.filteredItemBoost(lambda mod: mod.item.group.name == 'Booster', 'boosterCapacitorCapacityPenalty', src.getModifiedItemAttr('shipBonusRole2'), **kwargs)
+        fit.boosters.filteredItemBoost(lambda mod: mod.item.group.name == 'Booster', 'boosterAOEVelocityPenalty', src.getModifiedItemAttr('shipBonusRole2'), **kwargs)
+        fit.boosters.filteredItemBoost(lambda mod: mod.item.group.name == 'Booster', 'boosterArmorRepairAmountPenalty', src.getModifiedItemAttr('shipBonusRole2'), **kwargs)
+        fit.boosters.filteredItemBoost(lambda mod: mod.item.group.name == 'Booster', 'boosterMissileVelocityPenalty', src.getModifiedItemAttr('shipBonusRole2'), **kwargs)
+        fit.boosters.filteredItemBoost(lambda mod: mod.item.group.name == 'Booster', 'boosterTurretTrackingPenalty', src.getModifiedItemAttr('shipBonusRole2'), **kwargs)
+        fit.boosters.filteredItemBoost(lambda mod: mod.item.group.name == 'Booster', 'boosterShieldCapacityPenalty', src.getModifiedItemAttr('shipBonusRole2'), **kwargs)
+        fit.boosters.filteredItemBoost(lambda mod: mod.item.group.name == 'Booster', 'boosterTurretOptimalRangePenalty', src.getModifiedItemAttr('shipBonusRole2'), **kwargs)
+        fit.boosters.filteredItemBoost(lambda mod: mod.item.group.name == 'Booster', 'boosterShieldBoostAmountPenalty', src.getModifiedItemAttr('shipBonusRole2'), **kwargs)
+        fit.boosters.filteredItemBoost(lambda mod: mod.item.group.name == 'Booster', 'boosterTurretFalloffPenalty', src.getModifiedItemAttr('shipBonusRole2'), **kwargs)
+        fit.boosters.filteredItemBoost(lambda mod: mod.item.group.name == 'Booster', 'boosterArmorHPPenalty', src.getModifiedItemAttr('shipBonusRole2'), **kwargs)
+        fit.boosters.filteredItemBoost(lambda mod: mod.item.group.name == 'Booster', 'boosterMaxVelocityPenalty', src.getModifiedItemAttr('shipBonusRole2'), **kwargs)
 
 
 class Effect6994(BaseEffect):
@@ -33755,9 +33617,9 @@ class Effect6994(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Hybrid Turret'), 'damageMultiplier',
-                                      src.getModifiedItemAttr('eliteBonusReconShip1'), skill='Recon Ships')
+                                      src.getModifiedItemAttr('eliteBonusReconShip1'), skill='Recon Ships', **kwargs)
 
 
 class Effect6995(BaseEffect):
@@ -33771,7 +33633,7 @@ class Effect6995(BaseEffect):
     type = 'active'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         # Set reload time to 1 second
         module.reloadTime = 1000
 
@@ -33787,9 +33649,9 @@ class Effect6996(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Repair Systems'), 'armorDamageAmount',
-                                      src.getModifiedItemAttr('eliteBonusReconShip3'), skill='Recon Ships')
+                                      src.getModifiedItemAttr('eliteBonusReconShip3'), skill='Recon Ships', **kwargs)
 
 
 class Effect6997(BaseEffect):
@@ -33803,9 +33665,9 @@ class Effect6997(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Repair Systems'), 'armorDamageAmount',
-                                      src.getModifiedItemAttr('eliteBonusCovertOps4'), skill='Covert Ops')
+                                      src.getModifiedItemAttr('eliteBonusCovertOps4'), skill='Covert Ops', **kwargs)
 
 
 class Effect6999(BaseEffect):
@@ -33819,9 +33681,9 @@ class Effect6999(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == 'Missile Launcher Torpedo',
-                                         'cpu', ship.getModifiedItemAttr('stealthBomberLauncherCPU'))
+                                         'cpu', ship.getModifiedItemAttr('stealthBomberLauncherCPU'), **kwargs)
 
 
 class Effect7000(BaseEffect):
@@ -33835,9 +33697,9 @@ class Effect7000(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Hybrid Turret'), 'falloff',
-                                      src.getModifiedItemAttr('shipBonusGF'), skill='Gallente Frigate')
+                                      src.getModifiedItemAttr('shipBonusGF'), skill='Gallente Frigate', **kwargs)
 
 
 class Effect7001(BaseEffect):
@@ -33851,8 +33713,8 @@ class Effect7001(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
-        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Missile Launcher Torpedo', 'speed', src.getModifiedItemAttr('shipBonusRole1'))
+    def handler(fit, src, context, **kwargs):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Missile Launcher Torpedo', 'speed', src.getModifiedItemAttr('shipBonusRole1'), **kwargs)
 
 
 class Effect7002(BaseEffect):
@@ -33866,9 +33728,9 @@ class Effect7002(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Bomb Deployment'), 'power', src.getModifiedItemAttr('shipBonusRole3'))
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Bomb Deployment'), 'cpu', src.getModifiedItemAttr('shipBonusRole3'))
+    def handler(fit, src, context, **kwargs):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Bomb Deployment'), 'power', src.getModifiedItemAttr('shipBonusRole3'), **kwargs)
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Bomb Deployment'), 'cpu', src.getModifiedItemAttr('shipBonusRole3'), **kwargs)
 
 
 class Effect7003(BaseEffect):
@@ -33882,9 +33744,9 @@ class Effect7003(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Hybrid Turret'), 'damageMultiplier',
-                                      src.getModifiedItemAttr('eliteBonusCovertOps3'), skill='Covert Ops')
+                                      src.getModifiedItemAttr('eliteBonusCovertOps3'), skill='Covert Ops', **kwargs)
 
 
 class Effect7008(BaseEffect):
@@ -33898,9 +33760,9 @@ class Effect7008(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
-        fit.ship.multiplyItemAttr('shieldCapacity', src.getModifiedItemAttr('structureFullPowerStateHitpointMultiplier') or 0)
-        fit.ship.multiplyItemAttr('armorHP', src.getModifiedItemAttr('structureFullPowerStateHitpointMultiplier') or 0)
+    def handler(fit, src, context, **kwargs):
+        fit.ship.multiplyItemAttr('shieldCapacity', src.getModifiedItemAttr('structureFullPowerStateHitpointMultiplier') or 0, **kwargs)
+        fit.ship.multiplyItemAttr('armorHP', src.getModifiedItemAttr('structureFullPowerStateHitpointMultiplier') or 0, **kwargs)
 
 
 class Effect7009(BaseEffect):
@@ -33919,8 +33781,8 @@ class Effect7009(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
-        fit.ship.forceItemAttr('structureFullPowerStateHitpointMultiplier', src.getModifiedItemAttr('serviceModuleFullPowerStateHitpointMultiplier'))
+    def handler(fit, src, context, **kwargs):
+        fit.ship.forceItemAttr('structureFullPowerStateHitpointMultiplier', src.getModifiedItemAttr('serviceModuleFullPowerStateHitpointMultiplier'), **kwargs)
 
 
 class Effect7012(BaseEffect):
@@ -33936,14 +33798,12 @@ class Effect7012(BaseEffect):
     type = 'active'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         for layer, attrPrefix in (('shield', 'shield'), ('armor', 'armor'), ('hull', '')):
             for damageType in ('Kinetic', 'Thermal', 'Explosive', 'Em'):
-                bonus = '%s%sDamageResonance' % (attrPrefix, damageType)
-                bonus = '%s%s' % (bonus[0].lower(), bonus[1:])
                 booster = '%s%sDamageResonance' % (layer, damageType)
 
-                src.forceItemAttr(booster, src.getModifiedItemAttr('resistanceMultiplier'))
+                src.forceItemAttr(booster, src.getModifiedItemAttr('resistanceMultiplier'), **kwargs)
 
 
 class Effect7013(BaseEffect):
@@ -33957,9 +33817,9 @@ class Effect7013(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'), 'kineticDamage',
-                                        src.getModifiedItemAttr('eliteBonusGunship1'), skill='Assault Frigates')
+                                        src.getModifiedItemAttr('eliteBonusGunship1'), skill='Assault Frigates', **kwargs)
 
 
 class Effect7014(BaseEffect):
@@ -33973,9 +33833,9 @@ class Effect7014(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'), 'thermalDamage',
-                                        src.getModifiedItemAttr('eliteBonusGunship1'), skill='Assault Frigates')
+                                        src.getModifiedItemAttr('eliteBonusGunship1'), skill='Assault Frigates', **kwargs)
 
 
 class Effect7015(BaseEffect):
@@ -33989,9 +33849,9 @@ class Effect7015(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'), 'emDamage',
-                                        src.getModifiedItemAttr('eliteBonusGunship1'), skill='Assault Frigates')
+                                        src.getModifiedItemAttr('eliteBonusGunship1'), skill='Assault Frigates', **kwargs)
 
 
 class Effect7016(BaseEffect):
@@ -34005,9 +33865,9 @@ class Effect7016(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'), 'explosiveDamage',
-                                        src.getModifiedItemAttr('eliteBonusGunship1'), skill='Assault Frigates')
+                                        src.getModifiedItemAttr('eliteBonusGunship1'), skill='Assault Frigates', **kwargs)
 
 
 class Effect7017(BaseEffect):
@@ -34021,9 +33881,9 @@ class Effect7017(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'), 'aoeVelocity',
-                                        src.getModifiedItemAttr('eliteBonusGunship2'), stackingPenalties=True, skill='Assault Frigates')
+                                        src.getModifiedItemAttr('eliteBonusGunship2'), stackingPenalties=True, skill='Assault Frigates', **kwargs)
 
 
 class Effect7018(BaseEffect):
@@ -34037,9 +33897,9 @@ class Effect7018(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Energy Turret'), 'speed',
-                                      src.getModifiedItemAttr('shipBonusAF'), stackingPenalties=False, skill='Amarr Frigate')
+                                      src.getModifiedItemAttr('shipBonusAF'), stackingPenalties=False, skill='Amarr Frigate', **kwargs)
 
 
 class Effect7020(BaseEffect):
@@ -34054,9 +33914,9 @@ class Effect7020(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Stasis Web', 'maxRange',
-                                      src.getModifiedItemAttr('stasisWebRangeBonus'), stackingPenalties=False)
+                                      src.getModifiedItemAttr('stasisWebRangeBonus'), stackingPenalties=False, **kwargs)
 
 
 class Effect7021(BaseEffect):
@@ -34072,8 +33932,8 @@ class Effect7021(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
-        fit.ship.boostItemAttr('maxTargetRange', module.getModifiedItemAttr('structureRigMaxTargetRangeBonus'))
+    def handler(fit, module, context, **kwargs):
+        fit.ship.boostItemAttr('maxTargetRange', module.getModifiedItemAttr('structureRigMaxTargetRangeBonus'), **kwargs)
 
 
 class Effect7024(BaseEffect):
@@ -34087,9 +33947,9 @@ class Effect7024(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Drones'), 'trackingSpeed',
-                                     src.getModifiedItemAttr('eliteBonusGunship2'), skill='Assault Frigates')
+                                     src.getModifiedItemAttr('eliteBonusGunship2'), skill='Assault Frigates', **kwargs)
 
 
 class Effect7026(BaseEffect):
@@ -34104,9 +33964,9 @@ class Effect7026(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context, *args, **kwargs):
-        src.boostItemAttr('maxRange', src.getModifiedChargeAttr('warpScrambleRangeBonus'))
-        src.forceItemAttr('activationBlockedStrenght', src.getModifiedChargeAttr('activationBlockedStrenght'))
+    def handler(fit, src, context, **kwargs):
+        src.boostItemAttr('maxRange', src.getModifiedChargeAttr('warpScrambleRangeBonus'), **kwargs)
+        src.forceItemAttr('activationBlockedStrenght', src.getModifiedChargeAttr('activationBlockedStrenght'), **kwargs)
 
 
 class Effect7027(BaseEffect):
@@ -34120,8 +33980,8 @@ class Effect7027(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
-        fit.ship.increaseItemAttr('capacitorCapacity', ship.getModifiedItemAttr('capacitorBonus'))
+    def handler(fit, ship, context, **kwargs):
+        fit.ship.increaseItemAttr('capacitorCapacity', ship.getModifiedItemAttr('capacitorBonus'), **kwargs)
 
 
 class Effect7028(BaseEffect):
@@ -34135,8 +33995,8 @@ class Effect7028(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
-        fit.ship.multiplyItemAttr('rechargeRate', module.getModifiedItemAttr('capacitorRechargeRateMultiplier'))
+    def handler(fit, module, context, **kwargs):
+        fit.ship.multiplyItemAttr('rechargeRate', module.getModifiedItemAttr('capacitorRechargeRateMultiplier'), **kwargs)
 
 
 class Effect7029(BaseEffect):
@@ -34151,8 +34011,8 @@ class Effect7029(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
-        fit.ship.boostItemAttr('hiddenArmorHPMultiplier', src.getModifiedItemAttr('armorHpBonus'), stackingPenalties=True)
+    def handler(fit, src, context, **kwargs):
+        fit.ship.boostItemAttr('hiddenArmorHPMultiplier', src.getModifiedItemAttr('armorHpBonus'), stackingPenalties=True, **kwargs)
 
 
 class Effect7030(BaseEffect):
@@ -34167,13 +34027,13 @@ class Effect7030(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Structure Guided Bomb Launcher',
-                                      'speed', ship.getModifiedItemAttr('structureAoERoFRoleBonus'))
+                                      'speed', ship.getModifiedItemAttr('structureAoERoFRoleBonus'), **kwargs)
         for attr in ['duration', 'durationTargetIlluminationBurstProjector', 'durationWeaponDisruptionBurstProjector',
                      'durationECMJammerBurstProjector', 'durationSensorDampeningBurstProjector', 'capacitorNeed']:
             fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Structure Burst Projector',
-                                          attr, ship.getModifiedItemAttr('structureAoERoFRoleBonus'))
+                                          attr, ship.getModifiedItemAttr('structureAoERoFRoleBonus'), **kwargs)
 
 
 class Effect7031(BaseEffect):
@@ -34187,9 +34047,9 @@ class Effect7031(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Missiles'), 'kineticDamage',
-                                        src.getModifiedItemAttr('shipBonusCBC2'), skill='Caldari Battlecruiser')
+                                        src.getModifiedItemAttr('shipBonusCBC2'), skill='Caldari Battlecruiser', **kwargs)
 
 
 class Effect7032(BaseEffect):
@@ -34203,9 +34063,9 @@ class Effect7032(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Missiles'), 'thermalDamage',
-                                        src.getModifiedItemAttr('shipBonusCBC2'), skill='Caldari Battlecruiser')
+                                        src.getModifiedItemAttr('shipBonusCBC2'), skill='Caldari Battlecruiser', **kwargs)
 
 
 class Effect7033(BaseEffect):
@@ -34219,9 +34079,9 @@ class Effect7033(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Missiles'),
-                                        'emDamage', src.getModifiedItemAttr('shipBonusCBC2'), skill='Caldari Battlecruiser')
+                                        'emDamage', src.getModifiedItemAttr('shipBonusCBC2'), skill='Caldari Battlecruiser', **kwargs)
 
 
 class Effect7034(BaseEffect):
@@ -34235,9 +34095,9 @@ class Effect7034(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Missiles'), 'explosiveDamage',
-                                        src.getModifiedItemAttr('shipBonusCBC2'), skill='Caldari Battlecruiser')
+                                        src.getModifiedItemAttr('shipBonusCBC2'), skill='Caldari Battlecruiser', **kwargs)
 
 
 class Effect7035(BaseEffect):
@@ -34251,9 +34111,9 @@ class Effect7035(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Assault Missiles'), 'explosiveDamage',
-                                        src.getModifiedItemAttr('shipBonusCBC2'), skill='Caldari Battlecruiser')
+                                        src.getModifiedItemAttr('shipBonusCBC2'), skill='Caldari Battlecruiser', **kwargs)
 
 
 class Effect7036(BaseEffect):
@@ -34267,9 +34127,9 @@ class Effect7036(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Assault Missiles'), 'emDamage',
-                                        src.getModifiedItemAttr('shipBonusCBC2'), skill='Caldari Battlecruiser')
+                                        src.getModifiedItemAttr('shipBonusCBC2'), skill='Caldari Battlecruiser', **kwargs)
 
 
 class Effect7037(BaseEffect):
@@ -34283,9 +34143,9 @@ class Effect7037(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Assault Missiles'),
-                                        'thermalDamage', src.getModifiedItemAttr('shipBonusCBC2'), skill='Caldari Battlecruiser')
+                                        'thermalDamage', src.getModifiedItemAttr('shipBonusCBC2'), skill='Caldari Battlecruiser', **kwargs)
 
 
 class Effect7038(BaseEffect):
@@ -34299,9 +34159,9 @@ class Effect7038(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Assault Missiles'),
-                                        'kineticDamage', src.getModifiedItemAttr('shipBonusCBC2'), skill='Caldari Battlecruiser')
+                                        'kineticDamage', src.getModifiedItemAttr('shipBonusCBC2'), skill='Caldari Battlecruiser', **kwargs)
 
 
 class Effect7039(BaseEffect):
@@ -34315,12 +34175,12 @@ class Effect7039(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         groups = ('Structure Anti-Subcapital Missile', 'Structure Anti-Capital Missile')
         for dmgType in ('em', 'kinetic', 'explosive', 'thermal'):
             fit.modules.filteredChargeMultiply(lambda mod: mod.item.group.name in groups,
                                                '%sDamage' % dmgType,
-                                               src.getModifiedItemAttr('hiddenMissileDamageMultiplier'))
+                                               src.getModifiedItemAttr('hiddenMissileDamageMultiplier'), **kwargs)
 
 
 class Effect7040(BaseEffect):
@@ -34334,8 +34194,8 @@ class Effect7040(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
-        fit.ship.multiplyItemAttr('armorHP', src.getModifiedItemAttr('hiddenArmorHPMultiplier') or 0)
+    def handler(fit, src, context, **kwargs):
+        fit.ship.multiplyItemAttr('armorHP', src.getModifiedItemAttr('hiddenArmorHPMultiplier') or 0, **kwargs)
 
 
 class Effect7042(BaseEffect):
@@ -34349,8 +34209,8 @@ class Effect7042(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
-        fit.ship.boostItemAttr('armorHP', src.getModifiedItemAttr('shipBonusAC'), skill='Amarr Cruiser')
+    def handler(fit, src, context, **kwargs):
+        fit.ship.boostItemAttr('armorHP', src.getModifiedItemAttr('shipBonusAC'), skill='Amarr Cruiser', **kwargs)
 
 
 class Effect7043(BaseEffect):
@@ -34364,8 +34224,8 @@ class Effect7043(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
-        fit.ship.boostItemAttr('shieldCapacity', src.getModifiedItemAttr('shipBonusCC'), skill='Caldari Cruiser')
+    def handler(fit, src, context, **kwargs):
+        fit.ship.boostItemAttr('shieldCapacity', src.getModifiedItemAttr('shipBonusCC'), skill='Caldari Cruiser', **kwargs)
 
 
 class Effect7044(BaseEffect):
@@ -34379,8 +34239,8 @@ class Effect7044(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
-        fit.ship.boostItemAttr('agility', src.getModifiedItemAttr('shipBonusGC'), skill='Gallente Cruiser')
+    def handler(fit, src, context, **kwargs):
+        fit.ship.boostItemAttr('agility', src.getModifiedItemAttr('shipBonusGC'), skill='Gallente Cruiser', **kwargs)
 
 
 class Effect7045(BaseEffect):
@@ -34394,8 +34254,8 @@ class Effect7045(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
-        fit.ship.boostItemAttr('signatureRadius', src.getModifiedItemAttr('shipBonusMC'), skill='Minmatar Cruiser')
+    def handler(fit, src, context, **kwargs):
+        fit.ship.boostItemAttr('signatureRadius', src.getModifiedItemAttr('shipBonusMC'), skill='Minmatar Cruiser', **kwargs)
 
 
 class Effect7046(BaseEffect):
@@ -34409,19 +34269,19 @@ class Effect7046(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
-        fit.ship.boostItemAttr('explosiveDamageResonance', src.getModifiedItemAttr('eliteBonusFlagCruisers1'), skill='Flag Cruisers')
-        fit.ship.boostItemAttr('shieldKineticDamageResonance', src.getModifiedItemAttr('eliteBonusFlagCruisers1'), skill='Flag Cruisers')
-        fit.ship.boostItemAttr('shieldExplosiveDamageResonance', src.getModifiedItemAttr('eliteBonusFlagCruisers1'), skill='Flag Cruisers')
-        fit.ship.boostItemAttr('armorThermalDamageResonance', src.getModifiedItemAttr('eliteBonusFlagCruisers1'), skill='Flag Cruisers')
-        fit.ship.boostItemAttr('thermalDamageResonance', src.getModifiedItemAttr('eliteBonusFlagCruisers1'), skill='Flag Cruisers')
-        fit.ship.boostItemAttr('shieldEmDamageResonance', src.getModifiedItemAttr('eliteBonusFlagCruisers1'), skill='Flag Cruisers')
-        fit.ship.boostItemAttr('armorExplosiveDamageResonance', src.getModifiedItemAttr('eliteBonusFlagCruisers1'), skill='Flag Cruisers')
-        fit.ship.boostItemAttr('armorEmDamageResonance', src.getModifiedItemAttr('eliteBonusFlagCruisers1'), skill='Flag Cruisers')
-        fit.ship.boostItemAttr('shieldThermalDamageResonance', src.getModifiedItemAttr('eliteBonusFlagCruisers1'), skill='Flag Cruisers')
-        fit.ship.boostItemAttr('kineticDamageResonance', src.getModifiedItemAttr('eliteBonusFlagCruisers1'), skill='Flag Cruisers')
-        fit.ship.boostItemAttr('armorKineticDamageResonance', src.getModifiedItemAttr('eliteBonusFlagCruisers1'), skill='Flag Cruisers')
-        fit.ship.boostItemAttr('emDamageResonance', src.getModifiedItemAttr('eliteBonusFlagCruisers1'), skill='Flag Cruisers')
+    def handler(fit, src, context, **kwargs):
+        fit.ship.boostItemAttr('explosiveDamageResonance', src.getModifiedItemAttr('eliteBonusFlagCruisers1'), skill='Flag Cruisers', **kwargs)
+        fit.ship.boostItemAttr('shieldKineticDamageResonance', src.getModifiedItemAttr('eliteBonusFlagCruisers1'), skill='Flag Cruisers', **kwargs)
+        fit.ship.boostItemAttr('shieldExplosiveDamageResonance', src.getModifiedItemAttr('eliteBonusFlagCruisers1'), skill='Flag Cruisers', **kwargs)
+        fit.ship.boostItemAttr('armorThermalDamageResonance', src.getModifiedItemAttr('eliteBonusFlagCruisers1'), skill='Flag Cruisers', **kwargs)
+        fit.ship.boostItemAttr('thermalDamageResonance', src.getModifiedItemAttr('eliteBonusFlagCruisers1'), skill='Flag Cruisers', **kwargs)
+        fit.ship.boostItemAttr('shieldEmDamageResonance', src.getModifiedItemAttr('eliteBonusFlagCruisers1'), skill='Flag Cruisers', **kwargs)
+        fit.ship.boostItemAttr('armorExplosiveDamageResonance', src.getModifiedItemAttr('eliteBonusFlagCruisers1'), skill='Flag Cruisers', **kwargs)
+        fit.ship.boostItemAttr('armorEmDamageResonance', src.getModifiedItemAttr('eliteBonusFlagCruisers1'), skill='Flag Cruisers', **kwargs)
+        fit.ship.boostItemAttr('shieldThermalDamageResonance', src.getModifiedItemAttr('eliteBonusFlagCruisers1'), skill='Flag Cruisers', **kwargs)
+        fit.ship.boostItemAttr('kineticDamageResonance', src.getModifiedItemAttr('eliteBonusFlagCruisers1'), skill='Flag Cruisers', **kwargs)
+        fit.ship.boostItemAttr('armorKineticDamageResonance', src.getModifiedItemAttr('eliteBonusFlagCruisers1'), skill='Flag Cruisers', **kwargs)
+        fit.ship.boostItemAttr('emDamageResonance', src.getModifiedItemAttr('eliteBonusFlagCruisers1'), skill='Flag Cruisers', **kwargs)
 
 
 class Effect7047(BaseEffect):
@@ -34435,16 +34295,16 @@ class Effect7047(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in ('Propulsion Module', 'Micro Jump Drive'),
-                                      'power', src.getModifiedItemAttr('flagCruiserFittingBonusPropMods'))
+                                      'power', src.getModifiedItemAttr('flagCruiserFittingBonusPropMods'), **kwargs)
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in ('Propulsion Module', 'Micro Jump Drive'),
-                                      'cpu', src.getModifiedItemAttr('flagCruiserFittingBonusPropMods'))
+                                      'cpu', src.getModifiedItemAttr('flagCruiserFittingBonusPropMods'), **kwargs)
 
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in ('Target Painter', 'Scan Probe Launcher'),
-                                      'cpu', src.getModifiedItemAttr('flagCruiserFittingBonusPainterProbes'))
+                                      'cpu', src.getModifiedItemAttr('flagCruiserFittingBonusPainterProbes'), **kwargs)
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in ('Target Painter', 'Scan Probe Launcher'),
-                                      'power', src.getModifiedItemAttr('flagCruiserFittingBonusPainterProbes'))
+                                      'power', src.getModifiedItemAttr('flagCruiserFittingBonusPainterProbes'), **kwargs)
 
 
 class Effect7050(BaseEffect):
@@ -34502,11 +34362,11 @@ class Effect7052(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Target Painter', 'signatureRadiusBonus',
-                                      src.getModifiedItemAttr('targetPainterStrengthModifierFlagCruisers'))
+                                      src.getModifiedItemAttr('targetPainterStrengthModifierFlagCruisers'), **kwargs)
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Target Painter', 'maxRange',
-                                      src.getModifiedItemAttr('targetPainterRangeModifierFlagCruisers'))
+                                      src.getModifiedItemAttr('targetPainterRangeModifierFlagCruisers'), **kwargs)
 
 
 class Effect7055(BaseEffect):
@@ -34520,37 +34380,37 @@ class Effect7055(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Large Hybrid Turret'), 'damageMultiplier',
-                                      src.getModifiedItemAttr('shipBonusRole7'))
+                                      src.getModifiedItemAttr('shipBonusRole7'), **kwargs)
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Large Projectile Turret'), 'damageMultiplier',
-                                      src.getModifiedItemAttr('shipBonusRole7'))
+                                      src.getModifiedItemAttr('shipBonusRole7'), **kwargs)
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Large Energy Turret'), 'damageMultiplier',
-                                      src.getModifiedItemAttr('shipBonusRole7'))
+                                      src.getModifiedItemAttr('shipBonusRole7'), **kwargs)
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Missiles'), 'thermalDamage',
-                                        src.getModifiedItemAttr('shipBonusRole7'))
+                                        src.getModifiedItemAttr('shipBonusRole7'), **kwargs)
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Missiles'), 'emDamage',
-                                        src.getModifiedItemAttr('shipBonusRole7'))
+                                        src.getModifiedItemAttr('shipBonusRole7'), **kwargs)
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Missiles'), 'kineticDamage',
-                                        src.getModifiedItemAttr('shipBonusRole7'))
+                                        src.getModifiedItemAttr('shipBonusRole7'), **kwargs)
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Missiles'), 'explosiveDamage',
-                                        src.getModifiedItemAttr('shipBonusRole7'))
+                                        src.getModifiedItemAttr('shipBonusRole7'), **kwargs)
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Torpedoes'), 'emDamage',
-                                        src.getModifiedItemAttr('shipBonusRole7'))
+                                        src.getModifiedItemAttr('shipBonusRole7'), **kwargs)
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Torpedoes'), 'kineticDamage',
-                                        src.getModifiedItemAttr('shipBonusRole7'))
+                                        src.getModifiedItemAttr('shipBonusRole7'), **kwargs)
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Torpedoes'), 'explosiveDamage',
-                                        src.getModifiedItemAttr('shipBonusRole7'))
+                                        src.getModifiedItemAttr('shipBonusRole7'), **kwargs)
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Torpedoes'), 'thermalDamage',
-                                        src.getModifiedItemAttr('shipBonusRole7'))
+                                        src.getModifiedItemAttr('shipBonusRole7'), **kwargs)
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Cruise Missiles'), 'thermalDamage',
-                                        src.getModifiedItemAttr('shipBonusRole7'))
+                                        src.getModifiedItemAttr('shipBonusRole7'), **kwargs)
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Cruise Missiles'), 'explosiveDamage',
-                                        src.getModifiedItemAttr('shipBonusRole7'))
+                                        src.getModifiedItemAttr('shipBonusRole7'), **kwargs)
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Cruise Missiles'), 'kineticDamage',
-                                        src.getModifiedItemAttr('shipBonusRole7'))
+                                        src.getModifiedItemAttr('shipBonusRole7'), **kwargs)
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Cruise Missiles'), 'emDamage',
-                                        src.getModifiedItemAttr('shipBonusRole7'))
+                                        src.getModifiedItemAttr('shipBonusRole7'), **kwargs)
 
 
 class Effect7058(BaseEffect):
@@ -34718,10 +34578,10 @@ class Effect7071(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, container, context):
+    def handler(fit, container, context, **kwargs):
         level = container.level if 'skill' in context else 1
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Precursor Weapon'),
-                                      'damageMultiplier', container.getModifiedItemAttr('damageMultiplierBonus') * level)
+                                      'damageMultiplier', container.getModifiedItemAttr('damageMultiplierBonus') * level, **kwargs)
 
 
 class Effect7072(BaseEffect):
@@ -34735,10 +34595,10 @@ class Effect7072(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, container, context):
+    def handler(fit, container, context, **kwargs):
         level = container.level if 'skill' in context else 1
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Precursor Weapon'),
-                                      'damageMultiplier', container.getModifiedItemAttr('damageMultiplierBonus') * level)
+                                      'damageMultiplier', container.getModifiedItemAttr('damageMultiplierBonus') * level, **kwargs)
 
 
 class Effect7073(BaseEffect):
@@ -34752,10 +34612,10 @@ class Effect7073(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, container, context):
+    def handler(fit, container, context, **kwargs):
         level = container.level if 'skill' in context else 1
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Large Precursor Weapon'),
-                                      'damageMultiplier', container.getModifiedItemAttr('damageMultiplierBonus') * level)
+                                      'damageMultiplier', container.getModifiedItemAttr('damageMultiplierBonus') * level, **kwargs)
 
 
 class Effect7074(BaseEffect):
@@ -34769,10 +34629,10 @@ class Effect7074(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, container, context):
+    def handler(fit, container, context, **kwargs):
         level = container.level if 'skill' in context else 1
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Disintegrator Specialization'),
-                                      'damageMultiplier', container.getModifiedItemAttr('damageMultiplierBonus') * level)
+                                      'damageMultiplier', container.getModifiedItemAttr('damageMultiplierBonus') * level, **kwargs)
 
 
 class Effect7075(BaseEffect):
@@ -34786,10 +34646,10 @@ class Effect7075(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, container, context):
+    def handler(fit, container, context, **kwargs):
         level = container.level if 'skill' in context else 1
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Disintegrator Specialization'),
-                                      'damageMultiplier', container.getModifiedItemAttr('damageMultiplierBonus') * level)
+                                      'damageMultiplier', container.getModifiedItemAttr('damageMultiplierBonus') * level, **kwargs)
 
 
 class Effect7076(BaseEffect):
@@ -34803,10 +34663,10 @@ class Effect7076(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, container, context):
+    def handler(fit, container, context, **kwargs):
         level = container.level if 'skill' in context else 1
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Large Disintegrator Specialization'),
-                                      'damageMultiplier', container.getModifiedItemAttr('damageMultiplierBonus') * level)
+                                      'damageMultiplier', container.getModifiedItemAttr('damageMultiplierBonus') * level, **kwargs)
 
 
 class Effect7077(BaseEffect):
@@ -34820,10 +34680,10 @@ class Effect7077(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == 'Precursor Weapon',
                                          'damageMultiplier', module.getModifiedItemAttr('damageMultiplier'),
-                                         stackingPenalties=True)
+                                         stackingPenalties=True, **kwargs)
 
 
 class Effect7078(BaseEffect):
@@ -34837,10 +34697,10 @@ class Effect7078(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == 'Precursor Weapon',
                                          'speed', module.getModifiedItemAttr('speedMultiplier'),
-                                         stackingPenalties=True)
+                                         stackingPenalties=True, **kwargs)
 
 
 class Effect7079(BaseEffect):
@@ -34854,9 +34714,9 @@ class Effect7079(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Large Precursor Weapon'),
-                                      'speed', ship.getModifiedItemAttr('shipBonusPBS1'), skill='Precursor Battleship')
+                                      'speed', ship.getModifiedItemAttr('shipBonusPBS1'), skill='Precursor Battleship', **kwargs)
 
 
 class Effect7080(BaseEffect):
@@ -34870,9 +34730,9 @@ class Effect7080(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Large Precursor Weapon'),
-                                      'damageMultiplier', ship.getModifiedItemAttr('shipBonusPBS2'), skill='Precursor Battleship')
+                                      'damageMultiplier', ship.getModifiedItemAttr('shipBonusPBS2'), skill='Precursor Battleship', **kwargs)
 
 
 class Effect7085(BaseEffect):
@@ -34887,9 +34747,9 @@ class Effect7085(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Precursor Weapon'),
-                                      'damageMultiplier', ship.getModifiedItemAttr('shipBonusPC1'), skill='Precursor Cruiser')
+                                      'damageMultiplier', ship.getModifiedItemAttr('shipBonusPC1'), skill='Precursor Cruiser', **kwargs)
 
 
 class Effect7086(BaseEffect):
@@ -34904,9 +34764,9 @@ class Effect7086(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Precursor Weapon'),
-                                      'trackingSpeed', ship.getModifiedItemAttr('shipBonusPC2'), skill='Precursor Cruiser')
+                                      'trackingSpeed', ship.getModifiedItemAttr('shipBonusPC2'), skill='Precursor Cruiser', **kwargs)
 
 
 class Effect7087(BaseEffect):
@@ -34920,9 +34780,9 @@ class Effect7087(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Precursor Weapon'),
-                                      'maxRange', ship.getModifiedItemAttr('shipBonusPF2'), skill='Precursor Frigate')
+                                      'maxRange', ship.getModifiedItemAttr('shipBonusPF2'), skill='Precursor Frigate', **kwargs)
 
 
 class Effect7088(BaseEffect):
@@ -34937,9 +34797,9 @@ class Effect7088(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Precursor Weapon'),
-                                      'damageMultiplier', ship.getModifiedItemAttr('shipBonusPF1'), skill='Precursor Frigate')
+                                      'damageMultiplier', ship.getModifiedItemAttr('shipBonusPF1'), skill='Precursor Frigate', **kwargs)
 
 
 class Effect7091(BaseEffect):
@@ -34953,8 +34813,8 @@ class Effect7091(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Capacitor Emission Systems'), 'capacitorNeed', src.getModifiedItemAttr('shipBonusRole2'))
+    def handler(fit, src, context, **kwargs):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Capacitor Emission Systems'), 'capacitorNeed', src.getModifiedItemAttr('shipBonusRole2'), **kwargs)
 
 
 class Effect7092(BaseEffect):
@@ -34974,9 +34834,9 @@ class Effect7092(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Remote Armor Repair Systems'),
-                                      'capacitorNeed', ship.getModifiedItemAttr('shipBonusRole2'))
+                                      'capacitorNeed', ship.getModifiedItemAttr('shipBonusRole2'), **kwargs)
 
 
 class Effect7093(BaseEffect):
@@ -34997,9 +34857,9 @@ class Effect7093(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Energy Pulse Weapons'),
-                                      'capacitorNeed', ship.getModifiedItemAttr('shipBonusRole2'))
+                                      'capacitorNeed', ship.getModifiedItemAttr('shipBonusRole2'), **kwargs)
 
 
 class Effect7094(BaseEffect):
@@ -35019,9 +34879,9 @@ class Effect7094(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Remote Armor Repair Systems'),
-                                      'maxRange', ship.getModifiedItemAttr('shipBonusRole1'))
+                                      'maxRange', ship.getModifiedItemAttr('shipBonusRole1'), **kwargs)
 
 
 class Effect7097(BaseEffect):
@@ -35035,9 +34895,9 @@ class Effect7097(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, skill, context):
+    def handler(fit, skill, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Precursor Weapon',
-                                      'damageMultiplier', skill.getModifiedItemAttr('damageMultiplierBonus') * skill.level)
+                                      'damageMultiplier', skill.getModifiedItemAttr('damageMultiplierBonus') * skill.level, **kwargs)
 
 
 class Effect7111(BaseEffect):
@@ -35052,10 +34912,10 @@ class Effect7111(BaseEffect):
     type = ('projected', 'passive')
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill('Small Precursor Weapon'),
                                          'damageMultiplier', module.getModifiedItemAttr('smallWeaponDamageMultiplier'),
-                                         stackingPenalties=True)
+                                         stackingPenalties=True, **kwargs)
 
 
 class Effect7112(BaseEffect):
@@ -35075,9 +34935,9 @@ class Effect7112(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Energy Neutralizer', 'capacitorNeed',
-                                      src.getModifiedItemAttr('shipBonusRole2'))
+                                      src.getModifiedItemAttr('shipBonusRole2'), **kwargs)
 
 
 class Effect7116(BaseEffect):
@@ -35091,9 +34951,9 @@ class Effect7116(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Astrometrics'), 'baseSensorStrength',
-                                        src.getModifiedItemAttr('eliteBonusReconShip2'), skill='Recon Ships')
+                                        src.getModifiedItemAttr('eliteBonusReconShip2'), skill='Recon Ships', **kwargs)
 
 
 class Effect7117(BaseEffect):
@@ -35111,8 +34971,8 @@ class Effect7117(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
-        fit.ship.boostItemAttr('warpSpeedMultiplier', src.getModifiedItemAttr('shipRoleBonusWarpSpeed'))
+    def handler(fit, src, context, **kwargs):
+        fit.ship.boostItemAttr('warpSpeedMultiplier', src.getModifiedItemAttr('shipRoleBonusWarpSpeed'), **kwargs)
 
 
 class Effect7118(BaseEffect):
@@ -35126,9 +34986,9 @@ class Effect7118(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemIncrease(lambda mod: mod.item.requiresSkill('Small Precursor Weapon'), 'damageMultiplierBonusPerCycle',
-                                         src.getModifiedItemAttr('eliteBonusCovertOps3'), skill='Covert Ops')
+                                         src.getModifiedItemAttr('eliteBonusCovertOps3'), skill='Covert Ops', **kwargs)
 
 
 class Effect7119(BaseEffect):
@@ -35142,9 +35002,9 @@ class Effect7119(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemIncrease(lambda mod: mod.item.requiresSkill('Medium Precursor Weapon'), 'damageMultiplierBonusPerCycle',
-                                         src.getModifiedItemAttr('eliteBonusReconShip3'), skill='Recon Ships')
+                                         src.getModifiedItemAttr('eliteBonusReconShip3'), skill='Recon Ships', **kwargs)
 
 
 class Effect7142(BaseEffect):
@@ -35158,16 +35018,16 @@ class Effect7142(BaseEffect):
     type = 'active'
 
     @staticmethod
-    def handler(fit, src, context):
-        fit.ship.increaseItemAttr('warpScrambleStatus', src.getModifiedItemAttr('warpScrambleStrength'))
-        fit.ship.boostItemAttr('mass', src.getModifiedItemAttr('massBonusPercentage'), stackingPenalties=True)
+    def handler(fit, src, context, **kwargs):
+        fit.ship.increaseItemAttr('warpScrambleStatus', src.getModifiedItemAttr('warpScrambleStrength'), **kwargs)
+        fit.ship.boostItemAttr('mass', src.getModifiedItemAttr('massBonusPercentage'), stackingPenalties=True, **kwargs)
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Afterburner'), 'speedFactor',
-                                      src.getModifiedItemAttr('speedFactorBonus'), stackingPenalties=True)
+                                      src.getModifiedItemAttr('speedFactorBonus'), stackingPenalties=True, **kwargs)
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Afterburner'), 'speedBoostFactor',
-                                      src.getModifiedItemAttr('speedBoostFactorBonus'))
+                                      src.getModifiedItemAttr('speedBoostFactorBonus'), **kwargs)
         fit.modules.filteredItemIncrease(lambda mod: mod.item.requiresSkill('High Speed Maneuvering'), 'activationBlocked',
-                                         src.getModifiedItemAttr('activationBlockedStrenght'))
-        fit.ship.boostItemAttr('maxVelocity', src.getModifiedItemAttr('maxVelocityBonus'), stackingPenalties=True)
+                                         src.getModifiedItemAttr('activationBlockedStrenght'), **kwargs)
+        fit.ship.boostItemAttr('maxVelocity', src.getModifiedItemAttr('maxVelocityBonus'), stackingPenalties=True, **kwargs)
 
 
 class Effect7154(BaseEffect):
@@ -35181,10 +35041,10 @@ class Effect7154(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Precursor Weapon'),
                                       'damageMultiplier', ship.getModifiedItemAttr('shipBonusPD1'),
-                                      skill='Precursor Destroyer')
+                                      skill='Precursor Destroyer', **kwargs)
 
 
 class Effect7155(BaseEffect):
@@ -35198,10 +35058,10 @@ class Effect7155(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Precursor Weapon'),
                                       'damageMultiplier', ship.getModifiedItemAttr('shipBonusPBC1'),
-                                      skill='Precursor Battlecruiser')
+                                      skill='Precursor Battlecruiser', **kwargs)
 
 
 class Effect7156(BaseEffect):
@@ -35215,9 +35075,9 @@ class Effect7156(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Precursor Weapon'),
-                                      'maxRange', ship.getModifiedItemAttr('maxRangeBonus'))
+                                      'maxRange', ship.getModifiedItemAttr('maxRangeBonus'), **kwargs)
 
 
 class Effect7157(BaseEffect):
@@ -35231,10 +35091,10 @@ class Effect7157(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Precursor Weapon'),
                                       'maxRange', ship.getModifiedItemAttr('shipBonusPD2'),
-                                      skill='Precursor Destroyer')
+                                      skill='Precursor Destroyer', **kwargs)
 
 
 class Effect7158(BaseEffect):
@@ -35248,9 +35108,9 @@ class Effect7158(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.ship.boostItemAttr('armorKineticDamageResonance', ship.getModifiedItemAttr('shipBonusPBC2'),
-                               skill='Precursor Battlecruiser')
+                               skill='Precursor Battlecruiser', **kwargs)
 
 
 class Effect7159(BaseEffect):
@@ -35264,9 +35124,9 @@ class Effect7159(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.ship.boostItemAttr('armorThermalDamageResonance', ship.getModifiedItemAttr('shipBonusPBC2'),
-                               skill='Precursor Battlecruiser')
+                               skill='Precursor Battlecruiser', **kwargs)
 
 
 class Effect7160(BaseEffect):
@@ -35280,9 +35140,9 @@ class Effect7160(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.ship.boostItemAttr('armorEmDamageResonance', ship.getModifiedItemAttr('shipBonusPBC2'),
-                               skill='Precursor Battlecruiser')
+                               skill='Precursor Battlecruiser', **kwargs)
 
 
 class Effect7161(BaseEffect):
@@ -35296,9 +35156,9 @@ class Effect7161(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.ship.boostItemAttr('armorExplosiveDamageResonance', ship.getModifiedItemAttr('shipBonusPBC2'),
-                               skill='Precursor Battlecruiser')
+                               skill='Precursor Battlecruiser', **kwargs)
 
 
 class Effect7162(BaseEffect):
@@ -35312,9 +35172,9 @@ class Effect7162(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Precursor Weapon'),
-                                      'maxRange', ship.getModifiedItemAttr('roleBonusCBC'))
+                                      'maxRange', ship.getModifiedItemAttr('roleBonusCBC'), **kwargs)
 
 
 class Effect7166(BaseEffect):
@@ -35356,8 +35216,8 @@ class Effect7167(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
-        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Remote Capacitor Transmitter', 'maxRange', src.getModifiedItemAttr('shipBonusRole1'))
+    def handler(fit, src, context, **kwargs):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Remote Capacitor Transmitter', 'maxRange', src.getModifiedItemAttr('shipBonusRole1'), **kwargs)
 
 
 class Effect7168(BaseEffect):
@@ -35371,8 +35231,8 @@ class Effect7168(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
-        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Mutadaptive Remote Armor Repairer', 'maxRange', src.getModifiedItemAttr('shipBonusRole3'))
+    def handler(fit, src, context, **kwargs):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Mutadaptive Remote Armor Repairer', 'maxRange', src.getModifiedItemAttr('shipBonusRole3'), **kwargs)
 
 
 class Effect7169(BaseEffect):
@@ -35386,8 +35246,8 @@ class Effect7169(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
-        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Mutadaptive Remote Armor Repairer', 'armorDamageAmount', src.getModifiedItemAttr('shipBonusPC1'), skill='Precursor Cruiser')
+    def handler(fit, src, context, **kwargs):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Mutadaptive Remote Armor Repairer', 'armorDamageAmount', src.getModifiedItemAttr('shipBonusPC1'), skill='Precursor Cruiser', **kwargs)
 
 
 class Effect7170(BaseEffect):
@@ -35401,8 +35261,8 @@ class Effect7170(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
-        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Mutadaptive Remote Armor Repairer', 'capacitorNeed', src.getModifiedItemAttr('shipBonusPC2'), skill='Precursor Cruiser')
+    def handler(fit, src, context, **kwargs):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Mutadaptive Remote Armor Repairer', 'capacitorNeed', src.getModifiedItemAttr('shipBonusPC2'), skill='Precursor Cruiser', **kwargs)
 
 
 class Effect7171(BaseEffect):
@@ -35416,8 +35276,8 @@ class Effect7171(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
-        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Mutadaptive Remote Armor Repairer', 'maxRange', src.getModifiedItemAttr('shipBonusPC1'), skill='Precursor Cruiser')
+    def handler(fit, src, context, **kwargs):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Mutadaptive Remote Armor Repairer', 'maxRange', src.getModifiedItemAttr('shipBonusPC1'), skill='Precursor Cruiser', **kwargs)
 
 
 class Effect7172(BaseEffect):
@@ -35431,8 +35291,8 @@ class Effect7172(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
-        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Mutadaptive Remote Armor Repairer', 'capacitorNeed', src.getModifiedItemAttr('eliteBonusLogistics1'), skill='Logistics Cruisers')
+    def handler(fit, src, context, **kwargs):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Mutadaptive Remote Armor Repairer', 'capacitorNeed', src.getModifiedItemAttr('eliteBonusLogistics1'), skill='Logistics Cruisers', **kwargs)
 
 
 class Effect7173(BaseEffect):
@@ -35446,8 +35306,8 @@ class Effect7173(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
-        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Mutadaptive Remote Armor Repairer', 'armorDamageAmount', src.getModifiedItemAttr('eliteBonusLogistics2'), skill='Logistics Cruisers')
+    def handler(fit, src, context, **kwargs):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Mutadaptive Remote Armor Repairer', 'armorDamageAmount', src.getModifiedItemAttr('eliteBonusLogistics2'), skill='Logistics Cruisers', **kwargs)
 
 
 class Effect7176(BaseEffect):
@@ -35462,9 +35322,9 @@ class Effect7176(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Drones'), 'damageMultiplier',
-                                     src.getModifiedItemAttr('damageMultiplierBonus'))
+                                     src.getModifiedItemAttr('damageMultiplierBonus'), **kwargs)
 
 
 class Effect7177(BaseEffect):
@@ -35478,13 +35338,13 @@ class Effect7177(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Drones'), 'hp',
                                      src.getModifiedItemAttr('hullHpBonus'))
         fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Drones'), 'armorHP',
                                      src.getModifiedItemAttr('armorHpBonus'))
         fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Drones'), 'shieldCapacity',
-                                     src.getModifiedItemAttr('shieldCapacityBonus'))
+                                     src.getModifiedItemAttr('shieldCapacityBonus'), **kwargs)
 
 
 class Effect7179(BaseEffect):
@@ -35498,9 +35358,9 @@ class Effect7179(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Strip Miner',
-                                      'duration', module.getModifiedItemAttr('miningDurationMultiplier'))
+                                      'duration', module.getModifiedItemAttr('miningDurationMultiplier'), **kwargs)
 
 
 class Effect7180(BaseEffect):
@@ -35514,9 +35374,9 @@ class Effect7180(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, module, context):
+    def handler(fit, module, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Mining Laser',
-                                      'duration', module.getModifiedItemAttr('miningDurationMultiplier'))
+                                      'duration', module.getModifiedItemAttr('miningDurationMultiplier'), **kwargs)
 
 
 class Effect7183(BaseEffect):
@@ -35530,10 +35390,10 @@ class Effect7183(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, src, context):
+    def handler(fit, src, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Warp Scrambler',
                                       'maxRange', src.getModifiedItemAttr('warpScrambleRangeBonus'),
-                                      stackingPenalties=False)
+                                      stackingPenalties=False, **kwargs)
 
 
 class Effect7184(BaseEffect):
@@ -35547,9 +35407,9 @@ class Effect7184(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Medium Drone Operation'),
-                                     'hp', ship.getModifiedItemAttr('shipBonusRole8'))
+                                     'hp', ship.getModifiedItemAttr('shipBonusRole8'), **kwargs)
 
 
 class Effect7185(BaseEffect):
@@ -35563,9 +35423,9 @@ class Effect7185(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Medium Drone Operation'),
-                                     'shieldCapacity', ship.getModifiedItemAttr('shipBonusRole8'))
+                                     'shieldCapacity', ship.getModifiedItemAttr('shipBonusRole8'), **kwargs)
 
 
 class Effect7186(BaseEffect):
@@ -35579,9 +35439,9 @@ class Effect7186(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Medium Drone Operation'),
-                                     'armorHP', ship.getModifiedItemAttr('shipBonusRole8'))
+                                     'armorHP', ship.getModifiedItemAttr('shipBonusRole8'), **kwargs)
 
 
 class Effect7193(BaseEffect):
@@ -35596,9 +35456,9 @@ class Effect7193(BaseEffect):
     type = ('projected', 'passive')
 
     @staticmethod
-    def handler(fit, beacon, context):
+    def handler(fit, beacon, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Mining'),
-                                      'duration', beacon.getModifiedItemAttr('miningDurationMultiplier'))
+                                      'duration', beacon.getModifiedItemAttr('miningDurationMultiplier'), **kwargs)
 
 
 class Effect7202(BaseEffect):
@@ -35613,10 +35473,10 @@ class Effect7202(BaseEffect):
     type = ('projected', 'passive')
 
     @staticmethod
-    def handler(fit, beacon, context):
+    def handler(fit, beacon, context, **kwargs):
         fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Drones'),
                                      'maxVelocity', beacon.getModifiedItemAttr('droneMaxVelocityBonus'),
-                                     stackingPenalties=True)
+                                     stackingPenalties=True, **kwargs)
 
 
 class Effect7203(BaseEffect):
@@ -35631,10 +35491,10 @@ class Effect7203(BaseEffect):
     type = ('projected', 'passive')
 
     @staticmethod
-    def handler(fit, beacon, context):
+    def handler(fit, beacon, context, **kwargs):
         fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Drones'),
                                      'damageMultiplier', beacon.getModifiedItemAttr('droneDamageBonus'),
-                                     stackingPenalties=True)
+                                     stackingPenalties=True, **kwargs)
 
 
 class Effect7204(BaseEffect):
@@ -35648,8 +35508,8 @@ class Effect7204(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
-        fit.ship.boostItemAttr('armorEmDamageResonance', ship.getModifiedItemAttr('shipBonusPF2'), skill='Precursor Frigate')
+    def handler(fit, ship, context, **kwargs):
+        fit.ship.boostItemAttr('armorEmDamageResonance', ship.getModifiedItemAttr('shipBonusPF2'), skill='Precursor Frigate', **kwargs)
 
 
 class Effect7205(BaseEffect):
@@ -35663,8 +35523,8 @@ class Effect7205(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
-        fit.ship.boostItemAttr('armorKineticDamageResonance', ship.getModifiedItemAttr('shipBonusPF2'), skill='Precursor Frigate')
+    def handler(fit, ship, context, **kwargs):
+        fit.ship.boostItemAttr('armorKineticDamageResonance', ship.getModifiedItemAttr('shipBonusPF2'), skill='Precursor Frigate', **kwargs)
 
 
 class Effect7206(BaseEffect):
@@ -35678,8 +35538,8 @@ class Effect7206(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
-        fit.ship.boostItemAttr('armorThermalDamageResonance', ship.getModifiedItemAttr('shipBonusPF2'), skill='Precursor Frigate')
+    def handler(fit, ship, context, **kwargs):
+        fit.ship.boostItemAttr('armorThermalDamageResonance', ship.getModifiedItemAttr('shipBonusPF2'), skill='Precursor Frigate', **kwargs)
 
 
 class Effect7207(BaseEffect):
@@ -35693,8 +35553,8 @@ class Effect7207(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
-        fit.ship.boostItemAttr('armorExplosiveDamageResonance', ship.getModifiedItemAttr('shipBonusPF2'), skill='Precursor Frigate')
+    def handler(fit, ship, context, **kwargs):
+        fit.ship.boostItemAttr('armorExplosiveDamageResonance', ship.getModifiedItemAttr('shipBonusPF2'), skill='Precursor Frigate', **kwargs)
 
 
 class Effect7209(BaseEffect):
@@ -35708,10 +35568,10 @@ class Effect7209(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Precursor Weapon'),
                                       'maxRange', ship.getModifiedItemAttr('eliteBonusGunship2'),
-                                      skill='Assault Frigates')
+                                      skill='Assault Frigates', **kwargs)
 
 
 class Effect7210(BaseEffect):
@@ -35725,9 +35585,9 @@ class Effect7210(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Defender Missiles'),
-                                      'moduleReactivationDelay', ship.getModifiedItemAttr('shipBonusRole2'))
+                                      'moduleReactivationDelay', ship.getModifiedItemAttr('shipBonusRole2'), **kwargs)
 
 
 class Effect7211(BaseEffect):
@@ -35741,10 +35601,10 @@ class Effect7211(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Precursor Weapon'),
                                       'damageMultiplierBonusMax', ship.getModifiedItemAttr('eliteBonusHeavyGunship1'),
-                                      skill='Heavy Assault Cruisers')
+                                      skill='Heavy Assault Cruisers', **kwargs)
 
 
 class Effect7216(BaseEffect):
@@ -35758,10 +35618,10 @@ class Effect7216(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Precursor Weapon'),
                                       'damageMultiplierBonusMax', ship.getModifiedItemAttr('eliteBonusGunship1'),
-                                      skill='Assault Frigates')
+                                      skill='Assault Frigates', **kwargs)
 
 
 class Effect7223(BaseEffect):
@@ -35776,8 +35636,8 @@ class Effect7223(BaseEffect):
     type = ('projected', 'passive')
 
     @staticmethod
-    def handler(fit, beacon, context):
-        fit.ship.boostItemAttr('agility', beacon.getModifiedItemAttr('agilityBonus'), stackingPenalties=True)
+    def handler(fit, beacon, context, **kwargs):
+        fit.ship.boostItemAttr('agility', beacon.getModifiedItemAttr('agilityBonus'), stackingPenalties=True, **kwargs)
 
 
 class Effect7227(BaseEffect):
@@ -35792,8 +35652,8 @@ class Effect7227(BaseEffect):
     type = ('projected', 'passive')
 
     @staticmethod
-    def handler(fit, beacon, context):
-        fit.ship.boostItemAttr('hp', beacon.getModifiedItemAttr('hullHpBonus'))
+    def handler(fit, beacon, context, **kwargs):
+        fit.ship.boostItemAttr('hp', beacon.getModifiedItemAttr('hullHpBonus'), **kwargs)
 
 
 class Effect7228(BaseEffect):
@@ -35807,7 +35667,7 @@ class Effect7228(BaseEffect):
     type = 'passive'
 
     @staticmethod
-    def handler(fit, ship, context):
+    def handler(fit, ship, context, **kwargs):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Precursor Weapon'),
                                       'maxRange', ship.getModifiedItemAttr('eliteBonusHeavyGunship2'),
-                                      skill='Heavy Assault Cruisers')
+                                      skill='Heavy Assault Cruisers', **kwargs)
diff --git a/eos/modifiedAttributeDict.py b/eos/modifiedAttributeDict.py
index 13283089f..47dd28cc7 100644
--- a/eos/modifiedAttributeDict.py
+++ b/eos/modifiedAttributeDict.py
@@ -29,14 +29,19 @@ cappingAttrKeyCache = {}
 
 
 def getResistanceAttrID(modifyingItem, effect):
-    remoteResistID = effect.resistanceID
     # If it doesn't exist on the effect, check the modifying modules attributes. If it's there, set it on the
     # effect for this session so that we don't have to look here again (won't always work when it's None, but
     # will catch most)
-    if not remoteResistID:
-        effect.resistanceID = int(modifyingItem.getModifiedItemAttr("remoteResistanceID")) or None
-        remoteResistID = effect.resistanceID
-    return remoteResistID
+    if not effect.getattr('resistanceCalculated'):
+        attrPrefix = effect.getattr('prefix')
+        if attrPrefix:
+            effect.resistanceID = int(modifyingItem.getModifiedItemAttr('{}ResistanceID'.format(attrPrefix))) or None
+            if not effect.resistanceID:
+                effect.resistanceID = int(modifyingItem.getModifiedItemAttr('{}RemoteResistanceID'.format(attrPrefix))) or None
+        else:
+            effect.resistanceID = int(modifyingItem.getModifiedItemAttr("remoteResistanceID")) or None
+        effect.resistanceCalculated = True
+    return effect.resistanceID
 
 
 class ItemAttrShortcut:
@@ -396,7 +401,7 @@ class ModifiedAttributeDict(collections.MutableMapping):
         # Add current affliction to list
         affs.append((modifier, operation, bonus, used))
 
-    def preAssign(self, attributeName, value):
+    def preAssign(self, attributeName, value, **kwargs):
         """Overwrites original value of the entity with given one, allowing further modification"""
         self.__preAssigns[attributeName] = value
         self.__placehold(attributeName)
@@ -424,7 +429,7 @@ class ModifiedAttributeDict(collections.MutableMapping):
         self.__placehold(attributeName)
         self.__afflict(attributeName, "+", increase, increase != 0)
 
-    def multiply(self, attributeName, multiplier, stackingPenalties=False, penaltyGroup="default", skill=None, *args, **kwargs):
+    def multiply(self, attributeName, multiplier, stackingPenalties=False, penaltyGroup="default", skill=None, **kwargs):
         """Multiply value of given attribute by given factor"""
         if multiplier is None:  # See GH issue 397
             return
@@ -465,15 +470,15 @@ class ModifiedAttributeDict(collections.MutableMapping):
 
         self.__afflict(attributeName, "%s*" % afflictPenal, multiplier, multiplier != 1)
 
-    def boost(self, attributeName, boostFactor, skill=None, *args, **kwargs):
+    def boost(self, attributeName, boostFactor, skill=None, **kwargs):
         """Boost value by some percentage"""
         if skill:
             boostFactor *= self.__handleSkill(skill)
 
         # We just transform percentage boost into multiplication factor
-        self.multiply(attributeName, 1 + boostFactor / 100.0, *args, **kwargs)
+        self.multiply(attributeName, 1 + boostFactor / 100.0, **kwargs)
 
-    def force(self, attributeName, value):
+    def force(self, attributeName, value, **kwargs):
         """Force value to attribute and prohibit any changes to it"""
         self.__forced[attributeName] = value
         self.__placehold(attributeName)
@@ -481,6 +486,13 @@ class ModifiedAttributeDict(collections.MutableMapping):
 
     @staticmethod
     def getResistance(fit, effect):
+        # Resistances are applicable only to projected effects
+        if isinstance(effect.type, (tuple, list)):
+            effectType = effect.type
+        else:
+            effectType = (effect.type,)
+        if 'projected' not in effectType:
+            return 1
         remoteResistID = getResistanceAttrID(modifyingItem=fit.getModifier(), effect=effect)
         attrInfo = getAttributeInfo(remoteResistID)
         # Get the attribute of the resist
diff --git a/eos/saveddata/drone.py b/eos/saveddata/drone.py
index e8c798eec..98d193a6a 100644
--- a/eos/saveddata/drone.py
+++ b/eos/saveddata/drone.py
@@ -308,11 +308,17 @@ class Drone(HandledItem, HandledCharge, ItemAttrShortcut, ChargeAttrShortcut):
                                  projected is False and effect.isType("passive")):
                 # See GH issue #765
                 if effect.getattr('grouped'):
-                    effect.handler(fit, self, context)
+                    try:
+                        effect.handler(fit, self, context, effect=effect)
+                    except:
+                        effect.handler(fit, self, context)
                 else:
                     i = 0
                     while i != self.amountActive:
-                        effect.handler(fit, self, context)
+                        try:
+                            effect.handler(fit, self, context, effect=effect)
+                        except:
+                            effect.handler(fit, self, context)
                         i += 1
 
         if self.charge:
diff --git a/eos/saveddata/fighter.py b/eos/saveddata/fighter.py
index 32867587f..96d5e8a9d 100644
--- a/eos/saveddata/fighter.py
+++ b/eos/saveddata/fighter.py
@@ -394,11 +394,17 @@ class Fighter(HandledItem, HandledCharge, ItemAttrShortcut, ChargeAttrShortcut):
             if effect.runTime == runTime and effect.activeByDefault and \
                     ((projected and effect.isType("projected")) or not projected):
                 if ability.grouped:
-                    effect.handler(fit, self, context)
+                    try:
+                        effect.handler(fit, self, context, effect=effect)
+                    except:
+                        effect.handler(fit, self, context)
                 else:
                     i = 0
                     while i != self.amountActive:
-                        effect.handler(fit, self, context)
+                        try:
+                            effect.handler(fit, self, context, effect=effect)
+                        except:
+                            effect.handler(fit, self, context)
                         i += 1
 
     def __deepcopy__(self, memo):
diff --git a/gui/builtinGraphs/fitDamageStats/projectedCache.py b/gui/builtinGraphs/fitDamageStats/projectedCache.py
index 18dad96a8..5025778cf 100644
--- a/gui/builtinGraphs/fitDamageStats/projectedCache.py
+++ b/gui/builtinGraphs/fitDamageStats/projectedCache.py
@@ -72,27 +72,29 @@ class ProjectedDataCache(FitDataCache):
         try:
             projectedData = self._data[fit.ID]['drones']
         except KeyError:
-            # Format of items for both: (boost strength, optimal, falloff, stacking group, speed, radius)
-            webMods = []
-            tpMods = []
-            projectedData = self._data.setdefault(fit.ID, {})['drones'] = (webMods, tpMods)
+            # Format of items for both: (boost strength, optimal, falloff, stacking group, resistance attr ID, drone speed, drone radius)
+            webDrones = []
+            tpDrones = []
+            projectedData = self._data.setdefault(fit.ID, {})['drones'] = (webDrones, tpDrones)
             for drone in fit.drones:
                 if drone.amountActive <= 0:
                     continue
                 if 'remoteWebifierEntity' in drone.item.effects:
-                    webMods.extend(drone.amountActive * ((
+                    webDrones.extend(drone.amountActive * ((
                         drone.getModifiedItemAttr('speedFactor'),
                         drone.maxRange or 0,
                         drone.falloff or 0,
                         'default',
+                        getResistanceAttrID(modifyingItem=drone, effect=drone.item.effects['remoteWebifierEntity']),
                         drone.getModifiedItemAttr('maxVelocity'),
                         drone.getModifiedItemAttr('radius')),))
                 if 'remoteTargetPaintEntity' in drone.item.effects:
-                    tpMods.extend(drone.amountActive * ((
+                    tpDrones.extend(drone.amountActive * ((
                         drone.getModifiedItemAttr('signatureRadiusBonus'),
                         drone.maxRange or 0,
                         drone.falloff or 0,
                         'default',
+                        getResistanceAttrID(modifyingItem=drone, effect=drone.item.effects['remoteTargetPaintEntity']),
                         drone.getModifiedItemAttr('maxVelocity'),
                         drone.getModifiedItemAttr('radius')),))
         return projectedData
@@ -101,27 +103,23 @@ class ProjectedDataCache(FitDataCache):
         try:
             projectedData = self._data[fit.ID]['fighters']
         except KeyError:
-            # Format of items for both: (boost strength, optimal, falloff, stacking group, speed, radius)
-            webMods = []
-            tpMods = []
-            projectedData = self._data.setdefault(fit.ID, {})['fighters'] = (webMods, tpMods)
-            for drone in fit.drones:
-                if drone.amountActive <= 0:
+            # Format of items for both: (boost strength, optimal, falloff, stacking group, resistance attr ID, drone speed, drone radius)
+            webFighters = []
+            tpFighters = []
+            projectedData = self._data.setdefault(fit.ID, {})['fighters'] = (webFighters, tpFighters)
+            for fighter in fit.fighters:
+                if not fighter.active:
                     continue
-                if 'remoteWebifierEntity' in drone.item.effects:
-                    webMods.extend(drone.amountActive * ((
-                        drone.getModifiedItemAttr('speedFactor'),
-                        drone.maxRange or 0,
-                        drone.falloff or 0,
-                        'default',
-                        drone.getModifiedItemAttr('maxVelocity'),
-                        drone.getModifiedItemAttr('radius')),))
-                if 'remoteTargetPaintEntity' in drone.item.effects:
-                    tpMods.extend(drone.amountActive * ((
-                        drone.getModifiedItemAttr('signatureRadiusBonus'),
-                        drone.maxRange or 0,
-                        drone.falloff or 0,
-                        'default',
-                        drone.getModifiedItemAttr('maxVelocity'),
-                        drone.getModifiedItemAttr('radius')),))
+                for ability in fighter.abilities:
+                    if not ability.active:
+                        continue
+                    if ability.effect.name == 'fighterAbilityStasisWebifier':
+                        webFighters.extend((
+                            drone.getModifiedItemAttr('speedFactor'),
+                            drone.maxRange or 0,
+                            drone.falloff or 0,
+                            'default',
+                            getResistanceAttrID(modifyingItem=drone, effect=drone.item.effects['remoteWebifierEntity']),
+                            drone.getModifiedItemAttr('maxVelocity'),
+                            drone.getModifiedItemAttr('radius')))
         return projectedData