diff --git a/src/Attributes/DirectAsset.cs b/src/Attributes/DirectAsset.cs
deleted file mode 100644
index bc18f7d..0000000
--- a/src/Attributes/DirectAsset.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-namespace Nocturnis.Attributes;
-[AttributeUsage(AttributeTargets.Interface | AttributeTargets.Class)]
-public class DirectAsset : Attribute
-{
-    
-}
\ No newline at end of file
diff --git a/src/Attributes/UniqueInheritance.cs b/src/Attributes/UniqueInheritance.cs
deleted file mode 100644
index e17e149..0000000
--- a/src/Attributes/UniqueInheritance.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-namespace Nocturnis.Attributes;
-[AttributeUsage(AttributeTargets.Class)]
-public class UniqueInheritance : Attribute
-{
-    
-}
\ No newline at end of file
diff --git a/src/GlobalManagement/Providers/GlobalProvider.cs b/src/GlobalManagement/Providers/GlobalProvider.cs
index 4ff9119..658f2ed 100644
--- a/src/GlobalManagement/Providers/GlobalProvider.cs
+++ b/src/GlobalManagement/Providers/GlobalProvider.cs
@@ -1,4 +1,6 @@
 using Godot;
+using Nocturnis.Enigmos.Modules;
+using Nocturnis.Inventories.Items;
 
 namespace Nocturnis.GlobalManagement.Providers;
 
@@ -9,12 +11,16 @@ public static class GlobalProvider
     public static IUIProvider? UIProvider { get; set; }
     public static ISceneProvider? SceneProvider { get; set; }
     public static IPolymorphismProvider? PolymorphismProvider { get; set; }
-    public static IDataPackageTypeProvider? DataPackageTypeProvider { get; set; }
-    public static ITextureProvider? TextureProvider { get; set; }
+    public static IDataTypeProvider? DataTypeProvider { get; set; }
 
-    public static readonly Dictionary<StringName, PackedScene> AssetNameMapper = new();
+    public static class ModulePreviewMapper<TModule>
+        where TModule : IBaseModule
+    {
+        public static Texture2D? Preview { get; set; }
+    }
 
-    public static class ItemIconMapper<W>
+    public static class ItemIconMapper<TItem>
+        where TItem : IBaseItem
     {
         public static Texture2D? Texture { get; set; }
     }
@@ -24,5 +30,7 @@ public static class GlobalProvider
         public static PackedScene Scene { get; set; }
     }
 
-    public static Font Font { get; set; }
+    public static readonly Dictionary<string, PackedScene> SceneNameMapper = new();
+
+    public static Font? Font { get; set; }
 }
diff --git a/src/GlobalManagement/Providers/IDataPackageTypeProvider.cs b/src/GlobalManagement/Providers/IDataTypeProvider.cs
similarity index 90%
rename from src/GlobalManagement/Providers/IDataPackageTypeProvider.cs
rename to src/GlobalManagement/Providers/IDataTypeProvider.cs
index bed585d..c56c6a3 100644
--- a/src/GlobalManagement/Providers/IDataPackageTypeProvider.cs
+++ b/src/GlobalManagement/Providers/IDataTypeProvider.cs
@@ -2,7 +2,7 @@ using Godot;
 
 namespace Nocturnis.GlobalManagement.Providers;
 
-public interface IDataPackageTypeProvider
+public interface IDataTypeProvider
 {
     bool IsComplexTensorType(StringName type);
     StringName ComplexVersionOf(StringName type);
diff --git a/src/IDirectAsset.cs b/src/IDirectAsset.cs
deleted file mode 100644
index 41441a4..0000000
--- a/src/IDirectAsset.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-using Nocturnis.Attributes;
-
-namespace Nocturnis;
-[DirectAsset]
-public interface IDirectAsset
-{
-    
-}
\ No newline at end of file
diff --git a/src/Inventories/Items/IBaseItem.cs b/src/Inventories/Items/IBaseItem.cs
index 2c9776f..4989bf7 100644
--- a/src/Inventories/Items/IBaseItem.cs
+++ b/src/Inventories/Items/IBaseItem.cs
@@ -8,4 +8,4 @@ public interface IBaseItem : INodeInterface
 {
     StringName Status { get; set; }
     R2 ItemPosition { get; set; }
-}
\ No newline at end of file
+}