diff --git a/src/main/java/com/cedarsoftware/util/CompactLinkedMap.java b/src/main/java/com/cedarsoftware/util/CompactLinkedMap.java
index 7e6ed6e3..343eb864 100644
--- a/src/main/java/com/cedarsoftware/util/CompactLinkedMap.java
+++ b/src/main/java/com/cedarsoftware/util/CompactLinkedMap.java
@@ -11,14 +11,13 @@
  * <p>
  * Example replacement:<br>
  * Instead of: {@code Map<String, String> map = new CompactLinkedMap<>();}<br>
- * Use: {@code Map<String, String> map = CompactMap.newMap(80, true, 16, CompactMap.INSERTION);}
+ * Use: {@code Map<String, String> map = CompactMap.<String, Object>builder().insertionOrder().build();}
  * </p>
  * <p>
  * This creates a CompactMap with:
  * <ul>
- *   <li>compactSize = 80 (same as CompactLinkedMap)</li>
+ *   <li>compactSize = 70</li>
  *   <li>caseSensitive = true (default behavior)</li>
- *   <li>capacity = 16 (default initial capacity)</li>
  *   <li>ordering = INSERTION (maintains insertion order)</li>
  * </ul>
  * </p>
diff --git a/src/main/java/com/cedarsoftware/util/convert/CalendarConversions.java b/src/main/java/com/cedarsoftware/util/convert/CalendarConversions.java
index 6c5fe612..bfbbc8af 100644
--- a/src/main/java/com/cedarsoftware/util/convert/CalendarConversions.java
+++ b/src/main/java/com/cedarsoftware/util/convert/CalendarConversions.java
@@ -15,7 +15,7 @@
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicLong;
 
