diff --git a/ModulSettings.json b/ModulSettings.json
index ef317355..34fba853 100644
--- a/ModulSettings.json
+++ b/ModulSettings.json
@@ -102,11 +102,12 @@
 		},
 		"List": {
 			"Enabled": true,
-			"Lists": true,
-			"ImmutableList": true,
-			"CopyOnWriteList": true,
 			"ArrayList": true,
-			"LinkedList": true
+			"CopyOnWriteList": true,
+			"ImmutableList": true,
+			"Implementations": true,
+			"LinkedList": true,
+			"Wrappers": true
 		},
 		"Async": {
 			"Enabled": true
@@ -124,20 +125,21 @@
 			},
 			"Map": {
 				"Enabled": true,
-				"HashMap": true,
-				"RBTreeMap": true,
-				"ConcurrentMap": true,
-				"ArrayMap": true,
 				"AVLTreeMap": true,
+				"ArrayMap": true,
+				"ConcurrentMap": true,
 				"CustomHashMap": true,
+				"EnumMap": true,
+				"HashMap": true,
 				"ImmutableMap": true,
+				"Implementations": true,
 				"LinkedCustomHashMap": true,
-				"LinkedHashMap": true,
-				"Maps": true,
-				"SortedMap": true,
 				"LinkedEnumMap": true,
+				"LinkedHashMap": true,
 				"OrderedMap": true,
-				"EnumMap": true
+				"RBTreeMap": true,
+				"SortedMap": true,
+				"Wrappers": true
 			},
 			"Pair": {
 				"Enabled": true
@@ -150,20 +152,21 @@
 			},
 			"Map": {
 				"Enabled": true,
-				"HashMap": true,
-				"RBTreeMap": true,
-				"ConcurrentMap": true,
-				"ArrayMap": true,
 				"AVLTreeMap": true,
+				"ArrayMap": true,
+				"ConcurrentMap": true,
 				"CustomHashMap": true,
+				"EnumMap": true,
+				"HashMap": true,
 				"ImmutableMap": true,
+				"Implementations": true,
 				"LinkedCustomHashMap": true,
-				"LinkedHashMap": true,
-				"Maps": true,
-				"SortedMap": true,
 				"LinkedEnumMap": true,
+				"LinkedHashMap": true,
 				"OrderedMap": true,
-				"EnumMap": true
+				"RBTreeMap": true,
+				"SortedMap": true,
+				"Wrappers": true
 			},
 			"Pair": {
 				"Enabled": true
@@ -176,20 +179,21 @@
 			},
 			"Map": {
 				"Enabled": true,
-				"HashMap": true,
-				"RBTreeMap": true,
-				"ConcurrentMap": true,
-				"ArrayMap": true,
 				"AVLTreeMap": true,
+				"ArrayMap": true,
+				"ConcurrentMap": true,
 				"CustomHashMap": true,
+				"EnumMap": true,
+				"HashMap": true,
 				"ImmutableMap": true,
+				"Implementations": true,
 				"LinkedCustomHashMap": true,
-				"LinkedHashMap": true,
-				"Maps": true,
-				"SortedMap": true,
 				"LinkedEnumMap": true,
+				"LinkedHashMap": true,
 				"OrderedMap": true,
-				"EnumMap": true
+				"RBTreeMap": true,
+				"SortedMap": true,
+				"Wrappers": true
 			},
 			"Pair": {
 				"Enabled": true
@@ -202,20 +206,21 @@
 			},
 			"Map": {
 				"Enabled": true,
-				"HashMap": true,
-				"RBTreeMap": true,
-				"ConcurrentMap": true,
-				"ArrayMap": true,
 				"AVLTreeMap": true,
+				"ArrayMap": true,
+				"ConcurrentMap": true,
 				"CustomHashMap": true,
+				"EnumMap": true,
+				"HashMap": true,
 				"ImmutableMap": true,
+				"Implementations": true,
 				"LinkedCustomHashMap": true,
-				"LinkedHashMap": true,
-				"Maps": true,
-				"SortedMap": true,
 				"LinkedEnumMap": true,
+				"LinkedHashMap": true,
 				"OrderedMap": true,
-				"EnumMap": true
+				"RBTreeMap": true,
+				"SortedMap": true,
+				"Wrappers": true
 			},
 			"Pair": {
 				"Enabled": true
@@ -228,20 +233,21 @@
 			},
 			"Map": {
 				"Enabled": true,
-				"HashMap": true,
-				"RBTreeMap": true,
-				"ConcurrentMap": true,
-				"ArrayMap": true,
 				"AVLTreeMap": true,
+				"ArrayMap": true,
+				"ConcurrentMap": true,
 				"CustomHashMap": true,
+				"EnumMap": true,
+				"HashMap": true,
 				"ImmutableMap": true,
+				"Implementations": true,
 				"LinkedCustomHashMap": true,
-				"LinkedHashMap": true,
-				"Maps": true,
-				"SortedMap": true,
 				"LinkedEnumMap": true,
+				"LinkedHashMap": true,
 				"OrderedMap": true,
-				"EnumMap": true
+				"RBTreeMap": true,
+				"SortedMap": true,
+				"Wrappers": true
 			},
 			"Pair": {
 				"Enabled": true
@@ -254,20 +260,21 @@
 			},
 			"Map": {
 				"Enabled": true,
-				"HashMap": true,
-				"RBTreeMap": true,
-				"ConcurrentMap": true,
-				"ArrayMap": true,
 				"AVLTreeMap": true,
+				"ArrayMap": true,
+				"ConcurrentMap": true,
 				"CustomHashMap": true,
+				"EnumMap": true,
+				"HashMap": true,
 				"ImmutableMap": true,
+				"Implementations": true,
 				"LinkedCustomHashMap": true,
-				"LinkedHashMap": true,
-				"Maps": true,
-				"SortedMap": true,
 				"LinkedEnumMap": true,
+				"LinkedHashMap": true,
 				"OrderedMap": true,
-				"EnumMap": true
+				"RBTreeMap": true,
+				"SortedMap": true,
+				"Wrappers": true
 			},
 			"Pair": {
 				"Enabled": true
@@ -280,20 +287,21 @@
 			},
 			"Map": {
 				"Enabled": true,
-				"HashMap": true,
-				"RBTreeMap": true,
-				"ConcurrentMap": true,
-				"ArrayMap": true,
 				"AVLTreeMap": true,
+				"ArrayMap": true,
+				"ConcurrentMap": true,
 				"CustomHashMap": true,
+				"EnumMap": true,
+				"HashMap": true,
 				"ImmutableMap": true,
+				"Implementations": true,
 				"LinkedCustomHashMap": true,
-				"LinkedHashMap": true,
-				"Maps": true,
-				"SortedMap": true,
 				"LinkedEnumMap": true,
+				"LinkedHashMap": true,
 				"OrderedMap": true,
-				"EnumMap": true
+				"RBTreeMap": true,
+				"SortedMap": true,
+				"Wrappers": true
 			},
 			"Pair": {
 				"Enabled": true
@@ -306,20 +314,21 @@
 			},
 			"Map": {
 				"Enabled": true,
-				"HashMap": true,
-				"RBTreeMap": true,
-				"ConcurrentMap": true,
-				"ArrayMap": true,
 				"AVLTreeMap": true,
+				"ArrayMap": true,
+				"ConcurrentMap": true,
 				"CustomHashMap": true,
+				"EnumMap": true,
+				"HashMap": true,
 				"ImmutableMap": true,
+				"Implementations": true,
 				"LinkedCustomHashMap": true,
-				"LinkedHashMap": true,
-				"Maps": true,
-				"SortedMap": true,
 				"LinkedEnumMap": true,
+				"LinkedHashMap": true,
 				"OrderedMap": true,
-				"EnumMap": true
+				"RBTreeMap": true,
+				"SortedMap": true,
+				"Wrappers": true
 			},
 			"Pair": {
 				"Enabled": true
@@ -332,20 +341,21 @@
 			},
 			"Map": {
 				"Enabled": true,
-				"HashMap": true,
-				"RBTreeMap": true,
-				"ConcurrentMap": true,
-				"ArrayMap": true,
 				"AVLTreeMap": true,
+				"ArrayMap": true,
+				"ConcurrentMap": true,
 				"CustomHashMap": true,
+				"EnumMap": true,
+				"HashMap": true,
 				"ImmutableMap": true,
+				"Implementations": true,
 				"LinkedCustomHashMap": true,
-				"LinkedHashMap": true,
-				"Maps": true,
-				"SortedMap": true,
 				"LinkedEnumMap": true,
+				"LinkedHashMap": true,
 				"OrderedMap": true,
-				"EnumMap": true
+				"RBTreeMap": true,
+				"SortedMap": true,
+				"Wrappers": true
 			},
 			"Pair": {
 				"Enabled": true
@@ -359,25 +369,27 @@
 		},
 		"List": {
 			"Enabled": true,
-			"Lists": true,
-			"ImmutableList": true,
-			"CopyOnWriteList": true,
 			"ArrayList": true,
-			"LinkedList": true
+			"CopyOnWriteList": true,
+			"ImmutableList": true,
+			"Implementations": true,
+			"LinkedList": true,
+			"Wrappers": true
 		},
 		"Set": {
 			"Enabled": true,
-			"LinkedHashSet": true,
-			"LinkedCustomHashSet": true,
-			"OrderedSet": true,
-			"ArraySet": true,
 			"AVLTreeSet": true,
-			"ImmutableSet": true,
+			"ArraySet": true,
 			"CustomHashSet": true,
-			"Sets": true,
-			"SortedSet": true,
 			"HashSet": true,
-			"RBTreeSet": true
+			"ImmutableSet": true,
+			"Implementations": true,
+			"LinkedCustomHashSet": true,
+			"LinkedHashSet": true,
+			"OrderedSet": true,
+			"RBTreeSet": true,
+			"SortedSet": true,
+			"Wrappers": true
 		},
 		"Async": {
 			"Enabled": true
@@ -395,20 +407,21 @@
 			},
 			"Map": {
 				"Enabled": true,
-				"HashMap": true,
-				"RBTreeMap": true,
-				"ConcurrentMap": true,
-				"ArrayMap": true,
 				"AVLTreeMap": true,
+				"ArrayMap": true,
+				"ConcurrentMap": true,
 				"CustomHashMap": true,
+				"EnumMap": true,
+				"HashMap": true,
 				"ImmutableMap": true,
+				"Implementations": true,
 				"LinkedCustomHashMap": true,
-				"LinkedHashMap": true,
-				"Maps": true,
-				"SortedMap": true,
 				"LinkedEnumMap": true,
+				"LinkedHashMap": true,
 				"OrderedMap": true,
-				"EnumMap": true
+				"RBTreeMap": true,
+				"SortedMap": true,
+				"Wrappers": true
 			},
 			"Pair": {
 				"Enabled": true
@@ -421,20 +434,21 @@
 			},
 			"Map": {
 				"Enabled": true,
-				"HashMap": true,
-				"RBTreeMap": true,
-				"ConcurrentMap": true,
-				"ArrayMap": true,
 				"AVLTreeMap": true,
+				"ArrayMap": true,
+				"ConcurrentMap": true,
 				"CustomHashMap": true,
+				"EnumMap": true,
+				"HashMap": true,
 				"ImmutableMap": true,
+				"Implementations": true,
 				"LinkedCustomHashMap": true,
-				"LinkedHashMap": true,
-				"Maps": true,
-				"SortedMap": true,
 				"LinkedEnumMap": true,
+				"LinkedHashMap": true,
 				"OrderedMap": true,
-				"EnumMap": true
+				"RBTreeMap": true,
+				"SortedMap": true,
+				"Wrappers": true
 			},
 			"Pair": {
 				"Enabled": true
@@ -447,20 +461,21 @@
 			},
 			"Map": {
 				"Enabled": true,
-				"HashMap": true,
-				"RBTreeMap": true,
-				"ConcurrentMap": true,
-				"ArrayMap": true,
 				"AVLTreeMap": true,
+				"ArrayMap": true,
+				"ConcurrentMap": true,
 				"CustomHashMap": true,
+				"EnumMap": true,
+				"HashMap": true,
 				"ImmutableMap": true,
+				"Implementations": true,
 				"LinkedCustomHashMap": true,
-				"LinkedHashMap": true,
-				"Maps": true,
-				"SortedMap": true,
 				"LinkedEnumMap": true,
+				"LinkedHashMap": true,
 				"OrderedMap": true,
-				"EnumMap": true
+				"RBTreeMap": true,
+				"SortedMap": true,
+				"Wrappers": true
 			},
 			"Pair": {
 				"Enabled": true
@@ -473,20 +488,21 @@
 			},
 			"Map": {
 				"Enabled": true,
-				"HashMap": true,
-				"RBTreeMap": true,
-				"ConcurrentMap": true,
-				"ArrayMap": true,
 				"AVLTreeMap": true,
+				"ArrayMap": true,
+				"ConcurrentMap": true,
 				"CustomHashMap": true,
+				"EnumMap": true,
+				"HashMap": true,
 				"ImmutableMap": true,
+				"Implementations": true,
 				"LinkedCustomHashMap": true,
-				"LinkedHashMap": true,
-				"Maps": true,
-				"SortedMap": true,
 				"LinkedEnumMap": true,
+				"LinkedHashMap": true,
 				"OrderedMap": true,
-				"EnumMap": true
+				"RBTreeMap": true,
+				"SortedMap": true,
+				"Wrappers": true
 			},
 			"Pair": {
 				"Enabled": true
@@ -499,20 +515,21 @@
 			},
 			"Map": {
 				"Enabled": true,
-				"HashMap": true,
-				"RBTreeMap": true,
-				"ConcurrentMap": true,
-				"ArrayMap": true,
 				"AVLTreeMap": true,
+				"ArrayMap": true,
+				"ConcurrentMap": true,
 				"CustomHashMap": true,
+				"EnumMap": true,
+				"HashMap": true,
 				"ImmutableMap": true,
+				"Implementations": true,
 				"LinkedCustomHashMap": true,
-				"LinkedHashMap": true,
-				"Maps": true,
-				"SortedMap": true,
 				"LinkedEnumMap": true,
+				"LinkedHashMap": true,
 				"OrderedMap": true,
-				"EnumMap": true
+				"RBTreeMap": true,
+				"SortedMap": true,
+				"Wrappers": true
 			},
 			"Pair": {
 				"Enabled": true
@@ -525,20 +542,21 @@
 			},
 			"Map": {
 				"Enabled": true,
-				"HashMap": true,
-				"RBTreeMap": true,
-				"ConcurrentMap": true,
-				"ArrayMap": true,
 				"AVLTreeMap": true,
+				"ArrayMap": true,
+				"ConcurrentMap": true,
 				"CustomHashMap": true,
+				"EnumMap": true,
+				"HashMap": true,
 				"ImmutableMap": true,
+				"Implementations": true,
 				"LinkedCustomHashMap": true,
-				"LinkedHashMap": true,
-				"Maps": true,
-				"SortedMap": true,
 				"LinkedEnumMap": true,
+				"LinkedHashMap": true,
 				"OrderedMap": true,
-				"EnumMap": true
+				"RBTreeMap": true,
+				"SortedMap": true,
+				"Wrappers": true
 			},
 			"Pair": {
 				"Enabled": true
@@ -551,20 +569,21 @@
 			},
 			"Map": {
 				"Enabled": true,
-				"HashMap": true,
-				"RBTreeMap": true,
-				"ConcurrentMap": true,
-				"ArrayMap": true,
 				"AVLTreeMap": true,
+				"ArrayMap": true,
+				"ConcurrentMap": true,
 				"CustomHashMap": true,
+				"EnumMap": true,
+				"HashMap": true,
 				"ImmutableMap": true,
+				"Implementations": true,
 				"LinkedCustomHashMap": true,
-				"LinkedHashMap": true,
-				"Maps": true,
-				"SortedMap": true,
 				"LinkedEnumMap": true,
+				"LinkedHashMap": true,
 				"OrderedMap": true,
-				"EnumMap": true
+				"RBTreeMap": true,
+				"SortedMap": true,
+				"Wrappers": true
 			},
 			"Pair": {
 				"Enabled": true
@@ -577,20 +596,21 @@
 			},
 			"Map": {
 				"Enabled": true,
-				"HashMap": true,
-				"RBTreeMap": true,
-				"ConcurrentMap": true,
-				"ArrayMap": true,
 				"AVLTreeMap": true,
+				"ArrayMap": true,
+				"ConcurrentMap": true,
 				"CustomHashMap": true,
+				"EnumMap": true,
+				"HashMap": true,
 				"ImmutableMap": true,
+				"Implementations": true,
 				"LinkedCustomHashMap": true,
-				"LinkedHashMap": true,
-				"Maps": true,
-				"SortedMap": true,
 				"LinkedEnumMap": true,
+				"LinkedHashMap": true,
 				"OrderedMap": true,
-				"EnumMap": true
+				"RBTreeMap": true,
+				"SortedMap": true,
+				"Wrappers": true
 			},
 			"Pair": {
 				"Enabled": true
@@ -603,20 +623,21 @@
 			},
 			"Map": {
 				"Enabled": true,
-				"HashMap": true,
-				"RBTreeMap": true,
-				"ConcurrentMap": true,
-				"ArrayMap": true,
 				"AVLTreeMap": true,
+				"ArrayMap": true,
+				"ConcurrentMap": true,
 				"CustomHashMap": true,
+				"EnumMap": true,
+				"HashMap": true,
 				"ImmutableMap": true,
+				"Implementations": true,
 				"LinkedCustomHashMap": true,
-				"LinkedHashMap": true,
-				"Maps": true,
-				"SortedMap": true,
 				"LinkedEnumMap": true,
+				"LinkedHashMap": true,
 				"OrderedMap": true,
-				"EnumMap": true
+				"RBTreeMap": true,
+				"SortedMap": true,
+				"Wrappers": true
 			},
 			"Pair": {
 				"Enabled": true
@@ -630,25 +651,27 @@
 		},
 		"List": {
 			"Enabled": true,
-			"Lists": true,
-			"ImmutableList": true,
-			"CopyOnWriteList": true,
 			"ArrayList": true,
-			"LinkedList": true
+			"CopyOnWriteList": true,
+			"ImmutableList": true,
+			"Implementations": true,
+			"LinkedList": true,
+			"Wrappers": true
 		},
 		"Set": {
 			"Enabled": true,
-			"LinkedHashSet": true,
-			"LinkedCustomHashSet": true,
-			"OrderedSet": true,
-			"ArraySet": true,
 			"AVLTreeSet": true,
-			"ImmutableSet": true,
+			"ArraySet": true,
 			"CustomHashSet": true,
-			"Sets": true,
-			"SortedSet": true,
 			"HashSet": true,
-			"RBTreeSet": true
+			"ImmutableSet": true,
+			"Implementations": true,
+			"LinkedCustomHashSet": true,
+			"LinkedHashSet": true,
+			"OrderedSet": true,
+			"RBTreeSet": true,
+			"SortedSet": true,
+			"Wrappers": true
 		},
 		"Async": {
 			"Enabled": true
@@ -666,20 +689,21 @@
 			},
 			"Map": {
 				"Enabled": true,
-				"HashMap": true,
-				"RBTreeMap": true,
-				"ConcurrentMap": true,
-				"ArrayMap": true,
 				"AVLTreeMap": true,
+				"ArrayMap": true,
+				"ConcurrentMap": true,
 				"CustomHashMap": true,
+				"EnumMap": true,
+				"HashMap": true,
 				"ImmutableMap": true,
+				"Implementations": true,
 				"LinkedCustomHashMap": true,
-				"LinkedHashMap": true,
-				"Maps": true,
-				"SortedMap": true,
 				"LinkedEnumMap": true,
+				"LinkedHashMap": true,
 				"OrderedMap": true,
-				"EnumMap": true
+				"RBTreeMap": true,
+				"SortedMap": true,
+				"Wrappers": true
 			},
 			"Pair": {
 				"Enabled": true
@@ -692,20 +716,21 @@
 			},
 			"Map": {
 				"Enabled": true,
-				"HashMap": true,
-				"RBTreeMap": true,
-				"ConcurrentMap": true,
-				"ArrayMap": true,
 				"AVLTreeMap": true,
+				"ArrayMap": true,
+				"ConcurrentMap": true,
 				"CustomHashMap": true,
+				"EnumMap": true,
+				"HashMap": true,
 				"ImmutableMap": true,
+				"Implementations": true,
 				"LinkedCustomHashMap": true,
-				"LinkedHashMap": true,
-				"Maps": true,
-				"SortedMap": true,
 				"LinkedEnumMap": true,
+				"LinkedHashMap": true,
 				"OrderedMap": true,
-				"EnumMap": true
+				"RBTreeMap": true,
+				"SortedMap": true,
+				"Wrappers": true
 			},
 			"Pair": {
 				"Enabled": true
@@ -718,20 +743,21 @@
 			},
 			"Map": {
 				"Enabled": true,
-				"HashMap": true,
-				"RBTreeMap": true,
-				"ConcurrentMap": true,
-				"ArrayMap": true,
 				"AVLTreeMap": true,
+				"ArrayMap": true,
+				"ConcurrentMap": true,
 				"CustomHashMap": true,
+				"EnumMap": true,
+				"HashMap": true,
 				"ImmutableMap": true,
+				"Implementations": true,
 				"LinkedCustomHashMap": true,
-				"LinkedHashMap": true,
-				"Maps": true,
-				"SortedMap": true,
 				"LinkedEnumMap": true,
+				"LinkedHashMap": true,
 				"OrderedMap": true,
-				"EnumMap": true
+				"RBTreeMap": true,
+				"SortedMap": true,
+				"Wrappers": true
 			},
 			"Pair": {
 				"Enabled": true
@@ -744,20 +770,21 @@
 			},
 			"Map": {
 				"Enabled": true,
-				"HashMap": true,
-				"RBTreeMap": true,
-				"ConcurrentMap": true,
-				"ArrayMap": true,
 				"AVLTreeMap": true,
+				"ArrayMap": true,
+				"ConcurrentMap": true,
 				"CustomHashMap": true,
+				"EnumMap": true,
+				"HashMap": true,
 				"ImmutableMap": true,
+				"Implementations": true,
 				"LinkedCustomHashMap": true,
-				"LinkedHashMap": true,
-				"Maps": true,
-				"SortedMap": true,
 				"LinkedEnumMap": true,
+				"LinkedHashMap": true,
 				"OrderedMap": true,
-				"EnumMap": true
+				"RBTreeMap": true,
+				"SortedMap": true,
+				"Wrappers": true
 			},
 			"Pair": {
 				"Enabled": true
@@ -770,20 +797,21 @@
 			},
 			"Map": {
 				"Enabled": true,
-				"HashMap": true,
-				"RBTreeMap": true,
-				"ConcurrentMap": true,
-				"ArrayMap": true,
 				"AVLTreeMap": true,
+				"ArrayMap": true,
+				"ConcurrentMap": true,
 				"CustomHashMap": true,
+				"EnumMap": true,
+				"HashMap": true,
 				"ImmutableMap": true,
+				"Implementations": true,
 				"LinkedCustomHashMap": true,
-				"LinkedHashMap": true,
-				"Maps": true,
-				"SortedMap": true,
 				"LinkedEnumMap": true,
+				"LinkedHashMap": true,
 				"OrderedMap": true,
-				"EnumMap": true
+				"RBTreeMap": true,
+				"SortedMap": true,
+				"Wrappers": true
 			},
 			"Pair": {
 				"Enabled": true
@@ -796,20 +824,21 @@
 			},
 			"Map": {
 				"Enabled": true,
-				"HashMap": true,
-				"RBTreeMap": true,
-				"ConcurrentMap": true,
-				"ArrayMap": true,
 				"AVLTreeMap": true,
+				"ArrayMap": true,
+				"ConcurrentMap": true,
 				"CustomHashMap": true,
+				"EnumMap": true,
+				"HashMap": true,
 				"ImmutableMap": true,
+				"Implementations": true,
 				"LinkedCustomHashMap": true,
-				"LinkedHashMap": true,
-				"Maps": true,
-				"SortedMap": true,
 				"LinkedEnumMap": true,
+				"LinkedHashMap": true,
 				"OrderedMap": true,
-				"EnumMap": true
+				"RBTreeMap": true,
+				"SortedMap": true,
+				"Wrappers": true
 			},
 			"Pair": {
 				"Enabled": true
@@ -822,20 +851,21 @@
 			},
 			"Map": {
 				"Enabled": true,
-				"HashMap": true,
-				"RBTreeMap": true,
-				"ConcurrentMap": true,
-				"ArrayMap": true,
 				"AVLTreeMap": true,
+				"ArrayMap": true,
+				"ConcurrentMap": true,
 				"CustomHashMap": true,
+				"EnumMap": true,
+				"HashMap": true,
 				"ImmutableMap": true,
+				"Implementations": true,
 				"LinkedCustomHashMap": true,
-				"LinkedHashMap": true,
-				"Maps": true,
-				"SortedMap": true,
 				"LinkedEnumMap": true,
+				"LinkedHashMap": true,
 				"OrderedMap": true,
-				"EnumMap": true
+				"RBTreeMap": true,
+				"SortedMap": true,
+				"Wrappers": true
 			},
 			"Pair": {
 				"Enabled": true
@@ -848,20 +878,21 @@
 			},
 			"Map": {
 				"Enabled": true,
-				"HashMap": true,
-				"RBTreeMap": true,
-				"ConcurrentMap": true,
-				"ArrayMap": true,
 				"AVLTreeMap": true,
+				"ArrayMap": true,
+				"ConcurrentMap": true,
 				"CustomHashMap": true,
+				"EnumMap": true,
+				"HashMap": true,
 				"ImmutableMap": true,
+				"Implementations": true,
 				"LinkedCustomHashMap": true,
-				"LinkedHashMap": true,
-				"Maps": true,
-				"SortedMap": true,
 				"LinkedEnumMap": true,
+				"LinkedHashMap": true,
 				"OrderedMap": true,
-				"EnumMap": true
+				"RBTreeMap": true,
+				"SortedMap": true,
+				"Wrappers": true
 			},
 			"Pair": {
 				"Enabled": true
@@ -874,20 +905,21 @@
 			},
 			"Map": {
 				"Enabled": true,
-				"HashMap": true,
-				"RBTreeMap": true,
-				"ConcurrentMap": true,
-				"ArrayMap": true,
 				"AVLTreeMap": true,
+				"ArrayMap": true,
+				"ConcurrentMap": true,
 				"CustomHashMap": true,
+				"EnumMap": true,
+				"HashMap": true,
 				"ImmutableMap": true,
+				"Implementations": true,
 				"LinkedCustomHashMap": true,
-				"LinkedHashMap": true,
-				"Maps": true,
-				"SortedMap": true,
 				"LinkedEnumMap": true,
+				"LinkedHashMap": true,
 				"OrderedMap": true,
-				"EnumMap": true
+				"RBTreeMap": true,
+				"SortedMap": true,
+				"Wrappers": true
 			},
 			"Pair": {
 				"Enabled": true
@@ -901,25 +933,27 @@
 		},
 		"List": {
 			"Enabled": true,
-			"Lists": true,
-			"ImmutableList": true,
-			"CopyOnWriteList": true,
 			"ArrayList": true,
-			"LinkedList": true
+			"CopyOnWriteList": true,
+			"ImmutableList": true,
+			"Implementations": true,
+			"LinkedList": true,
+			"Wrappers": true
 		},
 		"Set": {
 			"Enabled": true,
-			"LinkedHashSet": true,
-			"LinkedCustomHashSet": true,
-			"OrderedSet": true,
-			"ArraySet": true,
 			"AVLTreeSet": true,
-			"ImmutableSet": true,
+			"ArraySet": true,
 			"CustomHashSet": true,
-			"Sets": true,
-			"SortedSet": true,
 			"HashSet": true,
-			"RBTreeSet": true
+			"ImmutableSet": true,
+			"Implementations": true,
+			"LinkedCustomHashSet": true,
+			"LinkedHashSet": true,
+			"OrderedSet": true,
+			"RBTreeSet": true,
+			"SortedSet": true,
+			"Wrappers": true
 		},
 		"Async": {
 			"Enabled": true
@@ -937,20 +971,21 @@
 			},
 			"Map": {
 				"Enabled": true,
-				"HashMap": true,
-				"RBTreeMap": true,
-				"ConcurrentMap": true,
-				"ArrayMap": true,
 				"AVLTreeMap": true,
+				"ArrayMap": true,
+				"ConcurrentMap": true,
 				"CustomHashMap": true,
+				"EnumMap": true,
+				"HashMap": true,
 				"ImmutableMap": true,
+				"Implementations": true,
 				"LinkedCustomHashMap": true,
-				"LinkedHashMap": true,
-				"Maps": true,
-				"SortedMap": true,
 				"LinkedEnumMap": true,
+				"LinkedHashMap": true,
 				"OrderedMap": true,
-				"EnumMap": true
+				"RBTreeMap": true,
+				"SortedMap": true,
+				"Wrappers": true
 			},
 			"Pair": {
 				"Enabled": true
@@ -963,20 +998,21 @@
 			},
 			"Map": {
 				"Enabled": true,
-				"HashMap": true,
-				"RBTreeMap": true,
-				"ConcurrentMap": true,
-				"ArrayMap": true,
 				"AVLTreeMap": true,
+				"ArrayMap": true,
+				"ConcurrentMap": true,
 				"CustomHashMap": true,
+				"EnumMap": true,
+				"HashMap": true,
 				"ImmutableMap": true,
+				"Implementations": true,
 				"LinkedCustomHashMap": true,
-				"LinkedHashMap": true,
-				"Maps": true,
-				"SortedMap": true,
 				"LinkedEnumMap": true,
+				"LinkedHashMap": true,
 				"OrderedMap": true,
-				"EnumMap": true
+				"RBTreeMap": true,
+				"SortedMap": true,
+				"Wrappers": true
 			},
 			"Pair": {
 				"Enabled": true
@@ -989,20 +1025,21 @@
 			},
 			"Map": {
 				"Enabled": true,
-				"HashMap": true,
-				"RBTreeMap": true,
-				"ConcurrentMap": true,
-				"ArrayMap": true,
 				"AVLTreeMap": true,
+				"ArrayMap": true,
+				"ConcurrentMap": true,
 				"CustomHashMap": true,
+				"EnumMap": true,
+				"HashMap": true,
 				"ImmutableMap": true,
+				"Implementations": true,
 				"LinkedCustomHashMap": true,
-				"LinkedHashMap": true,
-				"Maps": true,
-				"SortedMap": true,
 				"LinkedEnumMap": true,
+				"LinkedHashMap": true,
 				"OrderedMap": true,
-				"EnumMap": true
+				"RBTreeMap": true,
+				"SortedMap": true,
+				"Wrappers": true
 			},
 			"Pair": {
 				"Enabled": true
@@ -1015,20 +1052,21 @@
 			},
 			"Map": {
 				"Enabled": true,
-				"HashMap": true,
-				"RBTreeMap": true,
-				"ConcurrentMap": true,
-				"ArrayMap": true,
 				"AVLTreeMap": true,
+				"ArrayMap": true,
+				"ConcurrentMap": true,
 				"CustomHashMap": true,
+				"EnumMap": true,
+				"HashMap": true,
 				"ImmutableMap": true,
+				"Implementations": true,
 				"LinkedCustomHashMap": true,
-				"LinkedHashMap": true,
-				"Maps": true,
-				"SortedMap": true,
 				"LinkedEnumMap": true,
+				"LinkedHashMap": true,
 				"OrderedMap": true,
-				"EnumMap": true
+				"RBTreeMap": true,
+				"SortedMap": true,
+				"Wrappers": true
 			},
 			"Pair": {
 				"Enabled": true
@@ -1041,20 +1079,21 @@
 			},
 			"Map": {
 				"Enabled": true,
-				"HashMap": true,
-				"RBTreeMap": true,
-				"ConcurrentMap": true,
-				"ArrayMap": true,
 				"AVLTreeMap": true,
+				"ArrayMap": true,
+				"ConcurrentMap": true,
 				"CustomHashMap": true,
+				"EnumMap": true,
+				"HashMap": true,
 				"ImmutableMap": true,
+				"Implementations": true,
 				"LinkedCustomHashMap": true,
-				"LinkedHashMap": true,
-				"Maps": true,
-				"SortedMap": true,
 				"LinkedEnumMap": true,
+				"LinkedHashMap": true,
 				"OrderedMap": true,
-				"EnumMap": true
+				"RBTreeMap": true,
+				"SortedMap": true,
+				"Wrappers": true
 			},
 			"Pair": {
 				"Enabled": true
@@ -1067,20 +1106,21 @@
 			},
 			"Map": {
 				"Enabled": true,
-				"HashMap": true,
-				"RBTreeMap": true,
-				"ConcurrentMap": true,
-				"ArrayMap": true,
 				"AVLTreeMap": true,
+				"ArrayMap": true,
+				"ConcurrentMap": true,
 				"CustomHashMap": true,
+				"EnumMap": true,
+				"HashMap": true,
 				"ImmutableMap": true,
+				"Implementations": true,
 				"LinkedCustomHashMap": true,
-				"LinkedHashMap": true,
-				"Maps": true,
-				"SortedMap": true,
 				"LinkedEnumMap": true,
+				"LinkedHashMap": true,
 				"OrderedMap": true,
-				"EnumMap": true
+				"RBTreeMap": true,
+				"SortedMap": true,
+				"Wrappers": true
 			},
 			"Pair": {
 				"Enabled": true
@@ -1093,20 +1133,21 @@
 			},
 			"Map": {
 				"Enabled": true,
-				"HashMap": true,
-				"RBTreeMap": true,
-				"ConcurrentMap": true,
-				"ArrayMap": true,
 				"AVLTreeMap": true,
+				"ArrayMap": true,
+				"ConcurrentMap": true,
 				"CustomHashMap": true,
+				"EnumMap": true,
+				"HashMap": true,
 				"ImmutableMap": true,
+				"Implementations": true,
 				"LinkedCustomHashMap": true,
-				"LinkedHashMap": true,
-				"Maps": true,
-				"SortedMap": true,
 				"LinkedEnumMap": true,
+				"LinkedHashMap": true,
 				"OrderedMap": true,
-				"EnumMap": true
+				"RBTreeMap": true,
+				"SortedMap": true,
+				"Wrappers": true
 			},
 			"Pair": {
 				"Enabled": true
@@ -1119,20 +1160,21 @@
 			},
 			"Map": {
 				"Enabled": true,
-				"HashMap": true,
-				"RBTreeMap": true,
-				"ConcurrentMap": true,
-				"ArrayMap": true,
 				"AVLTreeMap": true,
+				"ArrayMap": true,
+				"ConcurrentMap": true,
 				"CustomHashMap": true,
+				"EnumMap": true,
+				"HashMap": true,
 				"ImmutableMap": true,
+				"Implementations": true,
 				"LinkedCustomHashMap": true,
-				"LinkedHashMap": true,
-				"Maps": true,
-				"SortedMap": true,
 				"LinkedEnumMap": true,
+				"LinkedHashMap": true,
 				"OrderedMap": true,
-				"EnumMap": true
+				"RBTreeMap": true,
+				"SortedMap": true,
+				"Wrappers": true
 			},
 			"Pair": {
 				"Enabled": true
@@ -1145,20 +1187,21 @@
 			},
 			"Map": {
 				"Enabled": true,
-				"HashMap": true,
-				"RBTreeMap": true,
-				"ConcurrentMap": true,
-				"ArrayMap": true,
 				"AVLTreeMap": true,
+				"ArrayMap": true,
+				"ConcurrentMap": true,
 				"CustomHashMap": true,
+				"EnumMap": true,
+				"HashMap": true,
 				"ImmutableMap": true,
+				"Implementations": true,
 				"LinkedCustomHashMap": true,
-				"LinkedHashMap": true,
-				"Maps": true,
-				"SortedMap": true,
 				"LinkedEnumMap": true,
+				"LinkedHashMap": true,
 				"OrderedMap": true,
-				"EnumMap": true
+				"RBTreeMap": true,
+				"SortedMap": true,
+				"Wrappers": true
 			},
 			"Pair": {
 				"Enabled": true
@@ -1172,25 +1215,27 @@
 		},
 		"List": {
 			"Enabled": true,
-			"Lists": true,
-			"ImmutableList": true,
-			"CopyOnWriteList": true,
 			"ArrayList": true,
-			"LinkedList": true
+			"CopyOnWriteList": true,
+			"ImmutableList": true,
+			"Implementations": true,
+			"LinkedList": true,
+			"Wrappers": true
 		},
 		"Set": {
 			"Enabled": true,
-			"LinkedHashSet": true,
-			"LinkedCustomHashSet": true,
-			"OrderedSet": true,
-			"ArraySet": true,
 			"AVLTreeSet": true,
-			"ImmutableSet": true,
+			"ArraySet": true,
 			"CustomHashSet": true,
-			"Sets": true,
-			"SortedSet": true,
 			"HashSet": true,
-			"RBTreeSet": true
+			"ImmutableSet": true,
+			"Implementations": true,
+			"LinkedCustomHashSet": true,
+			"LinkedHashSet": true,
+			"OrderedSet": true,
+			"RBTreeSet": true,
+			"SortedSet": true,
+			"Wrappers": true
 		},
 		"Async": {
 			"Enabled": true
@@ -1208,20 +1253,21 @@
 			},
 			"Map": {
 				"Enabled": true,
-				"HashMap": true,
-				"RBTreeMap": true,
-				"ConcurrentMap": true,
-				"ArrayMap": true,
 				"AVLTreeMap": true,
+				"ArrayMap": true,
+				"ConcurrentMap": true,
 				"CustomHashMap": true,
+				"EnumMap": true,
+				"HashMap": true,
 				"ImmutableMap": true,
+				"Implementations": true,
 				"LinkedCustomHashMap": true,
-				"LinkedHashMap": true,
-				"Maps": true,
-				"SortedMap": true,
 				"LinkedEnumMap": true,
+				"LinkedHashMap": true,
 				"OrderedMap": true,
-				"EnumMap": true
+				"RBTreeMap": true,
+				"SortedMap": true,
+				"Wrappers": true
 			},
 			"Pair": {
 				"Enabled": true
@@ -1234,20 +1280,21 @@
 			},
 			"Map": {
 				"Enabled": true,
-				"HashMap": true,
-				"RBTreeMap": true,
-				"ConcurrentMap": true,
-				"ArrayMap": true,
 				"AVLTreeMap": true,
+				"ArrayMap": true,
+				"ConcurrentMap": true,
 				"CustomHashMap": true,
+				"EnumMap": true,
+				"HashMap": true,
 				"ImmutableMap": true,
+				"Implementations": true,
 				"LinkedCustomHashMap": true,
-				"LinkedHashMap": true,
-				"Maps": true,
-				"SortedMap": true,
 				"LinkedEnumMap": true,
+				"LinkedHashMap": true,
 				"OrderedMap": true,
-				"EnumMap": true
+				"RBTreeMap": true,
+				"SortedMap": true,
+				"Wrappers": true
 			},
 			"Pair": {
 				"Enabled": true
@@ -1260,20 +1307,21 @@
 			},
 			"Map": {
 				"Enabled": true,
-				"HashMap": true,
-				"RBTreeMap": true,
-				"ConcurrentMap": true,
-				"ArrayMap": true,
 				"AVLTreeMap": true,
+				"ArrayMap": true,
+				"ConcurrentMap": true,
 				"CustomHashMap": true,
+				"EnumMap": true,
+				"HashMap": true,
 				"ImmutableMap": true,
+				"Implementations": true,
 				"LinkedCustomHashMap": true,
-				"LinkedHashMap": true,
-				"Maps": true,
-				"SortedMap": true,
 				"LinkedEnumMap": true,
+				"LinkedHashMap": true,
 				"OrderedMap": true,
-				"EnumMap": true
+				"RBTreeMap": true,
+				"SortedMap": true,
+				"Wrappers": true
 			},
 			"Pair": {
 				"Enabled": true
@@ -1286,20 +1334,21 @@
 			},
 			"Map": {
 				"Enabled": true,
-				"HashMap": true,
-				"RBTreeMap": true,
-				"ConcurrentMap": true,
-				"ArrayMap": true,
 				"AVLTreeMap": true,
+				"ArrayMap": true,
+				"ConcurrentMap": true,
 				"CustomHashMap": true,
+				"EnumMap": true,
+				"HashMap": true,
 				"ImmutableMap": true,
+				"Implementations": true,
 				"LinkedCustomHashMap": true,
-				"LinkedHashMap": true,
-				"Maps": true,
-				"SortedMap": true,
 				"LinkedEnumMap": true,
+				"LinkedHashMap": true,
 				"OrderedMap": true,
-				"EnumMap": true
+				"RBTreeMap": true,
+				"SortedMap": true,
+				"Wrappers": true
 			},
 			"Pair": {
 				"Enabled": true
@@ -1312,20 +1361,21 @@
 			},
 			"Map": {
 				"Enabled": true,
-				"HashMap": true,
-				"RBTreeMap": true,
-				"ConcurrentMap": true,
-				"ArrayMap": true,
 				"AVLTreeMap": true,
+				"ArrayMap": true,
+				"ConcurrentMap": true,
 				"CustomHashMap": true,
+				"EnumMap": true,
+				"HashMap": true,
 				"ImmutableMap": true,
+				"Implementations": true,
 				"LinkedCustomHashMap": true,
-				"LinkedHashMap": true,
-				"Maps": true,
-				"SortedMap": true,
 				"LinkedEnumMap": true,
+				"LinkedHashMap": true,
 				"OrderedMap": true,
-				"EnumMap": true
+				"RBTreeMap": true,
+				"SortedMap": true,
+				"Wrappers": true
 			},
 			"Pair": {
 				"Enabled": true
@@ -1338,20 +1388,21 @@
 			},
 			"Map": {
 				"Enabled": true,
-				"HashMap": true,
-				"RBTreeMap": true,
-				"ConcurrentMap": true,
-				"ArrayMap": true,
 				"AVLTreeMap": true,
+				"ArrayMap": true,
+				"ConcurrentMap": true,
 				"CustomHashMap": true,
+				"EnumMap": true,
+				"HashMap": true,
 				"ImmutableMap": true,
+				"Implementations": true,
 				"LinkedCustomHashMap": true,
-				"LinkedHashMap": true,
-				"Maps": true,
-				"SortedMap": true,
 				"LinkedEnumMap": true,
+				"LinkedHashMap": true,
 				"OrderedMap": true,
-				"EnumMap": true
+				"RBTreeMap": true,
+				"SortedMap": true,
+				"Wrappers": true
 			},
 			"Pair": {
 				"Enabled": true
@@ -1364,20 +1415,21 @@
 			},
 			"Map": {
 				"Enabled": true,
-				"HashMap": true,
-				"RBTreeMap": true,
-				"ConcurrentMap": true,
-				"ArrayMap": true,
 				"AVLTreeMap": true,
+				"ArrayMap": true,
+				"ConcurrentMap": true,
 				"CustomHashMap": true,
+				"EnumMap": true,
+				"HashMap": true,
 				"ImmutableMap": true,
+				"Implementations": true,
 				"LinkedCustomHashMap": true,
-				"LinkedHashMap": true,
-				"Maps": true,
-				"SortedMap": true,
 				"LinkedEnumMap": true,
+				"LinkedHashMap": true,
 				"OrderedMap": true,
-				"EnumMap": true
+				"RBTreeMap": true,
+				"SortedMap": true,
+				"Wrappers": true
 			},
 			"Pair": {
 				"Enabled": true
@@ -1390,20 +1442,21 @@
 			},
 			"Map": {
 				"Enabled": true,
-				"HashMap": true,
-				"RBTreeMap": true,
-				"ConcurrentMap": true,
-				"ArrayMap": true,
 				"AVLTreeMap": true,
+				"ArrayMap": true,
+				"ConcurrentMap": true,
 				"CustomHashMap": true,
+				"EnumMap": true,
+				"HashMap": true,
 				"ImmutableMap": true,
+				"Implementations": true,
 				"LinkedCustomHashMap": true,
-				"LinkedHashMap": true,
-				"Maps": true,
-				"SortedMap": true,
 				"LinkedEnumMap": true,
+				"LinkedHashMap": true,
 				"OrderedMap": true,
-				"EnumMap": true
+				"RBTreeMap": true,
+				"SortedMap": true,
+				"Wrappers": true
 			},
 			"Pair": {
 				"Enabled": true
@@ -1416,20 +1469,21 @@
 			},
 			"Map": {
 				"Enabled": true,
-				"HashMap": true,
-				"RBTreeMap": true,
-				"ConcurrentMap": true,
-				"ArrayMap": true,
 				"AVLTreeMap": true,
+				"ArrayMap": true,
+				"ConcurrentMap": true,
 				"CustomHashMap": true,
+				"EnumMap": true,
+				"HashMap": true,
 				"ImmutableMap": true,
+				"Implementations": true,
 				"LinkedCustomHashMap": true,
-				"LinkedHashMap": true,
-				"Maps": true,
-				"SortedMap": true,
 				"LinkedEnumMap": true,
+				"LinkedHashMap": true,
 				"OrderedMap": true,
-				"EnumMap": true
+				"RBTreeMap": true,
+				"SortedMap": true,
+				"Wrappers": true
 			},
 			"Pair": {
 				"Enabled": true
@@ -1443,25 +1497,27 @@
 		},
 		"List": {
 			"Enabled": true,
-			"Lists": true,
-			"ImmutableList": true,
-			"CopyOnWriteList": true,
 			"ArrayList": true,
-			"LinkedList": true
+			"CopyOnWriteList": true,
+			"ImmutableList": true,
+			"Implementations": true,
+			"LinkedList": true,
+			"Wrappers": true
 		},
 		"Set": {
 			"Enabled": true,
-			"LinkedHashSet": true,
-			"LinkedCustomHashSet": true,
-			"OrderedSet": true,
-			"ArraySet": true,
 			"AVLTreeSet": true,
-			"ImmutableSet": true,
+			"ArraySet": true,
 			"CustomHashSet": true,
-			"Sets": true,
-			"SortedSet": true,
 			"HashSet": true,
-			"RBTreeSet": true
+			"ImmutableSet": true,
+			"Implementations": true,
+			"LinkedCustomHashSet": true,
+			"LinkedHashSet": true,
+			"OrderedSet": true,
+			"RBTreeSet": true,
+			"SortedSet": true,
+			"Wrappers": true
 		},
 		"Async": {
 			"Enabled": true
@@ -1479,20 +1535,21 @@
 			},
 			"Map": {
 				"Enabled": true,
-				"HashMap": true,
-				"RBTreeMap": true,
-				"ConcurrentMap": true,
-				"ArrayMap": true,
 				"AVLTreeMap": true,
+				"ArrayMap": true,
+				"ConcurrentMap": true,
 				"CustomHashMap": true,
+				"EnumMap": true,
+				"HashMap": true,
 				"ImmutableMap": true,
+				"Implementations": true,
 				"LinkedCustomHashMap": true,
-				"LinkedHashMap": true,
-				"Maps": true,
-				"SortedMap": true,
 				"LinkedEnumMap": true,
+				"LinkedHashMap": true,
 				"OrderedMap": true,
-				"EnumMap": true
+				"RBTreeMap": true,
+				"SortedMap": true,
+				"Wrappers": true
 			},
 			"Pair": {
 				"Enabled": true
@@ -1505,20 +1562,21 @@
 			},
 			"Map": {
 				"Enabled": true,
-				"HashMap": true,
-				"RBTreeMap": true,
-				"ConcurrentMap": true,
-				"ArrayMap": true,
 				"AVLTreeMap": true,
+				"ArrayMap": true,
+				"ConcurrentMap": true,
 				"CustomHashMap": true,
+				"EnumMap": true,
+				"HashMap": true,
 				"ImmutableMap": true,
+				"Implementations": true,
 				"LinkedCustomHashMap": true,
-				"LinkedHashMap": true,
-				"Maps": true,
-				"SortedMap": true,
 				"LinkedEnumMap": true,
+				"LinkedHashMap": true,
 				"OrderedMap": true,
-				"EnumMap": true
+				"RBTreeMap": true,
+				"SortedMap": true,
+				"Wrappers": true
 			},
 			"Pair": {
 				"Enabled": true
@@ -1531,20 +1589,21 @@
 			},
 			"Map": {
 				"Enabled": true,
-				"HashMap": true,
-				"RBTreeMap": true,
-				"ConcurrentMap": true,
-				"ArrayMap": true,
 				"AVLTreeMap": true,
+				"ArrayMap": true,
+				"ConcurrentMap": true,
 				"CustomHashMap": true,
+				"EnumMap": true,
+				"HashMap": true,
 				"ImmutableMap": true,
+				"Implementations": true,
 				"LinkedCustomHashMap": true,
-				"LinkedHashMap": true,
-				"Maps": true,
-				"SortedMap": true,
 				"LinkedEnumMap": true,
+				"LinkedHashMap": true,
 				"OrderedMap": true,
-				"EnumMap": true
+				"RBTreeMap": true,
+				"SortedMap": true,
+				"Wrappers": true
 			},
 			"Pair": {
 				"Enabled": true
@@ -1557,20 +1616,21 @@
 			},
 			"Map": {
 				"Enabled": true,
-				"HashMap": true,
-				"RBTreeMap": true,
-				"ConcurrentMap": true,
-				"ArrayMap": true,
 				"AVLTreeMap": true,
+				"ArrayMap": true,
+				"ConcurrentMap": true,
 				"CustomHashMap": true,
+				"EnumMap": true,
+				"HashMap": true,
 				"ImmutableMap": true,
+				"Implementations": true,
 				"LinkedCustomHashMap": true,
-				"LinkedHashMap": true,
-				"Maps": true,
-				"SortedMap": true,
 				"LinkedEnumMap": true,
+				"LinkedHashMap": true,
 				"OrderedMap": true,
-				"EnumMap": true
+				"RBTreeMap": true,
+				"SortedMap": true,
+				"Wrappers": true
 			},
 			"Pair": {
 				"Enabled": true
@@ -1583,20 +1643,21 @@
 			},
 			"Map": {
 				"Enabled": true,
-				"HashMap": true,
-				"RBTreeMap": true,
-				"ConcurrentMap": true,
-				"ArrayMap": true,
 				"AVLTreeMap": true,
+				"ArrayMap": true,
+				"ConcurrentMap": true,
 				"CustomHashMap": true,
+				"EnumMap": true,
+				"HashMap": true,
 				"ImmutableMap": true,
+				"Implementations": true,
 				"LinkedCustomHashMap": true,
-				"LinkedHashMap": true,
-				"Maps": true,
-				"SortedMap": true,
 				"LinkedEnumMap": true,
+				"LinkedHashMap": true,
 				"OrderedMap": true,
-				"EnumMap": true
+				"RBTreeMap": true,
+				"SortedMap": true,
+				"Wrappers": true
 			},
 			"Pair": {
 				"Enabled": true
@@ -1609,20 +1670,21 @@
 			},
 			"Map": {
 				"Enabled": true,
-				"HashMap": true,
-				"RBTreeMap": true,
-				"ConcurrentMap": true,
-				"ArrayMap": true,
 				"AVLTreeMap": true,
+				"ArrayMap": true,
+				"ConcurrentMap": true,
 				"CustomHashMap": true,
+				"EnumMap": true,
+				"HashMap": true,
 				"ImmutableMap": true,
+				"Implementations": true,
 				"LinkedCustomHashMap": true,
-				"LinkedHashMap": true,
-				"Maps": true,
-				"SortedMap": true,
 				"LinkedEnumMap": true,
+				"LinkedHashMap": true,
 				"OrderedMap": true,
-				"EnumMap": true
+				"RBTreeMap": true,
+				"SortedMap": true,
+				"Wrappers": true
 			},
 			"Pair": {
 				"Enabled": true
@@ -1635,20 +1697,21 @@
 			},
 			"Map": {
 				"Enabled": true,
-				"HashMap": true,
-				"RBTreeMap": true,
-				"ConcurrentMap": true,
-				"ArrayMap": true,
 				"AVLTreeMap": true,
+				"ArrayMap": true,
+				"ConcurrentMap": true,
 				"CustomHashMap": true,
+				"EnumMap": true,
+				"HashMap": true,
 				"ImmutableMap": true,
+				"Implementations": true,
 				"LinkedCustomHashMap": true,
-				"LinkedHashMap": true,
-				"Maps": true,
-				"SortedMap": true,
 				"LinkedEnumMap": true,
+				"LinkedHashMap": true,
 				"OrderedMap": true,
-				"EnumMap": true
+				"RBTreeMap": true,
+				"SortedMap": true,
+				"Wrappers": true
 			},
 			"Pair": {
 				"Enabled": true
@@ -1661,20 +1724,21 @@
 			},
 			"Map": {
 				"Enabled": true,
-				"HashMap": true,
-				"RBTreeMap": true,
-				"ConcurrentMap": true,
-				"ArrayMap": true,
 				"AVLTreeMap": true,
+				"ArrayMap": true,
+				"ConcurrentMap": true,
 				"CustomHashMap": true,
+				"EnumMap": true,
+				"HashMap": true,
 				"ImmutableMap": true,
+				"Implementations": true,
 				"LinkedCustomHashMap": true,
-				"LinkedHashMap": true,
-				"Maps": true,
-				"SortedMap": true,
 				"LinkedEnumMap": true,
+				"LinkedHashMap": true,
 				"OrderedMap": true,
-				"EnumMap": true
+				"RBTreeMap": true,
+				"SortedMap": true,
+				"Wrappers": true
 			},
 			"Pair": {
 				"Enabled": true
@@ -1687,20 +1751,21 @@
 			},
 			"Map": {
 				"Enabled": true,
-				"HashMap": true,
-				"RBTreeMap": true,
-				"ConcurrentMap": true,
-				"ArrayMap": true,
 				"AVLTreeMap": true,
+				"ArrayMap": true,
+				"ConcurrentMap": true,
 				"CustomHashMap": true,
+				"EnumMap": true,
+				"HashMap": true,
 				"ImmutableMap": true,
+				"Implementations": true,
 				"LinkedCustomHashMap": true,
-				"LinkedHashMap": true,
-				"Maps": true,
-				"SortedMap": true,
 				"LinkedEnumMap": true,
+				"LinkedHashMap": true,
 				"OrderedMap": true,
-				"EnumMap": true
+				"RBTreeMap": true,
+				"SortedMap": true,
+				"Wrappers": true
 			},
 			"Pair": {
 				"Enabled": true
@@ -1714,25 +1779,27 @@
 		},
 		"List": {
 			"Enabled": true,
-			"Lists": true,
-			"ImmutableList": true,
-			"CopyOnWriteList": true,
 			"ArrayList": true,
-			"LinkedList": true
+			"CopyOnWriteList": true,
+			"ImmutableList": true,
+			"Implementations": true,
+			"LinkedList": true,
+			"Wrappers": true
 		},
 		"Set": {
 			"Enabled": true,
-			"LinkedHashSet": true,
-			"LinkedCustomHashSet": true,
-			"OrderedSet": true,
-			"ArraySet": true,
 			"AVLTreeSet": true,
-			"ImmutableSet": true,
+			"ArraySet": true,
 			"CustomHashSet": true,
-			"Sets": true,
-			"SortedSet": true,
 			"HashSet": true,
-			"RBTreeSet": true
+			"ImmutableSet": true,
+			"Implementations": true,
+			"LinkedCustomHashSet": true,
+			"LinkedHashSet": true,
+			"OrderedSet": true,
+			"RBTreeSet": true,
+			"SortedSet": true,
+			"Wrappers": true
 		},
 		"Async": {
 			"Enabled": true
@@ -1750,20 +1817,21 @@
 			},
 			"Map": {
 				"Enabled": true,
-				"HashMap": true,
-				"RBTreeMap": true,
-				"ConcurrentMap": true,
-				"ArrayMap": true,
 				"AVLTreeMap": true,
+				"ArrayMap": true,
+				"ConcurrentMap": true,
 				"CustomHashMap": true,
+				"EnumMap": true,
+				"HashMap": true,
 				"ImmutableMap": true,
+				"Implementations": true,
 				"LinkedCustomHashMap": true,
-				"LinkedHashMap": true,
-				"Maps": true,
-				"SortedMap": true,
 				"LinkedEnumMap": true,
+				"LinkedHashMap": true,
 				"OrderedMap": true,
-				"EnumMap": true
+				"RBTreeMap": true,
+				"SortedMap": true,
+				"Wrappers": true
 			},
 			"Pair": {
 				"Enabled": true
@@ -1776,20 +1844,21 @@
 			},
 			"Map": {
 				"Enabled": true,
-				"HashMap": true,
-				"RBTreeMap": true,
-				"ConcurrentMap": true,
-				"ArrayMap": true,
 				"AVLTreeMap": true,
+				"ArrayMap": true,
+				"ConcurrentMap": true,
 				"CustomHashMap": true,
+				"EnumMap": true,
+				"HashMap": true,
 				"ImmutableMap": true,
+				"Implementations": true,
 				"LinkedCustomHashMap": true,
-				"LinkedHashMap": true,
-				"Maps": true,
-				"SortedMap": true,
 				"LinkedEnumMap": true,
+				"LinkedHashMap": true,
 				"OrderedMap": true,
-				"EnumMap": true
+				"RBTreeMap": true,
+				"SortedMap": true,
+				"Wrappers": true
 			},
 			"Pair": {
 				"Enabled": true
@@ -1802,20 +1871,21 @@
 			},
 			"Map": {
 				"Enabled": true,
-				"HashMap": true,
-				"RBTreeMap": true,
-				"ConcurrentMap": true,
-				"ArrayMap": true,
 				"AVLTreeMap": true,
+				"ArrayMap": true,
+				"ConcurrentMap": true,
 				"CustomHashMap": true,
+				"EnumMap": true,
+				"HashMap": true,
 				"ImmutableMap": true,
+				"Implementations": true,
 				"LinkedCustomHashMap": true,
-				"LinkedHashMap": true,
-				"Maps": true,
-				"SortedMap": true,
 				"LinkedEnumMap": true,
+				"LinkedHashMap": true,
 				"OrderedMap": true,
-				"EnumMap": true
+				"RBTreeMap": true,
+				"SortedMap": true,
+				"Wrappers": true
 			},
 			"Pair": {
 				"Enabled": true
@@ -1828,20 +1898,21 @@
 			},
 			"Map": {
 				"Enabled": true,
-				"HashMap": true,
-				"RBTreeMap": true,
-				"ConcurrentMap": true,
-				"ArrayMap": true,
 				"AVLTreeMap": true,
+				"ArrayMap": true,
+				"ConcurrentMap": true,
 				"CustomHashMap": true,
+				"EnumMap": true,
+				"HashMap": true,
 				"ImmutableMap": true,
+				"Implementations": true,
 				"LinkedCustomHashMap": true,
-				"LinkedHashMap": true,
-				"Maps": true,
-				"SortedMap": true,
 				"LinkedEnumMap": true,
+				"LinkedHashMap": true,
 				"OrderedMap": true,
-				"EnumMap": true
+				"RBTreeMap": true,
+				"SortedMap": true,
+				"Wrappers": true
 			},
 			"Pair": {
 				"Enabled": true
@@ -1854,20 +1925,21 @@
 			},
 			"Map": {
 				"Enabled": true,
-				"HashMap": true,
-				"RBTreeMap": true,
-				"ConcurrentMap": true,
-				"ArrayMap": true,
 				"AVLTreeMap": true,
+				"ArrayMap": true,
+				"ConcurrentMap": true,
 				"CustomHashMap": true,
+				"EnumMap": true,
+				"HashMap": true,
 				"ImmutableMap": true,
+				"Implementations": true,
 				"LinkedCustomHashMap": true,
-				"LinkedHashMap": true,
-				"Maps": true,
-				"SortedMap": true,
 				"LinkedEnumMap": true,
+				"LinkedHashMap": true,
 				"OrderedMap": true,
-				"EnumMap": true
+				"RBTreeMap": true,
+				"SortedMap": true,
+				"Wrappers": true
 			},
 			"Pair": {
 				"Enabled": true
@@ -1880,20 +1952,21 @@
 			},
 			"Map": {
 				"Enabled": true,
-				"HashMap": true,
-				"RBTreeMap": true,
-				"ConcurrentMap": true,
-				"ArrayMap": true,
 				"AVLTreeMap": true,
+				"ArrayMap": true,
+				"ConcurrentMap": true,
 				"CustomHashMap": true,
+				"EnumMap": true,
+				"HashMap": true,
 				"ImmutableMap": true,
+				"Implementations": true,
 				"LinkedCustomHashMap": true,
-				"LinkedHashMap": true,
-				"Maps": true,
-				"SortedMap": true,
 				"LinkedEnumMap": true,
+				"LinkedHashMap": true,
 				"OrderedMap": true,
-				"EnumMap": true
+				"RBTreeMap": true,
+				"SortedMap": true,
+				"Wrappers": true
 			},
 			"Pair": {
 				"Enabled": true
@@ -1906,20 +1979,21 @@
 			},
 			"Map": {
 				"Enabled": true,
-				"HashMap": true,
-				"RBTreeMap": true,
-				"ConcurrentMap": true,
-				"ArrayMap": true,
 				"AVLTreeMap": true,
+				"ArrayMap": true,
+				"ConcurrentMap": true,
 				"CustomHashMap": true,
+				"EnumMap": true,
+				"HashMap": true,
 				"ImmutableMap": true,
+				"Implementations": true,
 				"LinkedCustomHashMap": true,
-				"LinkedHashMap": true,
-				"Maps": true,
-				"SortedMap": true,
 				"LinkedEnumMap": true,
+				"LinkedHashMap": true,
 				"OrderedMap": true,
-				"EnumMap": true
+				"RBTreeMap": true,
+				"SortedMap": true,
+				"Wrappers": true
 			},
 			"Pair": {
 				"Enabled": true
@@ -1932,20 +2006,21 @@
 			},
 			"Map": {
 				"Enabled": true,
-				"HashMap": true,
-				"RBTreeMap": true,
-				"ConcurrentMap": true,
-				"ArrayMap": true,
 				"AVLTreeMap": true,
+				"ArrayMap": true,
+				"ConcurrentMap": true,
 				"CustomHashMap": true,
+				"EnumMap": true,
+				"HashMap": true,
 				"ImmutableMap": true,
+				"Implementations": true,
 				"LinkedCustomHashMap": true,
-				"LinkedHashMap": true,
-				"Maps": true,
-				"SortedMap": true,
 				"LinkedEnumMap": true,
+				"LinkedHashMap": true,
 				"OrderedMap": true,
-				"EnumMap": true
+				"RBTreeMap": true,
+				"SortedMap": true,
+				"Wrappers": true
 			},
 			"Pair": {
 				"Enabled": true
@@ -1958,20 +2033,21 @@
 			},
 			"Map": {
 				"Enabled": true,
-				"HashMap": true,
-				"RBTreeMap": true,
-				"ConcurrentMap": true,
-				"ArrayMap": true,
 				"AVLTreeMap": true,
+				"ArrayMap": true,
+				"ConcurrentMap": true,
 				"CustomHashMap": true,
+				"EnumMap": true,
+				"HashMap": true,
 				"ImmutableMap": true,
+				"Implementations": true,
 				"LinkedCustomHashMap": true,
-				"LinkedHashMap": true,
-				"Maps": true,
-				"SortedMap": true,
 				"LinkedEnumMap": true,
+				"LinkedHashMap": true,
 				"OrderedMap": true,
-				"EnumMap": true
+				"RBTreeMap": true,
+				"SortedMap": true,
+				"Wrappers": true
 			},
 			"Pair": {
 				"Enabled": true
@@ -1985,25 +2061,27 @@
 		},
 		"List": {
 			"Enabled": true,
-			"Lists": true,
-			"ImmutableList": true,
-			"CopyOnWriteList": true,
 			"ArrayList": true,
-			"LinkedList": true
+			"CopyOnWriteList": true,
+			"ImmutableList": true,
+			"Implementations": true,
+			"LinkedList": true,
+			"Wrappers": true
 		},
 		"Set": {
 			"Enabled": true,
-			"LinkedHashSet": true,
-			"LinkedCustomHashSet": true,
-			"OrderedSet": true,
-			"ArraySet": true,
 			"AVLTreeSet": true,
-			"ImmutableSet": true,
+			"ArraySet": true,
 			"CustomHashSet": true,
-			"Sets": true,
-			"SortedSet": true,
 			"HashSet": true,
-			"RBTreeSet": true
+			"ImmutableSet": true,
+			"Implementations": true,
+			"LinkedCustomHashSet": true,
+			"LinkedHashSet": true,
+			"OrderedSet": true,
+			"RBTreeSet": true,
+			"SortedSet": true,
+			"Wrappers": true
 		},
 		"Async": {
 			"Enabled": true
@@ -2021,20 +2099,21 @@
 			},
 			"Map": {
 				"Enabled": true,
-				"HashMap": true,
-				"RBTreeMap": true,
-				"ConcurrentMap": true,
-				"ArrayMap": true,
 				"AVLTreeMap": true,
+				"ArrayMap": true,
+				"ConcurrentMap": true,
 				"CustomHashMap": true,
+				"EnumMap": true,
+				"HashMap": true,
 				"ImmutableMap": true,
+				"Implementations": true,
 				"LinkedCustomHashMap": true,
-				"LinkedHashMap": true,
-				"Maps": true,
-				"SortedMap": true,
 				"LinkedEnumMap": true,
+				"LinkedHashMap": true,
 				"OrderedMap": true,
-				"EnumMap": true
+				"RBTreeMap": true,
+				"SortedMap": true,
+				"Wrappers": true
 			},
 			"Pair": {
 				"Enabled": true
@@ -2047,20 +2126,21 @@
 			},
 			"Map": {
 				"Enabled": true,
-				"HashMap": true,
-				"RBTreeMap": true,
-				"ConcurrentMap": true,
-				"ArrayMap": true,
 				"AVLTreeMap": true,
+				"ArrayMap": true,
+				"ConcurrentMap": true,
 				"CustomHashMap": true,
+				"EnumMap": true,
+				"HashMap": true,
 				"ImmutableMap": true,
+				"Implementations": true,
 				"LinkedCustomHashMap": true,
-				"LinkedHashMap": true,
-				"Maps": true,
-				"SortedMap": true,
 				"LinkedEnumMap": true,
+				"LinkedHashMap": true,
 				"OrderedMap": true,
-				"EnumMap": true
+				"RBTreeMap": true,
+				"SortedMap": true,
+				"Wrappers": true
 			},
 			"Pair": {
 				"Enabled": true
@@ -2073,20 +2153,21 @@
 			},
 			"Map": {
 				"Enabled": true,
-				"HashMap": true,
-				"RBTreeMap": true,
-				"ConcurrentMap": true,
-				"ArrayMap": true,
 				"AVLTreeMap": true,
+				"ArrayMap": true,
+				"ConcurrentMap": true,
 				"CustomHashMap": true,
+				"EnumMap": true,
+				"HashMap": true,
 				"ImmutableMap": true,
+				"Implementations": true,
 				"LinkedCustomHashMap": true,
-				"LinkedHashMap": true,
-				"Maps": true,
-				"SortedMap": true,
 				"LinkedEnumMap": true,
+				"LinkedHashMap": true,
 				"OrderedMap": true,
-				"EnumMap": true
+				"RBTreeMap": true,
+				"SortedMap": true,
+				"Wrappers": true
 			},
 			"Pair": {
 				"Enabled": true
@@ -2099,20 +2180,21 @@
 			},
 			"Map": {
 				"Enabled": true,
-				"HashMap": true,
-				"RBTreeMap": true,
-				"ConcurrentMap": true,
-				"ArrayMap": true,
 				"AVLTreeMap": true,
+				"ArrayMap": true,
+				"ConcurrentMap": true,
 				"CustomHashMap": true,
+				"EnumMap": true,
+				"HashMap": true,
 				"ImmutableMap": true,
+				"Implementations": true,
 				"LinkedCustomHashMap": true,
-				"LinkedHashMap": true,
-				"Maps": true,
-				"SortedMap": true,
 				"LinkedEnumMap": true,
+				"LinkedHashMap": true,
 				"OrderedMap": true,
-				"EnumMap": true
+				"RBTreeMap": true,
+				"SortedMap": true,
+				"Wrappers": true
 			},
 			"Pair": {
 				"Enabled": true
@@ -2125,20 +2207,21 @@
 			},
 			"Map": {
 				"Enabled": true,
-				"HashMap": true,
-				"RBTreeMap": true,
-				"ConcurrentMap": true,
-				"ArrayMap": true,
 				"AVLTreeMap": true,
+				"ArrayMap": true,
+				"ConcurrentMap": true,
 				"CustomHashMap": true,
+				"EnumMap": true,
+				"HashMap": true,
 				"ImmutableMap": true,
+				"Implementations": true,
 				"LinkedCustomHashMap": true,
-				"LinkedHashMap": true,
-				"Maps": true,
-				"SortedMap": true,
 				"LinkedEnumMap": true,
+				"LinkedHashMap": true,
 				"OrderedMap": true,
-				"EnumMap": true
+				"RBTreeMap": true,
+				"SortedMap": true,
+				"Wrappers": true
 			},
 			"Pair": {
 				"Enabled": true
@@ -2151,20 +2234,21 @@
 			},
 			"Map": {
 				"Enabled": true,
-				"HashMap": true,
-				"RBTreeMap": true,
-				"ConcurrentMap": true,
-				"ArrayMap": true,
 				"AVLTreeMap": true,
+				"ArrayMap": true,
+				"ConcurrentMap": true,
 				"CustomHashMap": true,
+				"EnumMap": true,
+				"HashMap": true,
 				"ImmutableMap": true,
+				"Implementations": true,
 				"LinkedCustomHashMap": true,
-				"LinkedHashMap": true,
-				"Maps": true,
-				"SortedMap": true,
 				"LinkedEnumMap": true,
+				"LinkedHashMap": true,
 				"OrderedMap": true,
-				"EnumMap": true
+				"RBTreeMap": true,
+				"SortedMap": true,
+				"Wrappers": true
 			},
 			"Pair": {
 				"Enabled": true
@@ -2177,20 +2261,21 @@
 			},
 			"Map": {
 				"Enabled": true,
-				"HashMap": true,
-				"RBTreeMap": true,
-				"ConcurrentMap": true,
-				"ArrayMap": true,
 				"AVLTreeMap": true,
+				"ArrayMap": true,
+				"ConcurrentMap": true,
 				"CustomHashMap": true,
+				"EnumMap": true,
+				"HashMap": true,
 				"ImmutableMap": true,
+				"Implementations": true,
 				"LinkedCustomHashMap": true,
-				"LinkedHashMap": true,
-				"Maps": true,
-				"SortedMap": true,
 				"LinkedEnumMap": true,
+				"LinkedHashMap": true,
 				"OrderedMap": true,
-				"EnumMap": true
+				"RBTreeMap": true,
+				"SortedMap": true,
+				"Wrappers": true
 			},
 			"Pair": {
 				"Enabled": true
@@ -2203,20 +2288,21 @@
 			},
 			"Map": {
 				"Enabled": true,
-				"HashMap": true,
-				"RBTreeMap": true,
-				"ConcurrentMap": true,
-				"ArrayMap": true,
 				"AVLTreeMap": true,
+				"ArrayMap": true,
+				"ConcurrentMap": true,
 				"CustomHashMap": true,
+				"EnumMap": true,
+				"HashMap": true,
 				"ImmutableMap": true,
+				"Implementations": true,
 				"LinkedCustomHashMap": true,
-				"LinkedHashMap": true,
-				"Maps": true,
-				"SortedMap": true,
 				"LinkedEnumMap": true,
+				"LinkedHashMap": true,
 				"OrderedMap": true,
-				"EnumMap": true
+				"RBTreeMap": true,
+				"SortedMap": true,
+				"Wrappers": true
 			},
 			"Pair": {
 				"Enabled": true
@@ -2229,20 +2315,21 @@
 			},
 			"Map": {
 				"Enabled": true,
-				"HashMap": true,
-				"RBTreeMap": true,
-				"ConcurrentMap": true,
-				"ArrayMap": true,
 				"AVLTreeMap": true,
+				"ArrayMap": true,
+				"ConcurrentMap": true,
 				"CustomHashMap": true,
+				"EnumMap": true,
+				"HashMap": true,
 				"ImmutableMap": true,
+				"Implementations": true,
 				"LinkedCustomHashMap": true,
-				"LinkedHashMap": true,
-				"Maps": true,
-				"SortedMap": true,
 				"LinkedEnumMap": true,
+				"LinkedHashMap": true,
 				"OrderedMap": true,
-				"EnumMap": true
+				"RBTreeMap": true,
+				"SortedMap": true,
+				"Wrappers": true
 			},
 			"Pair": {
 				"Enabled": true
@@ -2256,25 +2343,27 @@
 		},
 		"List": {
 			"Enabled": true,
-			"Lists": true,
-			"ImmutableList": true,
-			"CopyOnWriteList": true,
 			"ArrayList": true,
-			"LinkedList": true
+			"CopyOnWriteList": true,
+			"ImmutableList": true,
+			"Implementations": true,
+			"LinkedList": true,
+			"Wrappers": true
 		},
 		"Set": {
 			"Enabled": true,
-			"LinkedHashSet": true,
-			"LinkedCustomHashSet": true,
-			"OrderedSet": true,
-			"ArraySet": true,
 			"AVLTreeSet": true,
-			"ImmutableSet": true,
+			"ArraySet": true,
 			"CustomHashSet": true,
-			"Sets": true,
-			"SortedSet": true,
 			"HashSet": true,
-			"RBTreeSet": true
+			"ImmutableSet": true,
+			"Implementations": true,
+			"LinkedCustomHashSet": true,
+			"LinkedHashSet": true,
+			"OrderedSet": true,
+			"RBTreeSet": true,
+			"SortedSet": true,
+			"Wrappers": true
 		},
 		"Async": {
 			"Enabled": true
diff --git a/src/builder/java/speiger/src/builder/PrimitiveCollectionsBuilder.java b/src/builder/java/speiger/src/builder/PrimitiveCollectionsBuilder.java
index cd50dc57..ff638d51 100644
--- a/src/builder/java/speiger/src/builder/PrimitiveCollectionsBuilder.java
+++ b/src/builder/java/speiger/src/builder/PrimitiveCollectionsBuilder.java
@@ -149,11 +149,8 @@ public class PrimitiveCollectionsBuilder extends TemplateProcessor
 	
 	public void addModules(List<BaseModule> modules)
 	{
-		if((flags & LOAD) != 0)
-		{
-			for(int i = 0,m=modules.size();i<m;i++) {
-				modules.get(i).setManager(manager);
-			}
+		for(int i = 0,m=modules.size();i<m;i++) {
+			modules.get(i).setManager(manager);
 		}
 		for(int i = 0,m=modules.size();i<m;i++) {
 			biPackages.forEach(modules.get(i)::init);
@@ -256,8 +253,8 @@ public class PrimitiveCollectionsBuilder extends TemplateProcessor
 			boolean force = flags.contains("force");
 			boolean tests = flags.contains("tests");
 			boolean forceTests =  flags.contains("force-tests");
-			boolean load = !flags.contains("load");
-			boolean save = flags.contains("save");
+			boolean load = flags.contains("load");
+			boolean save = !flags.contains("save");
 			int flag = (load ? LOAD : 0) | (save ? SAVE : 0);
             new PrimitiveCollectionsBuilder(silent).setFlags(flag).process(force);
             if(tests) {
diff --git a/src/builder/java/speiger/src/builder/modules/ListModule.java b/src/builder/java/speiger/src/builder/modules/ListModule.java
index 32e15fce..ef53f845 100644
--- a/src/builder/java/speiger/src/builder/modules/ListModule.java
+++ b/src/builder/java/speiger/src/builder/modules/ListModule.java
@@ -1,8 +1,8 @@
 package speiger.src.builder.modules;
 
 import java.util.Arrays;
-import java.util.HashSet;
 import java.util.Set;
+import java.util.TreeSet;
 
 import speiger.src.builder.ClassType;
 
@@ -18,21 +18,23 @@ public class ListModule extends BaseModule
 	@Override
 	protected void loadFlags() {
 		if(isModuleEnabled()) addKeyFlag("LIST_MODULE");
-		if(isModuleEnabled("Lists")) addKeyFlag("LISTS_FEATURE");
-		if(isModuleEnabled("ArrayList")) addKeyFlag("ARRAY_LIST_FEATURE");
-		if(isModuleEnabled("LinkedList")) addKeyFlag("LINKED_LIST_FEATURE");
-		if(isModuleEnabled("ImmutableList")) addKeyFlag("IMMUTABLE_LIST_FEATURE");
-		if(isModuleEnabled("CopyOnWriteList")) addKeyFlag("COPY_ON_WRITE_LIST_FEATURE");
+		if(isModuleEnabled("Wrappers")) addKeyFlag("LISTS_FEATURE");
+		boolean implementations = isModuleEnabled("Implementations");
+		if(implementations && isModuleEnabled("ArrayList")) addKeyFlag("ARRAY_LIST_FEATURE");
+		if(implementations && isModuleEnabled("LinkedList")) addKeyFlag("LINKED_LIST_FEATURE");
+		if(implementations && isModuleEnabled("ImmutableList")) addKeyFlag("IMMUTABLE_LIST_FEATURE");
+		if(implementations && isModuleEnabled("CopyOnWriteList")) addKeyFlag("COPY_ON_WRITE_LIST_FEATURE");
 	}
 	
 	@Override
 	protected void loadBlockades()
 	{
-		if(!isModuleEnabled("Lists")) addBlockedFiles("Lists");
-		if(!isModuleEnabled("ArrayList")) addBlockedFiles("ArrayList");
-		if(!isModuleEnabled("LinkedList")) addBlockedFiles("LinkedList");
-		if(!isModuleEnabled("ImmutableList")) addBlockedFiles("ImmutableList");
-		if(!isModuleEnabled("CopyOnWriteList")) addBlockedFiles("CopyOnWriteList");
+		if(!isModuleEnabled("Wrappers")) addBlockedFiles("Lists");
+		boolean implementations = !isModuleEnabled("Implementations");
+		if(implementations || !isModuleEnabled("ArrayList")) addBlockedFiles("ArrayList");
+		if(implementations || !isModuleEnabled("LinkedList")) addBlockedFiles("LinkedList");
+		if(implementations || !isModuleEnabled("ImmutableList")) addBlockedFiles("ImmutableList");
+		if(implementations || !isModuleEnabled("CopyOnWriteList")) addBlockedFiles("CopyOnWriteList");
 		if(!isModuleEnabled()) addBlockedFiles("List", "AbstractList");
 		
 		if(keyType.isObject()) addBlockedFiles("ListFillBufferTester");
@@ -41,7 +43,7 @@ public class ListModule extends BaseModule
 	
 	@Override
 	public Set<String> getModuleKeys(ClassType keyType, ClassType valueType) {
-		return new HashSet<>(Arrays.asList("Lists", "ArrayList", "LinkedList", "ImmutableList", "CopyOnWriteList"));
+		return new TreeSet<>(Arrays.asList("Implementations", "Wrappers", "ArrayList", "LinkedList", "ImmutableList", "CopyOnWriteList"));
 	}
 	
 	@Override
diff --git a/src/builder/java/speiger/src/builder/modules/MapModule.java b/src/builder/java/speiger/src/builder/modules/MapModule.java
index bccb8189..f325adc2 100644
--- a/src/builder/java/speiger/src/builder/modules/MapModule.java
+++ b/src/builder/java/speiger/src/builder/modules/MapModule.java
@@ -1,8 +1,8 @@
 package speiger.src.builder.modules;
 
 import java.util.Arrays;
-import java.util.HashSet;
 import java.util.Set;
+import java.util.TreeSet;
 
 import speiger.src.builder.ClassType;
 
@@ -23,10 +23,9 @@ public class MapModule extends BaseModule
 	public boolean areDependenciesLoaded() { return isDependencyLoaded(SetModule.INSTANCE) && isDependencyLoaded(CollectionModule.INSTANCE, false); }
 	
 	@Override
-	public Set<String> getModuleKeys(ClassType keyType, ClassType valueType)
-	{
-		Set<String> sets = new HashSet<>();
-		sets.add("Maps");
+	public Set<String> getModuleKeys(ClassType keyType, ClassType valueType) {
+		Set<String> sets = new TreeSet<>();
+		sets.addAll(Arrays.asList("Wrappers", "Implementations"));
 		sets.addAll(Arrays.asList("OrderedMap", "SortedMap"));
 		sets.addAll(Arrays.asList("ArrayMap", "ConcurrentMap", "ImmutableMap"));
 		sets.addAll(Arrays.asList("HashMap", "LinkedHashMap"));
@@ -40,10 +39,11 @@ public class MapModule extends BaseModule
 	protected void loadFlags()
 	{
 		if(isModuleEnabled()) addFlag("MAP_MODULE");
-		if(isModuleEnabled("Maps")) addFlag("Maps");
-		boolean hashMap = isModuleEnabled("HashMap");
-		boolean customHashMap = isModuleEnabled("CustomHashMap");
-		boolean enumMap = isModuleEnabled("EnumMap");
+		if(isModuleEnabled("Wrappers")) addFlag("MAPS_FEATURE");
+		boolean implementations = isModuleEnabled("Implementations");
+		boolean hashMap = implementations && isModuleEnabled("HashMap");
+		boolean customHashMap = implementations && isModuleEnabled("CustomHashMap");
+		boolean enumMap = implementations && isModuleEnabled("EnumMap");
 		
 		if(isModuleEnabled("OrderedMap")) {
 			addFlag("ORDERED_MAP_FEATURE");
@@ -54,11 +54,11 @@ public class MapModule extends BaseModule
 		}
 		if(isModuleEnabled("SortedMap")) {
 			addFlag("SORTED_MAP_FEATURE");
-			if(isModuleEnabled("AVLTreeMap")) addFlag("AVL_TREE_MAP_FEATURE");
-			if(isModuleEnabled("RBTreeMap")) addFlag("RB_TREE_MAP_FEATURE");
+			if(implementations && isModuleEnabled("AVLTreeMap")) addFlag("AVL_TREE_MAP_FEATURE");
+			if(implementations && isModuleEnabled("RBTreeMap")) addFlag("RB_TREE_MAP_FEATURE");
 		}
-		if(isModuleEnabled("ConcurrentMap")) addFlag("CONCURRENT_MAP_FEATURE");
-		if(isModuleEnabled("ImmutableMap")) addFlag("IMMUTABLE_MAP_FEATURE");
+		if(implementations && isModuleEnabled("ConcurrentMap")) addFlag("CONCURRENT_MAP_FEATURE");
+		if(implementations && isModuleEnabled("ImmutableMap")) addFlag("IMMUTABLE_MAP_FEATURE");
 		if(hashMap) addFlag("HASH_MAP_FEATURE");
 		if(customHashMap) addFlag("CUSTOM_HASH_MAP_FEATURE");
 		if(enumMap) addFlag("ENUM_MAP_FEATURE");
@@ -68,21 +68,22 @@ public class MapModule extends BaseModule
 	protected void loadBlockades()
 	{
 		if(!isModuleEnabled()) addBlockedFiles("Map", "AbstractMap");
-		if(!isModuleEnabled("Maps")) addBlockedFiles("Maps");
-		if(!isModuleEnabled("ImmutableMap")) addBlockedFiles("ImmutableOpenHashMap");
-		if(!isModuleEnabled("ConcurrentMap")) addBlockedFiles("ConcurrentMap", "ConcurrentOpenHashMap");
+		if(!isModuleEnabled("Wrappers")) addBlockedFiles("Maps");
+		boolean implementations = !isModuleEnabled("Implementations");
+		if(implementations || !isModuleEnabled("ImmutableMap")) addBlockedFiles("ImmutableOpenHashMap");
+		if(implementations || !isModuleEnabled("ConcurrentMap")) addBlockedFiles("ConcurrentMap", "ConcurrentOpenHashMap");
 		
 		boolean ordered = !isModuleEnabled("OrderedMap");
 		if(ordered) addBlockedFiles("OrderedMap");
-		boolean hashMap = !isModuleEnabled("HashMap");
+		boolean hashMap = implementations || !isModuleEnabled("HashMap");
 		if(hashMap) addBlockedFiles("OpenHashMap");
 		if(hashMap || ordered || !isModuleEnabled("LinkedHashMap")) addBlockedFiles("LinkedOpenHashMap");
 		
-		boolean customHashMap = !isModuleEnabled("CustomHashMap");
+		boolean customHashMap = implementations || !isModuleEnabled("CustomHashMap");
 		if(customHashMap) addBlockedFiles("OpenCustomHashMap");
 		if(customHashMap || ordered || !isModuleEnabled("LinkedCustomHashMap")) addBlockedFiles("LinkedOpenCustomHashMap");
 		
-		boolean enumMap = !isModuleEnabled("EnumMap");
+		boolean enumMap = implementations || !isModuleEnabled("EnumMap");
 		if(enumMap) addBlockedFiles("EnumMap");
 		if(enumMap || ordered || !isModuleEnabled("LinkedEnumMap")) addBlockedFiles("LinkedEnumMap");
 		
@@ -90,8 +91,8 @@ public class MapModule extends BaseModule
 		
 		boolean sorted = !isModuleEnabled("SortedMap");
 		if(sorted) addBlockedFiles("SortedMap", "NavigableMap");
-		if(sorted || !isModuleEnabled("AVLTreeMap")) addBlockedFiles("AVLTreeMap");
-		if(sorted || !isModuleEnabled("RBTreeMap")) addBlockedFiles("RBTreeMap");
+		if(implementations || sorted || !isModuleEnabled("AVLTreeMap")) addBlockedFiles("AVLTreeMap");
+		if(implementations || sorted || !isModuleEnabled("RBTreeMap")) addBlockedFiles("RBTreeMap");
 		
 		if(keyType == ClassType.BOOLEAN)
 		{
diff --git a/src/builder/java/speiger/src/builder/modules/SetModule.java b/src/builder/java/speiger/src/builder/modules/SetModule.java
index ba846900..6e06b98b 100644
--- a/src/builder/java/speiger/src/builder/modules/SetModule.java
+++ b/src/builder/java/speiger/src/builder/modules/SetModule.java
@@ -1,8 +1,8 @@
 package speiger.src.builder.modules;
 
 import java.util.Arrays;
-import java.util.HashSet;
 import java.util.Set;
+import java.util.TreeSet;
 
 import speiger.src.builder.ClassType;
 
@@ -22,8 +22,8 @@ public class SetModule extends BaseModule
 	public boolean areDependenciesLoaded() { return isDependencyLoaded(CollectionModule.INSTANCE); }
 	@Override
 	public Set<String> getModuleKeys(ClassType keyType, ClassType valueType) {
-		Set<String> sets = new HashSet<>();
-		sets.add("Sets");
+		Set<String> sets = new TreeSet<>();
+		sets.addAll(Arrays.asList("Wrappers", "Implementations"));
 		sets.addAll(Arrays.asList("OrderedSet", "SortedSet"));
 		sets.addAll(Arrays.asList("ArraySet", "ImmutableSet"));
 		sets.addAll(Arrays.asList("HashSet", "LinkedHashSet"));
@@ -36,22 +36,23 @@ public class SetModule extends BaseModule
 	protected void loadFlags()
 	{
 		if(isModuleEnabled()) addFlag("SET_MODULE");
-		if(isModuleEnabled("Sets")) addFlag("Sets");
-		boolean hashSet = isModuleEnabled("HashSet");
-		boolean customHashSet = isModuleEnabled("CustomHashSet");
+		if(isModuleEnabled("Wrappers")) addFlag("SETS_FEATURE");
+		boolean implementations = isModuleEnabled("Implementations");
+		boolean hashSet = implementations && isModuleEnabled("HashSet");
+		boolean customHashSet = implementations && isModuleEnabled("CustomHashSet");
 		
 		if(isModuleEnabled("OrderedSet")) {
 			addFlag("ORDERED_SET_FEATURE");
-			if(isModuleEnabled("ArraySet")) addFlag("ARRAY_SET_FEATURE");
+			if(implementations && isModuleEnabled("ArraySet")) addFlag("ARRAY_SET_FEATURE");
 			if(hashSet && isModuleEnabled("LinkedHashSet")) addFlag("LINKED_SET_FEATURE");
 			if(customHashSet && isModuleEnabled("LinkedCustomHashSet")) addFlag("LINKED_CUSTOM_SET_FEATURE");
 		}
 		if(isModuleEnabled("SortedSet")) {
 			addFlag("SORTED_SET_FEATURE");
-			if(isModuleEnabled("AVLTreeSet")) addFlag("AVL_TREE_SET_FEATURE");
-			if(isModuleEnabled("RBTreeSet")) addFlag("RB_TREE_SET_FEATURE");
+			if(implementations && isModuleEnabled("AVLTreeSet")) addFlag("AVL_TREE_SET_FEATURE");
+			if(implementations && isModuleEnabled("RBTreeSet")) addFlag("RB_TREE_SET_FEATURE");
 		}
-		if(isModuleEnabled("ImmutableSet")) addFlag("IMMUTABLE_SET_FEATURE");
+		if(implementations && isModuleEnabled("ImmutableSet")) addFlag("IMMUTABLE_SET_FEATURE");
 		if(hashSet) addFlag("HASH_SET_FEATURE");
 		if(customHashSet) addFlag("CUSTOM_HASH_SET_FEATURE");
 	}
@@ -60,25 +61,26 @@ public class SetModule extends BaseModule
 	protected void loadBlockades()
 	{
 		if(!isModuleEnabled()) addBlockedFiles("Set", "AbstractSet");
-		if(!isModuleEnabled("Sets")) addBlockedFiles("Sets");
-		if(!isModuleEnabled("ImmutableSet")) addBlockedFiles("ImmutableOpenHashSet");
+		if(!isModuleEnabled("Wrappers")) addBlockedFiles("Sets");
+		boolean implementations = !isModuleEnabled("Implementations");
+		if(implementations || !isModuleEnabled("ImmutableSet")) addBlockedFiles("ImmutableOpenHashSet");
 		
 		boolean ordered = !isModuleEnabled("OrderedSet");
 		if(ordered) addBlockedFiles("OrderedSet");
-		boolean hashSet = !isModuleEnabled("HashSet");
+		boolean hashSet = implementations || !isModuleEnabled("HashSet");
 		if(hashSet) addBlockedFiles("OpenHashSet");
 		if(hashSet || ordered || !isModuleEnabled("LinkedHashSet")) addBlockedFiles("LinkedOpenHashSet");
 		
-		boolean customHashSet = !isModuleEnabled("CustomHashSet");
+		boolean customHashSet = implementations || !isModuleEnabled("CustomHashSet");
 		if(customHashSet) addBlockedFiles("OpenCustomHashSet");
 		if(customHashSet || ordered || !isModuleEnabled("LinkedCustomHashSet")) addBlockedFiles("LinkedOpenCustomHashSet");
 		
-		if(ordered || !isModuleEnabled("ArraySet")) addBlockedFiles("ArraySet");
+		if(implementations || ordered || !isModuleEnabled("ArraySet")) addBlockedFiles("ArraySet");
 		
 		boolean sorted = !isModuleEnabled("SortedSet");
 		if(sorted) addBlockedFiles("SortedSet", "NavigableSet");
-		if(sorted || !isModuleEnabled("AVLTreeSet")) addBlockedFiles("AVLTreeSet");
-		if(sorted || !isModuleEnabled("RBTreeSet")) addBlockedFiles("RBTreeSet");
+		if(implementations || sorted || !isModuleEnabled("AVLTreeSet")) addBlockedFiles("AVLTreeSet");
+		if(implementations || sorted || !isModuleEnabled("RBTreeSet")) addBlockedFiles("RBTreeSet");
 		
 		if(keyType == ClassType.BOOLEAN)
 		{
diff --git a/src/builder/resources/speiger/assets/collections/templates/utils/AsyncBuilder.template b/src/builder/resources/speiger/assets/collections/templates/utils/AsyncBuilder.template
index 12c6fedc..80360178 100644
--- a/src/builder/resources/speiger/assets/collections/templates/utils/AsyncBuilder.template
+++ b/src/builder/resources/speiger/assets/collections/templates/utils/AsyncBuilder.template
@@ -27,14 +27,14 @@ import speiger.src.collections.PACKAGE.functions.function.PREDICATE;
 import speiger.src.collections.PACKAGE.functions.function.TO_OBJECT_FUNCTION;
 #endif
 import speiger.src.collections.PACKAGE.functions.function.UNARY_OPERATOR;
-#if OBJECT_ASYNC_MODULE
+#if ARRAY_LIST_FEATURE || LINKED_LIST_FEATURE 
 import speiger.src.collections.PACKAGE.lists.LIST;
-#endif
 #if ARRAY_LIST_FEATURE
 import speiger.src.collections.PACKAGE.lists.ARRAY_LIST;
 #else if LINKED_LIST_FEATURE
 import speiger.src.collections.PACKAGE.lists.LINKED_LIST;
 #endif
+#endif
 #if !TYPE_BOOLEAN && OBJECT_ASYNC_MODULE
 #if SET_MODULE
 import speiger.src.collections.PACKAGE.sets.SET;
diff --git a/src/builder/resources/speiger/assets/collections/templates/utils/Iterators.template b/src/builder/resources/speiger/assets/collections/templates/utils/Iterators.template
index 4c33ae7f..ea354fed 100644
--- a/src/builder/resources/speiger/assets/collections/templates/utils/Iterators.template
+++ b/src/builder/resources/speiger/assets/collections/templates/utils/Iterators.template
@@ -16,14 +16,14 @@ import speiger.src.collections.PACKAGE.functions.COMPARATOR;
 #endif
 import speiger.src.collections.PACKAGE.functions.function.TO_OBJECT_FUNCTION;
 import speiger.src.collections.PACKAGE.functions.function.PREDICATE;
-#if LIST_MODULE
+#if ARRAY_LIST_FEATURE || LINKED_LIST_FEATURE
+import speiger.src.collections.PACKAGE.lists.LIST;
 #if ARRAY_LIST_FEATURE
 import speiger.src.collections.PACKAGE.lists.ARRAY_LIST;
 #else if LINKED_LIST_FEATURE
 import speiger.src.collections.PACKAGE.lists.LINKED_LIST;
 #endif
 
-import speiger.src.collections.PACKAGE.lists.LIST;
 #endif
 import speiger.src.collections.PACKAGE.lists.LIST_ITERATOR;
 import speiger.src.collections.PACKAGE.collections.BI_ITERATOR;