diff --git a/src/main/java/com/volmit/iris/core/link/BlockDataProvider.java b/src/main/java/com/volmit/iris/core/link/ExternalDataProvider.java
similarity index 95%
rename from src/main/java/com/volmit/iris/core/link/BlockDataProvider.java
rename to src/main/java/com/volmit/iris/core/link/ExternalDataProvider.java
index 74f8946e3..4725a5c90 100644
--- a/src/main/java/com/volmit/iris/core/link/BlockDataProvider.java
+++ b/src/main/java/com/volmit/iris/core/link/ExternalDataProvider.java
@@ -11,7 +11,7 @@ import org.bukkit.plugin.Plugin;
 import java.util.MissingResourceException;
 
 @RequiredArgsConstructor
-public abstract class BlockDataProvider {
+public abstract class ExternalDataProvider {
 
     @Getter
     private final String pluginId;
diff --git a/src/main/java/com/volmit/iris/core/link/ItemAdderLink.java b/src/main/java/com/volmit/iris/core/link/ItemAdderDataProvider.java
similarity index 93%
rename from src/main/java/com/volmit/iris/core/link/ItemAdderLink.java
rename to src/main/java/com/volmit/iris/core/link/ItemAdderDataProvider.java
index b12c2f204..d05ca3cf4 100644
--- a/src/main/java/com/volmit/iris/core/link/ItemAdderLink.java
+++ b/src/main/java/com/volmit/iris/core/link/ItemAdderDataProvider.java
@@ -10,9 +10,9 @@ import org.bukkit.inventory.ItemStack;
 
 import java.util.MissingResourceException;
 
-public class ItemAdderLink extends BlockDataProvider {
+public class ItemAdderDataProvider extends ExternalDataProvider {
 
-    public ItemAdderLink() {
+    public ItemAdderDataProvider() {
         super("ItemsAdder");
     }
 
diff --git a/src/main/java/com/volmit/iris/core/link/OraxenDataProvider.java b/src/main/java/com/volmit/iris/core/link/OraxenDataProvider.java
index 973cc0eb6..138cecaa7 100644
--- a/src/main/java/com/volmit/iris/core/link/OraxenDataProvider.java
+++ b/src/main/java/com/volmit/iris/core/link/OraxenDataProvider.java
@@ -40,7 +40,7 @@ import java.util.Map;
 import java.util.MissingResourceException;
 import java.util.Optional;
 
-public class OraxenDataProvider extends BlockDataProvider {
+public class OraxenDataProvider extends ExternalDataProvider {
 
     private static final String FIELD_FACTORIES_MAP = "FACTORIES_BY_MECHANIC_ID";
 
diff --git a/src/main/java/com/volmit/iris/core/service/CustomBlockDataSVC.java b/src/main/java/com/volmit/iris/core/service/ExternalDataSVC.java
similarity index 74%
rename from src/main/java/com/volmit/iris/core/service/CustomBlockDataSVC.java
rename to src/main/java/com/volmit/iris/core/service/ExternalDataSVC.java
index b252ec0f1..6c96c3871 100644
--- a/src/main/java/com/volmit/iris/core/service/CustomBlockDataSVC.java
+++ b/src/main/java/com/volmit/iris/core/service/ExternalDataSVC.java
@@ -19,8 +19,8 @@
 package com.volmit.iris.core.service;
 
 import com.volmit.iris.Iris;
-import com.volmit.iris.core.link.BlockDataProvider;
-import com.volmit.iris.core.link.ItemAdderLink;
+import com.volmit.iris.core.link.ExternalDataProvider;
+import com.volmit.iris.core.link.ItemAdderDataProvider;
 import com.volmit.iris.core.link.OraxenDataProvider;
 import com.volmit.iris.util.collection.KList;
 import com.volmit.iris.util.plugin.IrisService;
@@ -33,20 +33,20 @@ import java.util.MissingResourceException;
 import java.util.Optional;
 
 @Data
-public class CustomBlockDataSVC implements IrisService {
+public class ExternalDataSVC implements IrisService {
 
-    private KList<BlockDataProvider> providers = new KList<>();
+    private KList<ExternalDataProvider> providers = new KList<>();
 
     @Override
     public void onEnable() {
-        addProvider(new OraxenDataProvider(), new ItemAdderLink());
+        addProvider(new OraxenDataProvider(), new ItemAdderDataProvider());
     }
 
     @Override
     public void onDisable() { }
 
-    public void addProvider(BlockDataProvider... provider) {
-        for(BlockDataProvider p : provider) {
+    public void addProvider(ExternalDataProvider... provider) {
+        for(ExternalDataProvider p : provider) {
             if(p.getPlugin() != null) {
                 providers.add(p);
                 p.init();
@@ -55,7 +55,7 @@ public class CustomBlockDataSVC implements IrisService {
     }
 
     public Optional<BlockData> getBlockData(NamespacedKey key) {
-        Optional<BlockDataProvider> provider = providers.stream().filter(p -> p.isPresent() && p.isValidProvider(key)).findFirst();
+        Optional<ExternalDataProvider> provider = providers.stream().filter(p -> p.isPresent() && p.isValidProvider(key)).findFirst();
         if(provider.isEmpty())
             return Optional.empty();
         try {
@@ -67,7 +67,7 @@ public class CustomBlockDataSVC implements IrisService {
     }
 
     public Optional<ItemStack> getItemStack(NamespacedKey key) {
-        Optional<BlockDataProvider> provider = providers.stream().filter(p -> p.isPresent() && p.isValidProvider(key)).findFirst();
+        Optional<ExternalDataProvider> provider = providers.stream().filter(p -> p.isPresent() && p.isValidProvider(key)).findFirst();
         if(provider.isEmpty())
             return Optional.empty();
         try {
@@ -80,7 +80,7 @@ public class CustomBlockDataSVC implements IrisService {
 
     public NamespacedKey[] getAllIdentifiers() {
         KList<NamespacedKey> names = new KList<>();
-        providers.stream().filter(BlockDataProvider::isPresent).forEach(p -> names.add(p.getBlockTypes()));
+        providers.stream().filter(ExternalDataProvider::isPresent).forEach(p -> names.add(p.getBlockTypes()));
         return names.toArray(new NamespacedKey[0]);
     }
 }
diff --git a/src/main/java/com/volmit/iris/engine/object/IrisLoot.java b/src/main/java/com/volmit/iris/engine/object/IrisLoot.java
index dc4cc9070..958c955a3 100644
--- a/src/main/java/com/volmit/iris/engine/object/IrisLoot.java
+++ b/src/main/java/com/volmit/iris/engine/object/IrisLoot.java
@@ -20,7 +20,7 @@ package com.volmit.iris.engine.object;
 
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
 import com.volmit.iris.Iris;
-import com.volmit.iris.core.service.CustomBlockDataSVC;
+import com.volmit.iris.core.service.ExternalDataSVC;
 import com.volmit.iris.engine.data.cache.AtomicCache;
 import com.volmit.iris.engine.object.annotations.ArrayType;
 import com.volmit.iris.engine.object.annotations.Desc;
@@ -37,7 +37,6 @@ import com.volmit.iris.util.format.Form;
 import com.volmit.iris.util.json.JSONObject;
 import com.volmit.iris.util.math.RNG;
 import com.volmit.iris.util.noise.CNG;
-import com.volmit.iris.util.plugin.IrisService;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -55,7 +54,6 @@ import org.bukkit.inventory.meta.ItemMeta;
 import org.bukkit.inventory.meta.LeatherArmorMeta;
 import org.bukkit.material.Colorable;
 
-import javax.xml.stream.events.Namespace;
 import java.awt.Color;
 import java.util.Optional;
 
@@ -124,8 +122,9 @@ public class IrisLoot {
         try {
             ItemStack is;
             if(!type.startsWith("minecraft:") && type.contains(":")) {
-                Optional<ItemStack> opt = Iris.service(CustomBlockDataSVC.class).getItemStack(NamespacedKey.fromString(type));
+                Optional<ItemStack> opt = Iris.service(ExternalDataSVC.class).getItemStack(NamespacedKey.fromString(type));
                 if(opt.isEmpty()) {
+                    //TODO Better third party provider
                     Iris.warn("Unknown Material: " + type);
                     return null;
                 }
@@ -215,7 +214,7 @@ public class IrisLoot {
             try {
                 ItemStack is;
                 if(!type.startsWith("minecraft:") && type.contains(":")) {
-                    Optional<ItemStack> opt = Iris.service(CustomBlockDataSVC.class).getItemStack(NamespacedKey.fromString(type));
+                    Optional<ItemStack> opt = Iris.service(ExternalDataSVC.class).getItemStack(NamespacedKey.fromString(type));
                     if(opt.isEmpty()) {
                         Iris.warn("Unknown Material: " + type);
                         return null;
diff --git a/src/main/java/com/volmit/iris/util/data/B.java b/src/main/java/com/volmit/iris/util/data/B.java
index 855b38247..5b7ba27a7 100644
--- a/src/main/java/com/volmit/iris/util/data/B.java
+++ b/src/main/java/com/volmit/iris/util/data/B.java
@@ -20,7 +20,7 @@ package com.volmit.iris.util.data;
 
 import com.volmit.iris.Iris;
 import com.volmit.iris.core.IrisSettings;
-import com.volmit.iris.core.service.CustomBlockDataSVC;
+import com.volmit.iris.core.service.ExternalDataSVC;
 import com.volmit.iris.util.collection.KList;
 import com.volmit.iris.util.collection.KMap;
 import com.volmit.iris.util.scheduling.ChronoLatch;
@@ -472,7 +472,7 @@ public class B {
 
             if(!ix.startsWith("minecraft:") && ix.contains(":")) {
                 NamespacedKey key = NamespacedKey.fromString(ix);
-                Optional<BlockData> bd = Iris.service(CustomBlockDataSVC.class).getBlockData(key);
+                Optional<BlockData> bd = Iris.service(ExternalDataSVC.class).getBlockData(key);
                 if(bd.isPresent())
                     bx = bd.get();
             }
@@ -647,7 +647,7 @@ public class B {
             }
         }
 
-        for(NamespacedKey id : Iris.service(CustomBlockDataSVC.class).getAllIdentifiers())
+        for(NamespacedKey id : Iris.service(ExternalDataSVC.class).getAllIdentifiers())
             bt.add(id.toString());
         bt.addAll(custom.k());