diff --git a/source/Features/CriticalEffects/CriticalEffectsCustom.cs b/source/Features/CriticalEffects/CriticalEffectsCustom.cs
index 5f2a37df..fe0668f9 100644
--- a/source/Features/CriticalEffects/CriticalEffectsCustom.cs
+++ b/source/Features/CriticalEffects/CriticalEffectsCustom.cs
@@ -10,7 +10,7 @@
 namespace MechEngineer.Features.CriticalEffects;
 
 [CustomComponent("CriticalEffects")]
-public class CriticalEffectsCustom : SimpleCustomComponent, IAfterLoad, IIsDestroyed
+public class CriticalEffectsCustom : SimpleCustomComponent, IOnLoaded, IIsDestroyed
 {
     public string[][] PenalizedEffectIDs { get; set; } = Array.Empty<string[]>();
     public string[] OnDestroyedEffectIDs { get; set; } = Array.Empty<string>();
@@ -36,7 +36,7 @@ protected virtual UnitType GetUnitType()
     [UsedBy(User.FieldRepairs)]
     public int MaxHits => PenalizedEffectIDs.Length + 1;
 
-    public void OnLoaded(Dictionary<string, object> values)
+    public void OnLoaded()
     {
         if (!CriticalEffectsFeature.settings.DescriptionEnabled)
         {
diff --git a/source/Features/CustomCapacities/Aliases/CarryCapacityFactorCustom.cs b/source/Features/CustomCapacities/Aliases/CarryCapacityFactorCustom.cs
index 5884c320..cf73f325 100644
--- a/source/Features/CustomCapacities/Aliases/CarryCapacityFactorCustom.cs
+++ b/source/Features/CustomCapacities/Aliases/CarryCapacityFactorCustom.cs
@@ -4,7 +4,7 @@
 namespace MechEngineer.Features.CustomCapacities.Aliases;
 
 [CustomComponent("CarryCapacityFactor")]
-public class CarryCapacityFactorCustom : SimpleCustomComponent, IValueComponent<float>, IAfterLoad
+public class CarryCapacityFactorCustom : SimpleCustomComponent, IValueComponent<float>, IOnLoaded
 {
     private float Value;
     public void LoadValue(float value)
@@ -12,7 +12,7 @@ public void LoadValue(float value)
         Value = value;
     }
 
-    public void OnLoaded(Dictionary<string, object> values)
+    public void OnLoaded()
     {
         Def.AddComponent(new CapacityModCustom
             {
diff --git a/source/Features/CustomCapacities/Aliases/CarryHandCapacityChassisFactorCustom.cs b/source/Features/CustomCapacities/Aliases/CarryHandCapacityChassisFactorCustom.cs
index 9d910e79..a7345d71 100644
--- a/source/Features/CustomCapacities/Aliases/CarryHandCapacityChassisFactorCustom.cs
+++ b/source/Features/CustomCapacities/Aliases/CarryHandCapacityChassisFactorCustom.cs
@@ -4,7 +4,7 @@
 namespace MechEngineer.Features.CustomCapacities.Aliases;
 
 [CustomComponent("CarryHandCapacityChassisFactor")]
-public class CarryHandCapacityChassisFactorCustom : SimpleCustomComponent, IValueComponent<float>, IAfterLoad
+public class CarryHandCapacityChassisFactorCustom : SimpleCustomComponent, IValueComponent<float>, IOnLoaded
 {
     private float Value;
 
@@ -13,7 +13,7 @@ public void LoadValue(float value)
         Value = value;
     }
 
-    public void OnLoaded(Dictionary<string, object> values)
+    public void OnLoaded()
     {
         Def.AddComponent(new CapacityModCustom
             {
diff --git a/source/Features/CustomCapacities/Aliases/CarryHandUsageCapacityFactorCustom.cs b/source/Features/CustomCapacities/Aliases/CarryHandUsageCapacityFactorCustom.cs
index 99f2a8c8..2bb3e37d 100644
--- a/source/Features/CustomCapacities/Aliases/CarryHandUsageCapacityFactorCustom.cs
+++ b/source/Features/CustomCapacities/Aliases/CarryHandUsageCapacityFactorCustom.cs
@@ -4,7 +4,7 @@
 namespace MechEngineer.Features.CustomCapacities.Aliases;
 
 [CustomComponent("CarryHandUsageCapacityFactor")]
-public class CarryHandUsageCapacityFactorCustom : SimpleCustomComponent, IValueComponent<float>, IAfterLoad
+public class CarryHandUsageCapacityFactorCustom : SimpleCustomComponent, IValueComponent<float>, IOnLoaded
 {
     private float Value;
 
@@ -13,7 +13,7 @@ public void LoadValue(float value)
         Value = value;
     }
 
-    public void OnLoaded(Dictionary<string, object> values)
+    public void OnLoaded()
     {
         Def.AddComponent(new CapacityModCustom
             {
diff --git a/source/Features/CustomCapacities/Aliases/CarryHandUsageCustom.cs b/source/Features/CustomCapacities/Aliases/CarryHandUsageCustom.cs
index 569f256c..96e6f0fb 100644
--- a/source/Features/CustomCapacities/Aliases/CarryHandUsageCustom.cs
+++ b/source/Features/CustomCapacities/Aliases/CarryHandUsageCustom.cs
@@ -4,7 +4,7 @@
 namespace MechEngineer.Features.CustomCapacities.Aliases;
 
 [CustomComponent("CarryHandUsage")]
-public class CarryHandUsageCustom : SimpleCustomComponent, IValueComponent<float>, IAfterLoad
+public class CarryHandUsageCustom : SimpleCustomComponent, IValueComponent<float>, IOnLoaded
 {
     private float Value;
 
@@ -13,7 +13,7 @@ public void LoadValue(float value)
         Value = value;
     }
 
-    public void OnLoaded(Dictionary<string, object> values)
+    public void OnLoaded()
     {
         Def.AddComponent(new CapacityModCustom
             {
diff --git a/source/Features/CustomCapacities/Aliases/CarryHandUsageLeftOverTopOffFactorCustom.cs b/source/Features/CustomCapacities/Aliases/CarryHandUsageLeftOverTopOffFactorCustom.cs
index 4df682f8..8d0ebbce 100644
--- a/source/Features/CustomCapacities/Aliases/CarryHandUsageLeftOverTopOffFactorCustom.cs
+++ b/source/Features/CustomCapacities/Aliases/CarryHandUsageLeftOverTopOffFactorCustom.cs
@@ -4,7 +4,7 @@
 namespace MechEngineer.Features.CustomCapacities.Aliases;
 
 [CustomComponent("CarryHandUsageLeftOverTopOffFactor")]
-public class CarryHandUsageLeftOverTopOffFactorCustom : SimpleCustomComponent, IValueComponent<float>, IAfterLoad
+public class CarryHandUsageLeftOverTopOffFactorCustom : SimpleCustomComponent, IValueComponent<float>, IOnLoaded
 {
     private float Value;
 
@@ -13,7 +13,7 @@ public void LoadValue(float value)
         Value = value;
     }
 
-    public void OnLoaded(Dictionary<string, object> values)
+    public void OnLoaded()
     {
         Def.AddComponent(new CapacityModCustom
             {
diff --git a/source/Features/CustomCapacities/Aliases/CarryLeftOverCapacityChassisFactorCustom.cs b/source/Features/CustomCapacities/Aliases/CarryLeftOverCapacityChassisFactorCustom.cs
index 6cdc62fd..60a0a056 100644
--- a/source/Features/CustomCapacities/Aliases/CarryLeftOverCapacityChassisFactorCustom.cs
+++ b/source/Features/CustomCapacities/Aliases/CarryLeftOverCapacityChassisFactorCustom.cs
@@ -4,7 +4,7 @@
 namespace MechEngineer.Features.CustomCapacities.Aliases;
 
 [CustomComponent("CarryLeftOverCapacityChassisFactor")]
-public class CarryLeftOverCapacityChassisFactorCustom : SimpleCustomComponent, IValueComponent<float>, IAfterLoad
+public class CarryLeftOverCapacityChassisFactorCustom : SimpleCustomComponent, IValueComponent<float>, IOnLoaded
 {
     private float Value;
 
@@ -13,7 +13,7 @@ public void LoadValue(float value)
         Value = value;
     }
 
-    public void OnLoaded(Dictionary<string, object> values)
+    public void OnLoaded()
     {
         Def.AddComponent(new CapacityModCustom
             {
diff --git a/source/Features/CustomCapacities/Aliases/CarryLeftOverCapacityCustom.cs b/source/Features/CustomCapacities/Aliases/CarryLeftOverCapacityCustom.cs
index 46992766..e6de52a1 100644
--- a/source/Features/CustomCapacities/Aliases/CarryLeftOverCapacityCustom.cs
+++ b/source/Features/CustomCapacities/Aliases/CarryLeftOverCapacityCustom.cs
@@ -4,7 +4,7 @@
 namespace MechEngineer.Features.CustomCapacities.Aliases;
 
 [CustomComponent("CarryLeftOverCapacity")]
-public class CarryLeftOverCapacityCustom : SimpleCustomComponent, IValueComponent<float>, IAfterLoad
+public class CarryLeftOverCapacityCustom : SimpleCustomComponent, IValueComponent<float>, IOnLoaded
 {
     private float Value;
 
@@ -13,7 +13,7 @@ public void LoadValue(float value)
         Value = value;
     }
 
-    public void OnLoaded(Dictionary<string, object> values)
+    public void OnLoaded()
     {
         Def.AddComponent(new CapacityModCustom
             {
diff --git a/source/Features/CustomCapacities/Aliases/CarryLeftOverUsageCapacityFactorCustom.cs b/source/Features/CustomCapacities/Aliases/CarryLeftOverUsageCapacityFactorCustom.cs
index 3d560e45..569dd618 100644
--- a/source/Features/CustomCapacities/Aliases/CarryLeftOverUsageCapacityFactorCustom.cs
+++ b/source/Features/CustomCapacities/Aliases/CarryLeftOverUsageCapacityFactorCustom.cs
@@ -4,7 +4,7 @@
 namespace MechEngineer.Features.CustomCapacities.Aliases;
 
 [CustomComponent("CarryLeftOverUsageCapacityFactor")]
-public class CarryLeftOverUsageCapacityFactorCustom : SimpleCustomComponent, IValueComponent<float>, IAfterLoad
+public class CarryLeftOverUsageCapacityFactorCustom : SimpleCustomComponent, IValueComponent<float>, IOnLoaded
 {
     private float Value;
 
@@ -13,7 +13,7 @@ public void LoadValue(float value)
         Value = value;
     }
 
-    public void OnLoaded(Dictionary<string, object> values)
+    public void OnLoaded()
     {
         Def.AddComponent(new CapacityModCustom
             {
diff --git a/source/Features/CustomCapacities/Aliases/CarryLeftOverUsageCustom.cs b/source/Features/CustomCapacities/Aliases/CarryLeftOverUsageCustom.cs
index de905274..1051c45d 100644
--- a/source/Features/CustomCapacities/Aliases/CarryLeftOverUsageCustom.cs
+++ b/source/Features/CustomCapacities/Aliases/CarryLeftOverUsageCustom.cs
@@ -4,7 +4,7 @@
 namespace MechEngineer.Features.CustomCapacities.Aliases;
 
 [CustomComponent("CarryLeftOverUsage")]
-public class CarryLeftOverUsageCustom : SimpleCustomComponent, IValueComponent<float>, IAfterLoad
+public class CarryLeftOverUsageCustom : SimpleCustomComponent, IValueComponent<float>, IOnLoaded
 {
     private float Value;
 
@@ -13,7 +13,7 @@ public void LoadValue(float value)
         Value = value;
     }
 
-    public void OnLoaded(Dictionary<string, object> values)
+    public void OnLoaded()
     {
         Def.AddComponent(new CapacityModCustom
             {
diff --git a/source/Features/CustomCapacities/Aliases/CarryLeftOverUsageLeftOverTopOffFactorCustom.cs b/source/Features/CustomCapacities/Aliases/CarryLeftOverUsageLeftOverTopOffFactorCustom.cs
index 677a3717..b33f0364 100644
--- a/source/Features/CustomCapacities/Aliases/CarryLeftOverUsageLeftOverTopOffFactorCustom.cs
+++ b/source/Features/CustomCapacities/Aliases/CarryLeftOverUsageLeftOverTopOffFactorCustom.cs
@@ -4,7 +4,7 @@
 namespace MechEngineer.Features.CustomCapacities.Aliases;
 
 [CustomComponent("CarryLeftOverUsageLeftOverTopOffFactor")]
-public class CarryLeftOverUsageLeftOverTopOffFactorCustom : SimpleCustomComponent, IValueComponent<float>, IAfterLoad
+public class CarryLeftOverUsageLeftOverTopOffFactorCustom : SimpleCustomComponent, IValueComponent<float>, IOnLoaded
 {
     private float Value;
 
@@ -13,7 +13,7 @@ public void LoadValue(float value)
         Value = value;
     }
 
-    public void OnLoaded(Dictionary<string, object> values)
+    public void OnLoaded()
     {
         Def.AddComponent(new CapacityModCustom
             {
diff --git a/source/Features/CustomCapacities/Aliases/HeatSinkCapacityCustom.cs b/source/Features/CustomCapacities/Aliases/HeatSinkCapacityCustom.cs
index fe40249f..40b501da 100644
--- a/source/Features/CustomCapacities/Aliases/HeatSinkCapacityCustom.cs
+++ b/source/Features/CustomCapacities/Aliases/HeatSinkCapacityCustom.cs
@@ -4,7 +4,7 @@
 namespace MechEngineer.Features.CustomCapacities.Aliases;
 
 [CustomComponent("HeatSinkCapacity")]
-public class HeatSinkCapacityCustom : SimpleCustomComponent, IValueComponent<float>, IAfterLoad
+public class HeatSinkCapacityCustom : SimpleCustomComponent, IValueComponent<float>, IOnLoaded
 {
     private float Value;
 
@@ -13,7 +13,7 @@ public void LoadValue(float value)
         Value = value;
     }
 
-    public void OnLoaded(Dictionary<string, object> values)
+    public void OnLoaded()
     {
         Def.AddComponent(new CapacityModCustom
             {
diff --git a/source/Features/CustomCapacities/Aliases/HeatSinkEngineAdditionalCapacityCustom.cs b/source/Features/CustomCapacities/Aliases/HeatSinkEngineAdditionalCapacityCustom.cs
index 8a6483b0..d1f7e264 100644
--- a/source/Features/CustomCapacities/Aliases/HeatSinkEngineAdditionalCapacityCustom.cs
+++ b/source/Features/CustomCapacities/Aliases/HeatSinkEngineAdditionalCapacityCustom.cs
@@ -4,7 +4,7 @@
 namespace MechEngineer.Features.CustomCapacities.Aliases;
 
 [CustomComponent("HeatSinkEngineAdditionalCapacity")]
-public class HeatSinkEngineAdditionalCapacityCustom : SimpleCustomComponent, IValueComponent<float>, IAfterLoad
+public class HeatSinkEngineAdditionalCapacityCustom : SimpleCustomComponent, IValueComponent<float>, IOnLoaded
 {
     private float Value;
 
@@ -13,7 +13,7 @@ public void LoadValue(float value)
         Value = value;
     }
 
-    public void OnLoaded(Dictionary<string, object> values)
+    public void OnLoaded()
     {
         Def.AddComponent(new CapacityModCustom
             {
diff --git a/source/Features/CustomCapacities/Aliases/HeatSinkUsageCustom.cs b/source/Features/CustomCapacities/Aliases/HeatSinkUsageCustom.cs
index c13b2235..4ff2b8a9 100644
--- a/source/Features/CustomCapacities/Aliases/HeatSinkUsageCustom.cs
+++ b/source/Features/CustomCapacities/Aliases/HeatSinkUsageCustom.cs
@@ -4,7 +4,7 @@
 namespace MechEngineer.Features.CustomCapacities.Aliases;
 
 [CustomComponent("HeatSinkUsage")]
-public class HeatSinkUsageCustom : SimpleCustomComponent, IValueComponent<float>, IAfterLoad
+public class HeatSinkUsageCustom : SimpleCustomComponent, IValueComponent<float>, IOnLoaded
 {
     private float Value;
 
@@ -13,7 +13,7 @@ public void LoadValue(float value)
         Value = value;
     }
 
-    public void OnLoaded(Dictionary<string, object> values)
+    public void OnLoaded()
     {
         Def.AddComponent(new CapacityModCustom
             {
diff --git a/source/Features/OverrideDescriptions/BonusDescriptions.cs b/source/Features/OverrideDescriptions/BonusDescriptions.cs
index 9872b0d6..ce7ed313 100644
--- a/source/Features/OverrideDescriptions/BonusDescriptions.cs
+++ b/source/Features/OverrideDescriptions/BonusDescriptions.cs
@@ -12,7 +12,7 @@
 namespace MechEngineer.Features.OverrideDescriptions;
 
 [CustomComponent("BonusDescriptions")]
-public class BonusDescriptions : SimpleCustomComponent, IAdjustTooltipEquipment, IAdjustInventoryElement, IAfterLoad, IListComponent<string>
+public class BonusDescriptions : SimpleCustomComponent, IAdjustTooltipEquipment, IAdjustInventoryElement, IOnLoaded, IListComponent<string>
 {
     public string[] Bonuses { get; set; } = null!;
 
@@ -51,7 +51,7 @@ public void AdjustInventoryElement(ListElementController_BASE_NotListView elemen
         }
     }
 
-    public void OnLoaded(Dictionary<string, object> values)
+    public void OnLoaded()
     {
         if (Bonuses.Length < 1)
         {