diff --git a/UniverseGenTweaks/BirthPlanetPatch.cs b/UniverseGenTweaks/BirthPlanetPatch.cs
index bc42afc..e429a14 100644
--- a/UniverseGenTweaks/BirthPlanetPatch.cs
+++ b/UniverseGenTweaks/BirthPlanetPatch.cs
@@ -1,10 +1,12 @@
 using System.Collections.Generic;
 using BepInEx.Configuration;
 using HarmonyLib;
+using UXAssist.Common.ModFeatures;
 using GameLogicProc = UXAssist.Common.GameLogic;
 
 namespace UniverseGenTweaks;
 
+[ModFeature("UniverseGenBirthPlanet", Order = 12)]
 public static class BirthPlanetPatch
 {
     public static ConfigEntry<bool> SitiVeinsOnBirthPlanet;
diff --git a/UniverseGenTweaks/EpicDifficulty.cs b/UniverseGenTweaks/EpicDifficulty.cs
index bdcc9fe..d4ad505 100644
--- a/UniverseGenTweaks/EpicDifficulty.cs
+++ b/UniverseGenTweaks/EpicDifficulty.cs
@@ -5,9 +5,11 @@ using BepInEx.Configuration;
 using HarmonyLib;
 using UnityEngine.UI;
 using UXAssist.Common;
+using UXAssist.Common.ModFeatures;
 
 namespace UniverseGenTweaks;
 
+[ModFeature("UniverseGenEpicDifficulty", Order = 11)]
 public static class EpicDifficulty
 {
     public static ConfigEntry<bool> Enabled;
diff --git a/UniverseGenTweaks/MoreSettings.cs b/UniverseGenTweaks/MoreSettings.cs
index 917034f..792d9dd 100644
--- a/UniverseGenTweaks/MoreSettings.cs
+++ b/UniverseGenTweaks/MoreSettings.cs
@@ -6,10 +6,12 @@ using HarmonyLib;
 using UnityEngine;
 using UnityEngine.UI;
 using UXAssist.Common;
+using UXAssist.Common.ModFeatures;
 using Object = UnityEngine.Object;
 
 namespace UniverseGenTweaks;
 
+[ModFeature("UniverseGenMoreSettings", Order = 10)]
 public class MoreSettings
 {
 
diff --git a/UniverseGenTweaks/UniverseGenTweaks.cs b/UniverseGenTweaks/UniverseGenTweaks.cs
index 0e99764..f41b643 100644
--- a/UniverseGenTweaks/UniverseGenTweaks.cs
+++ b/UniverseGenTweaks/UniverseGenTweaks.cs
@@ -1,7 +1,9 @@
 using System.IO;
+using System.Reflection;
 using BepInEx;
 using BepInEx.Configuration;
 using crecheng.DSPModSave;
+using UXAssist.Common.ModFeatures;
 
 namespace UniverseGenTweaks;
 
@@ -51,17 +53,13 @@ public class UniverseGenTweaks : BaseUnityPlugin, IModCanSave
             "Birth star has high luminosity");
 
         UIConfigWindow.Init();
-
-        MoreSettings.Init();
-        EpicDifficulty.Init();
-        BirthPlanetPatch.Init();
+        ModFeatureRegistry.Discover(Assembly.GetExecutingAssembly());
+        ModFeatureRegistry.InitAll();
     }
 
     private void OnDestroy()
     {
-        BirthPlanetPatch.Uninit();
-        EpicDifficulty.Uninit();
-        MoreSettings.Uninit();
+        ModFeatureRegistry.UninitAll();
     }
 
     #region IModCanSave