diff --git a/src/com/massivecraft/massivecore/command/type/TypeAbstract.java b/src/com/massivecraft/massivecore/command/type/TypeAbstract.java
index 1beb5f51..fdf3dae9 100644
--- a/src/com/massivecraft/massivecore/command/type/TypeAbstract.java
+++ b/src/com/massivecraft/massivecore/command/type/TypeAbstract.java
@@ -15,7 +15,6 @@ import org.bukkit.command.CommandSender;
 import com.massivecraft.massivecore.MassiveException;
 import com.massivecraft.massivecore.Named;
 import com.massivecraft.massivecore.collections.MassiveList;
-import com.massivecraft.massivecore.collections.MassiveSet;
 import com.massivecraft.massivecore.command.editor.CommandEditAbstract;
 import com.massivecraft.massivecore.command.editor.CommandEditSimple;
 import com.massivecraft.massivecore.command.editor.EditSettings;
@@ -122,7 +121,7 @@ public abstract class TypeAbstract<T> implements Type<T>
 	
 	public Set<String> getVisualsInner(T value, CommandSender sender)
 	{
-		return new MassiveSet<String>(this.getVisualInner(value, sender));
+		return Collections.singleton(this.getVisualInner(value, sender));
 	}
 	public Set<String> getVisualsInner(T value)
 	{
@@ -131,7 +130,7 @@ public abstract class TypeAbstract<T> implements Type<T>
 	
 	public Set<String> getVisuals(T value, CommandSender sender)
 	{
-		if (value == null) return new MassiveSet<String>(NULL);
+		if (value == null) return Collections.singleton(NULL);
 		return this.getVisualsInner(value, sender);
 	}
 	public Set<String> getVisuals(T value)
@@ -162,12 +161,12 @@ public abstract class TypeAbstract<T> implements Type<T>
 	
 	public Set<String> getNamesInner(T value)
 	{
-		return new MassiveSet<String>(this.getNameInner(value));
+		return Collections.singleton(this.getNameInner(value));
 	}
 	
 	public Set<String> getNames(T value)
 	{
-		if (value == null) return new MassiveSet<String>();
+		if (value == null) return Collections.emptySet();
 		return this.getNamesInner(value);
 	}
 	
@@ -198,12 +197,12 @@ public abstract class TypeAbstract<T> implements Type<T>
 	
 	public Set<String> getIdsInner(T value)
 	{
-		return new MassiveSet<String>(this.getIdInner(value));
+		return Collections.singleton(this.getIdInner(value));
 	}
 	
 	public Set<String> getIds(T value)
 	{
-		if (value == null) return new MassiveSet<String>();
+		if (value == null) return Collections.emptySet();
 		return this.getIdsInner(value);
 	}
 	
diff --git a/src/com/massivecraft/massivecore/command/type/enumeration/TypeEntityType.java b/src/com/massivecraft/massivecore/command/type/enumeration/TypeEntityType.java
index 6ea7c966..82b07d7a 100644
--- a/src/com/massivecraft/massivecore/command/type/enumeration/TypeEntityType.java
+++ b/src/com/massivecraft/massivecore/command/type/enumeration/TypeEntityType.java
@@ -4,6 +4,8 @@ import java.util.Set;
 
 import org.bukkit.entity.EntityType;
 
+import com.massivecraft.massivecore.collections.MassiveSet;
+
 public class TypeEntityType extends TypeEnum<EntityType>
 {
 	// -------------------------------------------- //
@@ -24,7 +26,7 @@ public class TypeEntityType extends TypeEnum<EntityType>
 	@Override
 	public Set<String> getNamesInner(EntityType value)
 	{
-		Set<String> ret = super.getNamesInner(value);
+		Set<String> ret = new MassiveSet<String>(super.getNamesInner(value));
 		
 		if (value == EntityType.PIG_ZOMBIE)
 		{
diff --git a/src/com/massivecraft/massivecore/command/type/enumeration/TypeWorldType.java b/src/com/massivecraft/massivecore/command/type/enumeration/TypeWorldType.java
index 37bb2366..ad4e1e20 100644
--- a/src/com/massivecraft/massivecore/command/type/enumeration/TypeWorldType.java
+++ b/src/com/massivecraft/massivecore/command/type/enumeration/TypeWorldType.java
@@ -4,6 +4,8 @@ import java.util.Set;
 
 import org.bukkit.WorldType;
 
+import com.massivecraft.massivecore.collections.MassiveSet;
+
 public class TypeWorldType extends TypeEnum<WorldType>
 {
 	// -------------------------------------------- //
@@ -24,7 +26,7 @@ public class TypeWorldType extends TypeEnum<WorldType>
 	@Override
 	public Set<String> getNamesInner(WorldType value)
 	{
-		Set<String> ret = super.getNamesInner(value);
+		Set<String> ret = new MassiveSet<String>(super.getNamesInner(value));
 		
 		if (value == WorldType.NORMAL)
 		{