-import com.cedarsoftware.util.CompactLinkedMap;
+import com.cedarsoftware.util.CompactMap;
 
 /**
  * @author Kenny Partlow (kpartlow@gmail.com)
@@ -122,7 +122,7 @@ static OffsetDateTime toOffsetDateTime(Object from, Converter converter) {
 
     static Map<String, Object> toMap(Object from, Converter converter) {
         Calendar cal = (Calendar) from;
-        Map<String, Object> target = new CompactLinkedMap<>();
+        Map<String, Object> target = CompactMap.<String, Object>builder().insertionOrder().build();
         target.put(MapConversions.DATE, LocalDate.of(cal.get(Calendar.YEAR), cal.get(Calendar.MONTH) + 1, cal.get(Calendar.DAY_OF_MONTH)).toString());
         target.put(MapConversions.TIME, LocalTime.of(cal.get(Calendar.HOUR_OF_DAY), cal.get(Calendar.MINUTE), cal.get(Calendar.SECOND), cal.get(Calendar.MILLISECOND) * 1_000_000).toString());
         target.put(MapConversions.ZONE, cal.getTimeZone().toZoneId().toString());
diff --git a/src/main/java/com/cedarsoftware/util/convert/DateConversions.java b/src/main/java/com/cedarsoftware/util/convert/DateConversions.java
index 62e0fdab..18321559 100644
--- a/src/main/java/com/cedarsoftware/util/convert/DateConversions.java
+++ b/src/main/java/com/cedarsoftware/util/convert/DateConversions.java
@@ -17,7 +17,7 @@
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicLong;
 
-import com.cedarsoftware.util.CompactLinkedMap;
+import com.cedarsoftware.util.CompactMap;
 
 /**
  * @author Kenny Partlow (kpartlow@gmail.com)
@@ -149,7 +149,7 @@ static String toString(Object from, Converter converter) {
 
     static Map<String, Object> toMap(Object from, Converter converter) {
         Date date = (Date) from;
-        Map<String, Object> map = new CompactLinkedMap<>();
+        Map<String, Object> map = CompactMap.<String, Object>builder().insertionOrder().build();
         ZonedDateTime zdt = toZonedDateTime(date, converter);
         map.put(MapConversions.DATE, zdt.toLocalDate().toString());
         map.put(MapConversions.TIME, zdt.toLocalTime().toString());
diff --git a/src/main/java/com/cedarsoftware/util/convert/DurationConversions.java b/src/main/java/com/cedarsoftware/util/convert/DurationConversions.java
index b4b438d6..2054581e 100644
--- a/src/main/java/com/cedarsoftware/util/convert/DurationConversions.java
+++ b/src/main/java/com/cedarsoftware/util/convert/DurationConversions.java
@@ -8,7 +8,7 @@
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicLong;
 
-import com.cedarsoftware.util.CompactLinkedMap;
+import com.cedarsoftware.util.CompactMap;
 
 /**
  * @author John DeRegnaucourt (jdereg@gmail.com)
@@ -34,7 +34,7 @@ private DurationConversions() {}
     static Map toMap(Object from, Converter converter) {
         long sec = ((Duration) from).getSeconds();
         int nanos = ((Duration) from).getNano();
-        Map<String, Object> target = new CompactLinkedMap<>();
+        Map<String, Object> target = CompactMap.<String, Object>builder().insertionOrder().build();
         target.put("seconds", sec);
         target.put("nanos", nanos);
         return target;
diff --git a/src/main/java/com/cedarsoftware/util/convert/EnumConversions.java b/src/main/java/com/cedarsoftware/util/convert/EnumConversions.java
index 4bbac1ee..3c497044 100644
--- a/src/main/java/com/cedarsoftware/util/convert/EnumConversions.java
+++ b/src/main/java/com/cedarsoftware/util/convert/EnumConversions.java
@@ -5,7 +5,7 @@
 import java.util.EnumSet;
 import java.util.Map;
 
-import com.cedarsoftware.util.CompactLinkedMap;
+import com.cedarsoftware.util.CompactMap;
 
 /**
  * @author John DeRegnaucourt (jdereg@gmail.com)
@@ -30,7 +30,7 @@ private EnumConversions() {}
 
     static Map<String, Object> toMap(Object from, Converter converter) {
         Enum<?> enumInstance = (Enum<?>) from;
-        Map<String, Object> target = new CompactLinkedMap<>();
+        Map<String, Object> target = CompactMap.<String, Object>builder().insertionOrder().build();
         target.put("name", enumInstance.name());
         return target;
     }
diff --git a/src/main/java/com/cedarsoftware/util/convert/InstantConversions.java b/src/main/java/com/cedarsoftware/util/convert/InstantConversions.java
index 6d606948..7319c0ae 100644
--- a/src/main/java/com/cedarsoftware/util/convert/InstantConversions.java
+++ b/src/main/java/com/cedarsoftware/util/convert/InstantConversions.java
@@ -16,7 +16,7 @@
 import java.util.TimeZone;
 import java.util.concurrent.atomic.AtomicLong;
 
-import com.cedarsoftware.util.CompactLinkedMap;
+import com.cedarsoftware.util.CompactMap;
 
 /**
  * @author Kenny Partlow (kpartlow@gmail.com)
@@ -42,7 +42,7 @@ private InstantConversions() {}
     static Map toMap(Object from, Converter converter) {
         long sec = ((Instant) from).getEpochSecond();
         int nanos = ((Instant) from).getNano();
-        Map<String, Object> target = new CompactLinkedMap<>();
+        Map<String, Object> target = CompactMap.<String, Object>builder().insertionOrder().build();
         target.put("seconds", sec);
         target.put("nanos", nanos);
         return target;
diff --git a/src/main/java/com/cedarsoftware/util/convert/LocalDateConversions.java b/src/main/java/com/cedarsoftware/util/convert/LocalDateConversions.java
index 128a504a..90165b6c 100644
--- a/src/main/java/com/cedarsoftware/util/convert/LocalDateConversions.java
+++ b/src/main/java/com/cedarsoftware/util/convert/LocalDateConversions.java
@@ -17,7 +17,7 @@
 import java.util.TimeZone;
 import java.util.concurrent.atomic.AtomicLong;
 
-import com.cedarsoftware.util.CompactLinkedMap;
+import com.cedarsoftware.util.CompactMap;
 
 /**
  * @author Kenny Partlow (kpartlow@gmail.com)
@@ -109,7 +109,7 @@ static String toString(Object from, Converter converter) {
 
     static Map<String, Object> toMap(Object from, Converter converter) {
         LocalDate localDate = (LocalDate) from;
-        Map<String, Object> target = new CompactLinkedMap<>();
+        Map<String, Object> target = CompactMap.<String, Object>builder().insertionOrder().build();
         target.put(MapConversions.DATE, localDate.toString());
         return target;
     }
diff --git a/src/main/java/com/cedarsoftware/util/convert/LocalDateTimeConversions.java b/src/main/java/com/cedarsoftware/util/convert/LocalDateTimeConversions.java
index 18ddd03e..c4c11296 100644
--- a/src/main/java/com/cedarsoftware/util/convert/LocalDateTimeConversions.java
+++ b/src/main/java/com/cedarsoftware/util/convert/LocalDateTimeConversions.java
@@ -16,7 +16,7 @@
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicLong;
 
-import com.cedarsoftware.util.CompactLinkedMap;
+import com.cedarsoftware.util.CompactMap;
 
 /**
  * @author Kenny Partlow (kpartlow@gmail.com)
@@ -116,7 +116,7 @@ static String toString(Object from, Converter converter) {
 
     static Map<?, ?> toMap(Object from, Converter converter) {
         LocalDateTime localDateTime = (LocalDateTime) from;
-        Map<String, Object> target = new CompactLinkedMap<>();
+        Map<String, Object> target = CompactMap.<String, Object>builder().insertionOrder().build();
         target.put(MapConversions.DATE, localDateTime.toLocalDate().toString());
         target.put(MapConversions.TIME, localDateTime.toLocalTime().toString());
         return target;
diff --git a/src/main/java/com/cedarsoftware/util/convert/LocalTimeConversions.java b/src/main/java/com/cedarsoftware/util/convert/LocalTimeConversions.java
index f4c2c734..4befce2f 100644
--- a/src/main/java/com/cedarsoftware/util/convert/LocalTimeConversions.java
+++ b/src/main/java/com/cedarsoftware/util/convert/LocalTimeConversions.java
@@ -10,7 +10,7 @@
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicLong;
 
-import com.cedarsoftware.util.CompactLinkedMap;
+import com.cedarsoftware.util.CompactMap;
 
 /**
  * @author John DeRegnaucourt (jdereg@gmail.com)
@@ -36,7 +36,7 @@ private LocalTimeConversions() {}
 
     static Map<String, Object> toMap(Object from, Converter converter) {
         LocalTime localTime = (LocalTime) from;
-        Map<String, Object> target = new CompactLinkedMap<>();
+        Map<String, Object> target = CompactMap.<String, Object>builder().insertionOrder().build();
         target.put(MapConversions.TIME, localTime.toString());
         return target;
     }
diff --git a/src/main/java/com/cedarsoftware/util/convert/LocaleConversions.java b/src/main/java/com/cedarsoftware/util/convert/LocaleConversions.java
index e9d16f30..69340287 100644
--- a/src/main/java/com/cedarsoftware/util/convert/LocaleConversions.java
+++ b/src/main/java/com/cedarsoftware/util/convert/LocaleConversions.java
@@ -3,7 +3,7 @@
 import java.util.Locale;
 import java.util.Map;
 
-import com.cedarsoftware.util.CompactLinkedMap;
+import com.cedarsoftware.util.CompactMap;
 import com.cedarsoftware.util.StringUtilities;
 
 import static com.cedarsoftware.util.convert.MapConversions.COUNTRY;
@@ -20,7 +20,7 @@ static String toString(Object from, Converter converter) {
 
     static Map<?, ?> toMap(Object from, Converter converter) {
         Locale locale = (Locale) from;
-        Map<String, Object> map = new CompactLinkedMap<>();
+        Map<String, Object> map = CompactMap.<String, Object>builder().insertionOrder().build();
 
         String language = locale.getLanguage();
         map.put(LANGUAGE, language);
diff --git a/src/main/java/com/cedarsoftware/util/convert/MapConversions.java b/src/main/java/com/cedarsoftware/util/convert/MapConversions.java
index f7d32df2..663ef19b 100644
--- a/src/main/java/com/cedarsoftware/util/convert/MapConversions.java
+++ b/src/main/java/com/cedarsoftware/util/convert/MapConversions.java
@@ -37,7 +37,7 @@
 
 import com.cedarsoftware.util.ClassUtilities;
 import com.cedarsoftware.util.CollectionUtilities;
-import com.cedarsoftware.util.CompactLinkedMap;
+import com.cedarsoftware.util.CompactMap;
 import com.cedarsoftware.util.DateUtilities;
 import com.cedarsoftware.util.ReflectionUtils;
 import com.cedarsoftware.util.StringUtilities;
@@ -702,7 +702,7 @@ static URI toURI(Object from, Converter converter) {
     }
 
     static Map<String, ?> initMap(Object from, Converter converter) {
-        Map<String, Object> map = new CompactLinkedMap<>();
+        Map<String, Object> map = CompactMap.<String, Object>builder().insertionOrder().build();
         map.put(V, from);
         return map;
     }
diff --git a/src/main/java/com/cedarsoftware/util/convert/MonthDayConversions.java b/src/main/java/com/cedarsoftware/util/convert/MonthDayConversions.java
index 9639a56a..212374ff 100644
--- a/src/main/java/com/cedarsoftware/util/convert/MonthDayConversions.java
+++ b/src/main/java/com/cedarsoftware/util/convert/MonthDayConversions.java
@@ -3,7 +3,7 @@
 import java.time.MonthDay;
 import java.util.Map;
 
-import com.cedarsoftware.util.CompactLinkedMap;
+import com.cedarsoftware.util.CompactMap;
 
 /**
  * @author John DeRegnaucourt (jdereg@gmail.com)
@@ -28,7 +28,7 @@ private MonthDayConversions() {}
 
     static Map toMap(Object from, Converter converter) {
         MonthDay monthDay = (MonthDay) from;
-        Map<String, Object> target = new CompactLinkedMap<>();
+        Map<String, Object> target = CompactMap.<String, Object>builder().insertionOrder().build();
         target.put("day", monthDay.getDayOfMonth());
         target.put("month", monthDay.getMonthValue());
         return target;
diff --git a/src/main/java/com/cedarsoftware/util/convert/OffsetDateTimeConversions.java b/src/main/java/com/cedarsoftware/util/convert/OffsetDateTimeConversions.java
index bb301c3e..152d67a7 100644
--- a/src/main/java/com/cedarsoftware/util/convert/OffsetDateTimeConversions.java
+++ b/src/main/java/com/cedarsoftware/util/convert/OffsetDateTimeConversions.java
@@ -16,7 +16,7 @@
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicLong;
 
-import com.cedarsoftware.util.CompactLinkedMap;
+import com.cedarsoftware.util.CompactMap;
 
 /**
  * @author Kenny Partlow (kpartlow@gmail.com)
@@ -110,7 +110,7 @@ static String toString(Object from, Converter converter) {
 
     static Map<String, Object> toMap(Object from, Converter converter) {
         ZonedDateTime zdt = toZonedDateTime(from, converter);
-        Map<String, Object> target = new CompactLinkedMap<>();
+        Map<String, Object> target = CompactMap.<String, Object>builder().insertionOrder().build();
         target.put(MapConversions.DATE, zdt.toLocalDate().toString());
         target.put(MapConversions.TIME, zdt.toLocalTime().toString());
         target.put(MapConversions.OFFSET, zdt.getOffset().toString());
diff --git a/src/main/java/com/cedarsoftware/util/convert/OffsetTimeConversions.java b/src/main/java/com/cedarsoftware/util/convert/OffsetTimeConversions.java
index dd090376..6e363eac 100644
--- a/src/main/java/com/cedarsoftware/util/convert/OffsetTimeConversions.java
+++ b/src/main/java/com/cedarsoftware/util/convert/OffsetTimeConversions.java
@@ -4,7 +4,7 @@
 import java.time.format.DateTimeFormatter;
 import java.util.Map;
 
-import com.cedarsoftware.util.CompactLinkedMap;
+import com.cedarsoftware.util.CompactMap;
 
 /**
  * @author John DeRegnaucourt (jdereg@gmail.com)
@@ -33,7 +33,7 @@ static String toString(Object from, Converter converter) {
 
     static Map<String, Object> toMap(Object from, Converter converter) {
         OffsetTime offsetTime = (OffsetTime) from;
-        Map<String, Object> map = new CompactLinkedMap<>();
+        Map<String, Object> map = CompactMap.<String, Object>builder().insertionOrder().build();
         map.put(MapConversions.TIME, offsetTime.toString());
         return map;
     }
diff --git a/src/main/java/com/cedarsoftware/util/convert/PeriodConversions.java b/src/main/java/com/cedarsoftware/util/convert/PeriodConversions.java
index f85b0e5e..7d469d69 100644
--- a/src/main/java/com/cedarsoftware/util/convert/PeriodConversions.java
+++ b/src/main/java/com/cedarsoftware/util/convert/PeriodConversions.java
@@ -3,7 +3,7 @@
 import java.time.Period;
 import java.util.Map;
 
-import com.cedarsoftware.util.CompactLinkedMap;
+import com.cedarsoftware.util.CompactMap;
 
 /**
  * @author John DeRegnaucourt (jdereg@gmail.com)
@@ -28,7 +28,7 @@ private PeriodConversions() {}
 
     static Map<String, Object> toMap(Object from, Converter converter) {
         Period period = (Period) from;
-        Map<String, Object> target = new CompactLinkedMap<>();
+        Map<String, Object> target = CompactMap.<String, Object>builder().insertionOrder().build();
         target.put(MapConversions.YEARS, period.getYears());
         target.put(MapConversions.MONTHS, period.getMonths());
         target.put(MapConversions.DAYS, period.getDays());
diff --git a/src/main/java/com/cedarsoftware/util/convert/ThrowableConversions.java b/src/main/java/com/cedarsoftware/util/convert/ThrowableConversions.java
index fee28059..5d3272f9 100644
--- a/src/main/java/com/cedarsoftware/util/convert/ThrowableConversions.java
+++ b/src/main/java/com/cedarsoftware/util/convert/ThrowableConversions.java
@@ -2,7 +2,7 @@
 
 import java.util.Map;
 
-import com.cedarsoftware.util.CompactLinkedMap;
+import com.cedarsoftware.util.CompactMap;
 
 import static com.cedarsoftware.util.convert.MapConversions.CAUSE;
 import static com.cedarsoftware.util.convert.MapConversions.CAUSE_MESSAGE;
@@ -32,7 +32,7 @@ private ThrowableConversions() {}
 
     static Map<String, Object> toMap(Object from, Converter converter) {
         Throwable throwable = (Throwable) from;
-        Map<String, Object> target = new CompactLinkedMap<>();
+        Map<String, Object> target = CompactMap.<String, Object>builder().insertionOrder().build();
         target.put(CLASS, throwable.getClass().getName());
         target.put(MESSAGE, throwable.getMessage());
         if (throwable.getCause() != null) {
diff --git a/src/main/java/com/cedarsoftware/util/convert/TimeZoneConversions.java b/src/main/java/com/cedarsoftware/util/convert/TimeZoneConversions.java
index 9a2305f8..6d64928c 100644
--- a/src/main/java/com/cedarsoftware/util/convert/TimeZoneConversions.java
+++ b/src/main/java/com/cedarsoftware/util/convert/TimeZoneConversions.java
@@ -4,7 +4,7 @@
 import java.util.Map;
 import java.util.TimeZone;
 
-import com.cedarsoftware.util.CompactLinkedMap;
+import com.cedarsoftware.util.CompactMap;
 
 import static com.cedarsoftware.util.convert.MapConversions.ZONE;
 
@@ -39,7 +39,7 @@ static ZoneId toZoneId(Object from, Converter converter) {
     
     static Map<String, Object> toMap(Object from, Converter converter) {
         TimeZone tz = (TimeZone) from;
-        Map<String, Object> target = new CompactLinkedMap<>();
+        Map<String, Object> target = CompactMap.<String, Object>builder().insertionOrder().build();
         target.put(ZONE, tz.getID());
         return target;
     }
diff --git a/src/main/java/com/cedarsoftware/util/convert/TimestampConversions.java b/src/main/java/com/cedarsoftware/util/convert/TimestampConversions.java
index 59a4f4a8..f341154c 100644
--- a/src/main/java/com/cedarsoftware/util/convert/TimestampConversions.java
+++ b/src/main/java/com/cedarsoftware/util/convert/TimestampConversions.java
@@ -12,7 +12,7 @@
 import java.util.Date;
 import java.util.Map;
 
-import com.cedarsoftware.util.CompactLinkedMap;
+import com.cedarsoftware.util.CompactMap;
 
 /**
  * @author John DeRegnaucourt (jdereg@gmail.com)
@@ -76,7 +76,7 @@ static Calendar toCalendar(Object from, Converter converter) {
 
     static Map<String, Object> toMap(Object from, Converter converter) {
         Date date = (Date) from;
-        Map<String, Object> map = new CompactLinkedMap<>();
+        Map<String, Object> map = CompactMap.<String, Object>builder().insertionOrder().build();
         OffsetDateTime odt = toOffsetDateTime(date, converter);
         map.put(MapConversions.DATE, odt.toLocalDate().toString());
         map.put(MapConversions.TIME, odt.toLocalTime().toString());
diff --git a/src/main/java/com/cedarsoftware/util/convert/UUIDConversions.java b/src/main/java/com/cedarsoftware/util/convert/UUIDConversions.java
index c0b355d8..8d5753ba 100644
--- a/src/main/java/com/cedarsoftware/util/convert/UUIDConversions.java
+++ b/src/main/java/com/cedarsoftware/util/convert/UUIDConversions.java
@@ -5,7 +5,7 @@
 import java.util.Map;
 import java.util.UUID;
 
-import com.cedarsoftware.util.CompactLinkedMap;
+import com.cedarsoftware.util.CompactMap;
 
 /**
  * @author John DeRegnaucourt (jdereg@gmail.com)
@@ -40,7 +40,7 @@ static BigInteger toBigInteger(Object from, Converter converter) {
 
     static Map<String, Object> toMap(Object from, Converter converter) {
         UUID uuid = (UUID) from;
-        Map<String, Object> target = new CompactLinkedMap<>();
+        Map<String, Object> target = CompactMap.<String, Object>builder().insertionOrder().build();
         target.put(MapConversions.UUID, uuid.toString());
         return target;
     }
diff --git a/src/main/java/com/cedarsoftware/util/convert/UriConversions.java b/src/main/java/com/cedarsoftware/util/convert/UriConversions.java
index 2c72b3df..bda62ccd 100644
--- a/src/main/java/com/cedarsoftware/util/convert/UriConversions.java
+++ b/src/main/java/com/cedarsoftware/util/convert/UriConversions.java
@@ -4,7 +4,7 @@
 import java.net.URL;
 import java.util.Map;
 
-import com.cedarsoftware.util.CompactLinkedMap;
+import com.cedarsoftware.util.CompactMap;
 
 import static com.cedarsoftware.util.convert.MapConversions.URI_KEY;
 
@@ -31,7 +31,7 @@ private UriConversions() {}
 
     static Map toMap(Object from, Converter converter) {
         URI uri = (URI) from;
-        Map<String, Object> target = new CompactLinkedMap<>();
+        Map<String, Object> target = CompactMap.<String, Object>builder().insertionOrder().build();
         target.put(URI_KEY, uri.toString());
         return target;
     }
diff --git a/src/main/java/com/cedarsoftware/util/convert/UrlConversions.java b/src/main/java/com/cedarsoftware/util/convert/UrlConversions.java
index 7271ed02..fe89202c 100644
--- a/src/main/java/com/cedarsoftware/util/convert/UrlConversions.java
+++ b/src/main/java/com/cedarsoftware/util/convert/UrlConversions.java
@@ -4,7 +4,7 @@
 import java.net.URL;
 import java.util.Map;
 
-import com.cedarsoftware.util.CompactLinkedMap;
+import com.cedarsoftware.util.CompactMap;
 
 import static com.cedarsoftware.util.convert.MapConversions.URL_KEY;
 
@@ -31,7 +31,7 @@ private UrlConversions() {}
 
     static Map<String, Object> toMap(Object from, Converter converter) {
         URL url = (URL) from;
-        Map<String, Object> target = new CompactLinkedMap<>();
+        Map<String, Object> target = CompactMap.<String, Object>builder().insertionOrder().build();
         target.put(URL_KEY, url.toString());
         return target;
     }
diff --git a/src/main/java/com/cedarsoftware/util/convert/YearConversions.java b/src/main/java/com/cedarsoftware/util/convert/YearConversions.java
index f3cd8575..a5173326 100644
--- a/src/main/java/com/cedarsoftware/util/convert/YearConversions.java
+++ b/src/main/java/com/cedarsoftware/util/convert/YearConversions.java
@@ -8,7 +8,7 @@
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicLong;
 
-import com.cedarsoftware.util.CompactLinkedMap;
+import com.cedarsoftware.util.CompactMap;
 
 import static com.cedarsoftware.util.convert.MapConversions.YEAR;
 
@@ -78,7 +78,7 @@ static String toString(Object from, Converter converter) {
 
     static Map<?, ?> toMap(Object from, Converter converter) {
         Year year = (Year) from;
-        Map<String, Integer> map = new CompactLinkedMap<>();
+        Map<String, Integer> map = CompactMap.<String, Integer>builder().insertionOrder().build();
         map.put(YEAR, year.getValue());
         return map;
     }
diff --git a/src/main/java/com/cedarsoftware/util/convert/YearMonthConversions.java b/src/main/java/com/cedarsoftware/util/convert/YearMonthConversions.java
index 6f1a8e06..01c2092f 100644
--- a/src/main/java/com/cedarsoftware/util/convert/YearMonthConversions.java
+++ b/src/main/java/com/cedarsoftware/util/convert/YearMonthConversions.java
@@ -3,7 +3,7 @@
 import java.time.YearMonth;
 import java.util.Map;
 
-import com.cedarsoftware.util.CompactLinkedMap;
+import com.cedarsoftware.util.CompactMap;
 
 /**
  * @author John DeRegnaucourt (jdereg@gmail.com)
@@ -28,7 +28,7 @@ private YearMonthConversions() {}
 
     static Map toMap(Object from, Converter converter) {
         YearMonth yearMonth = (YearMonth) from;
-        Map<String, Object> target = new CompactLinkedMap<>();
+        Map<String, Object> target = CompactMap.<String, Object>builder().insertionOrder().build();
         target.put("year", yearMonth.getYear());
         target.put("month", yearMonth.getMonthValue());
         return target;
diff --git a/src/main/java/com/cedarsoftware/util/convert/ZoneIdConversions.java b/src/main/java/com/cedarsoftware/util/convert/ZoneIdConversions.java
index ce35c701..29d79722 100644
--- a/src/main/java/com/cedarsoftware/util/convert/ZoneIdConversions.java
+++ b/src/main/java/com/cedarsoftware/util/convert/ZoneIdConversions.java
@@ -4,7 +4,7 @@
 import java.util.Map;
 import java.util.TimeZone;
 
-import com.cedarsoftware.util.CompactLinkedMap;
+import com.cedarsoftware.util.CompactMap;
 
 /**
  * @author John DeRegnaucourt (jdereg@gmail.com)
@@ -29,7 +29,7 @@ private ZoneIdConversions() {}
 
     static Map<String, Object> toMap(Object from, Converter converter) {
         ZoneId zoneID = (ZoneId) from;
-        Map<String, Object> target = new CompactLinkedMap<>();
+        Map<String, Object> target = CompactMap.<String, Object>builder().insertionOrder().build();
         target.put("zone", zoneID.toString());
         return target;
     }
diff --git a/src/main/java/com/cedarsoftware/util/convert/ZoneOffsetConversions.java b/src/main/java/com/cedarsoftware/util/convert/ZoneOffsetConversions.java
index c9c9e12c..409dae1e 100644
--- a/src/main/java/com/cedarsoftware/util/convert/ZoneOffsetConversions.java
+++ b/src/main/java/com/cedarsoftware/util/convert/ZoneOffsetConversions.java
@@ -4,7 +4,7 @@
 import java.time.ZoneOffset;
 import java.util.Map;
 
-import com.cedarsoftware.util.CompactLinkedMap;
+import com.cedarsoftware.util.CompactMap;
 
 import static com.cedarsoftware.util.convert.MapConversions.HOURS;
 import static com.cedarsoftware.util.convert.MapConversions.MINUTES;
@@ -33,7 +33,7 @@ private ZoneOffsetConversions() {}
 
     static Map<String, Object> toMap(Object from, Converter converter) {
         ZoneOffset offset = (ZoneOffset) from;
-        Map<String, Object> target = new CompactLinkedMap<>();
+        Map<String, Object> target = CompactMap.<String, Object>builder().insertionOrder().build();
         int totalSeconds = offset.getTotalSeconds();
 
         // Calculate hours, minutes, and seconds
diff --git a/src/main/java/com/cedarsoftware/util/convert/ZonedDateTimeConversions.java b/src/main/java/com/cedarsoftware/util/convert/ZonedDateTimeConversions.java
index 5a97eb82..8052916a 100644
--- a/src/main/java/com/cedarsoftware/util/convert/ZonedDateTimeConversions.java
+++ b/src/main/java/com/cedarsoftware/util/convert/ZonedDateTimeConversions.java
@@ -15,7 +15,7 @@
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicLong;
 
-import com.cedarsoftware.util.CompactLinkedMap;
+import com.cedarsoftware.util.CompactMap;
 
 import static com.cedarsoftware.util.convert.MapConversions.DATE;
 import static com.cedarsoftware.util.convert.MapConversions.TIME;
@@ -119,7 +119,7 @@ static String toString(Object from, Converter converter) {
 
     static Map<String, Object> toMap(Object from, Converter converter) {
         ZonedDateTime zdt = (ZonedDateTime) from;
-        Map<String, Object> target = new CompactLinkedMap<>();
+        Map<String, Object> target = CompactMap.<String, Object>builder().insertionOrder().build();
         target.put(DATE, zdt.toLocalDate().toString());
         target.put(TIME, zdt.toLocalTime().toString());
         target.put(ZONE, zdt.getZone().toString());
diff --git a/src/test/java/com/cedarsoftware/util/CompactMapTest.java b/src/test/java/com/cedarsoftware/util/CompactMapTest.java
index 1ec0926c..33fd9a18 100644
--- a/src/test/java/com/cedarsoftware/util/CompactMapTest.java
+++ b/src/test/java/com/cedarsoftware/util/CompactMapTest.java
@@ -2612,10 +2612,10 @@ public void testCaseInsensitiveEntries()
     }
 
     @Test
-    public void testCompactLinkedMap()
+    public void testCompactMapSequence()
     {
         // Ensure CompactLinkedMap is minimally exercised.
-        CompactMap<String, Integer> linkedMap = new CompactLinkedMap<>();
+        CompactMap<String, Integer> linkedMap = CompactMap.<String, Integer>builder().insertionOrder().build();
 
         for (int i=0; i < linkedMap.compactSize() + 5; i++)
         {
@@ -2629,7 +2629,7 @@ public void testCompactLinkedMap()
         assert linkedMap.containsKey("FoO" + (linkedMap.compactSize() + 3));
         assert !linkedMap.containsKey("foo" + (linkedMap.compactSize() + 3));
 
-        CompactMap<String, Integer> copy = new CompactLinkedMap<>(linkedMap);
+        CompactMap<String, Integer> copy = CompactMap.<String, Integer>builder().insertionOrder().build();
         assert copy.equals(linkedMap);
 
         assert copy.containsKey("FoO0");
@@ -2672,7 +2672,7 @@ void testCompactCIHashMap()
     @Test
     void testCompactCILinkedMap()
     {
-        // Ensure CompactLinkedMap is minimally exercised.
+        // Ensure CompactMap case insenstive and sequence order, is minimally exercised.
         CompactMap<String, Integer> ciLinkedMap = CompactMap.<String, Integer>builder().compactSize(80).caseSensitive(false).insertionOrder().build();
 
         for (int i=0; i < ciLinkedMap.compactSize() + 5; i++)
diff --git a/src/test/java/com/cedarsoftware/util/convert/ConverterEverythingTest.java b/src/test/java/com/cedarsoftware/util/convert/ConverterEverythingTest.java
index dca79977..c62a6c75 100644
--- a/src/test/java/com/cedarsoftware/util/convert/ConverterEverythingTest.java
+++ b/src/test/java/com/cedarsoftware/util/convert/ConverterEverythingTest.java
@@ -47,7 +47,7 @@
 import java.util.stream.Stream;
 
 import com.cedarsoftware.util.ClassUtilities;
-import com.cedarsoftware.util.CompactLinkedMap;
+import com.cedarsoftware.util.CompactMap;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
@@ -1934,7 +1934,7 @@ private static void loadCalendarTests() {
                     return cal;
                 }},
                 {(Supplier<Map<String, Object>>) () -> {
-                    Map<String, Object> map = new CompactLinkedMap<>();
+                    Map<String, Object> map = CompactMap.<String, Object>builder().insertionOrder().build();
                     Calendar cal = Calendar.getInstance(TOKYO_TZ);
                     cal.set(2024, Calendar.FEBRUARY, 5, 22, 31, 17);
                     cal.set(Calendar.MILLISECOND, 409);
@@ -1971,7 +1971,7 @@ private static void loadCalendarTests() {
                     return cal;
                 }},
                 {(Supplier<Map<String, Object>>) () -> {
-                    Map<String, Object> map = new CompactLinkedMap<>();
+                    Map<String, Object> map = CompactMap.<String, Object>builder().insertionOrder().build();
                     map.put(DATE, "2024-02-05");
                     map.put(TIME, "22:31:17.409");
                     map.put(ZONE, TOKYO);
diff --git a/src/test/java/com/cedarsoftware/util/convert/MapConversionTests.java b/src/test/java/com/cedarsoftware/util/convert/MapConversionTests.java
index a54ba4cc..62552b5c 100644
--- a/src/test/java/com/cedarsoftware/util/convert/MapConversionTests.java
+++ b/src/test/java/com/cedarsoftware/util/convert/MapConversionTests.java
@@ -491,7 +491,7 @@ public void testInitMap() {
         assertEquals(1, dateMap.size());
         assertEquals(1, nullMap.size());
 
-        // Verify the map is mutable (CompactLinkedMap is used)
+        // Verify the map is mutable (CompactMap is used)
         try {
             Map<String, Object> testMap = (Map<String, Object>) MapConversions.initMap("test", converter);
             testMap.put("newKey", "newValue");