diff --git a/lib-bassboonyd/src/main/love/distributedrebirth/bassboonyd/DefaultEnumBaseʸᴰ.java b/lib-bassboonyd/src/main/love/distributedrebirth/bassboonyd/DefaultEnumBaseʸᴰ.java
index 57c14f3c..e1c8dc56 100644
--- a/lib-bassboonyd/src/main/love/distributedrebirth/bassboonyd/DefaultEnumBaseʸᴰ.java
+++ b/lib-bassboonyd/src/main/love/distributedrebirth/bassboonyd/DefaultEnumBaseʸᴰ.java
@@ -1,15 +1,14 @@
 package love.distributedrebirth.bassboonyd;
 
 @BãßBȍőnAuthorInfoʸᴰ(name = "willemtsade", copyright = "©Δ∞ 仙上主天")
-@BãßBȍőnAnnotationInfoʸᴰ(required = {BãßBȍőnClassInfoʸᴰ.class, BãßBȍőnAuthorInfoʸᴰ.class})
 public interface DefaultEnumBaseʸᴰ<T> extends DefaultAuthorInfoʸᴰ,DefaultClassInfoʸᴰ,DefaultPackageInfoʸᴰ {
 	
 	int ordinal();
 	
 	String name();
 	
-	// Bȍőn prefix is for set instance enum object called BãßBȍőnEnumSetʸᴰ
-	// Bãß prefix is for single instance enum objects called BãßBȍőnEnumInstanceʸᴰ
+	// Bȍőn prefix is for set instance enum object (called DefaultEnumSetʸᴰ)
+	// Bãß prefix is for single instance enum objects (called DefaultEnumInstanceʸᴰ)
 	
 	default String BȍőnNaam() {
 		return name(); 
diff --git a/lib-bassboonyd/src/main/love/distributedrebirth/bassboonyd/DefaultEnumSetʸᴰ.java b/lib-bassboonyd/src/main/love/distributedrebirth/bassboonyd/DefaultEnumSetʸᴰ.java
index 6b097612..694a60de 100644
--- a/lib-bassboonyd/src/main/love/distributedrebirth/bassboonyd/DefaultEnumSetʸᴰ.java
+++ b/lib-bassboonyd/src/main/love/distributedrebirth/bassboonyd/DefaultEnumSetʸᴰ.java
@@ -3,7 +3,10 @@ package love.distributedrebirth.bassboonyd;
 import java.util.Arrays;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Map;
 import java.util.function.Consumer;
+import java.util.function.Function;
+import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 @BãßBȍőnAuthorInfoʸᴰ(name = "willemtsade", copyright = "©Δ∞ 仙上主天")
@@ -21,12 +24,8 @@ public interface DefaultEnumSetʸᴰ<T> extends DefaultEnumBaseʸᴰ<T> {
 		return Arrays.asList(BãßInstances());
 	}
 	
-	default Iterator<T> BãßInstancesIterator() {
-		return BãßInstancesList().iterator();
-	}
-	
-	default Stream<T> BãßInstancesStream() {
-		return BãßInstancesList().stream();
+	default <K> Map<K,T> BãßInstancesToMap(Function<T,K> keyMapper) {
+		return BãßInstancesList().stream().collect(Collectors.toMap(keyMapper, v -> v));
 	}
 	
 	default T BȍőnVolgende() {
diff --git a/lib-numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/BãßBȍőnPartʸᴰ.java b/lib-numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/BãßBȍőnPartʸᴰ.java
index 7bedb4b7..d86241ad 100644
--- a/lib-numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/BãßBȍőnPartʸᴰ.java
+++ b/lib-numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/BãßBȍőnPartʸᴰ.java
@@ -1,7 +1,6 @@
 package love.distributedrebirth.numberxd.base2t.part;
 
 import java.util.Map;
-import java.util.stream.Collectors;
 
 import love.distributedrebirth.bassboonyd.BãßBȍőnAuthorInfoʸᴰ;
 import love.distributedrebirth.bassboonyd.BãßBȍőnCoffinOpenʸᴰ;
@@ -39,7 +38,7 @@ public interface BãßBȍőnPartʸᴰ<T extends BãßBȍőnPartʸᴰ<T>> extends
 	default T BãßValueOfDialTone(String identifierTone) {
 		Map<String,Object> mapTone = GET_BBC().GET_MAP_OBJ(BãßBȍőnPartKeyʸᴰ.MAP_TONE);
 		if (mapTone.isEmpty()) {
-			mapTone.putAll(BãßInstancesStream().collect(Collectors.toMap(v -> v.BȍőnDialTone(), v -> v)));
+			mapTone.putAll(BãßInstancesToMap(v -> v.BȍőnDialTone()));
 		}
 		return (T) mapTone.get(identifierTone);
 	}
@@ -48,7 +47,7 @@ public interface BãßBȍőnPartʸᴰ<T extends BãßBȍőnPartʸᴰ<T>> extends
 	default T BãßValueOfChinaKey(String chinaKey) {
 		Map<String,Object> mapChina = GET_BBC().GET_MAP_OBJ(BãßBȍőnPartKeyʸᴰ.MAP_CHINA);
 		if (mapChina.isEmpty()) {
-			mapChina.putAll(BãßInstancesStream().collect(Collectors.toMap(v -> v.BȍőnChinaKey(), v -> v)));
+			mapChina.putAll(BãßInstancesToMap(v -> v.BȍőnChinaKey()));
 		}
 		return (T) mapChina.get(chinaKey);
 	}