diff --git a/core/src/com/riiablo/logger/Logger.java b/core/src/com/riiablo/logger/Logger.java
index e1d67e34..469452f5 100644
--- a/core/src/com/riiablo/logger/Logger.java
+++ b/core/src/com/riiablo/logger/Logger.java
@@ -76,20 +76,125 @@ public final class Logger {
     if (deferred) this.level = level;
   }
 
-  protected final void logIfEnabled(
-      final Level level,
-      final Message message) {
+  private void logIfEnabled(
+      Level level,
+      MessageFactory factory,
+      String message, Object... args) {
     if (enabled(level)) {
-      log(level, message, getLocation());
+      log(level, factory.newMessage(message, args), getLocation());
     }
   }
 
-  protected void logIfEnabled(
-      final Level level,
-      final Message message,
-      final StackTraceElement location) {
+  private void logIfEnabled(
+      Level level,
+      MessageFactory factory,
+      String message, Object arg0) {
     if (enabled(level)) {
-      log(level, message, location);
+      log(level, factory.newMessage(message, arg0), getLocation());
+    }
+  }
+
+  private void logIfEnabled(
+      Level level,
+      MessageFactory factory,
+      String message,
+      Object arg0, Object arg1) {
+    if (enabled(level)) {
+      log(level, factory.newMessage(message,
+          arg0, arg1), getLocation());
+    }
+  }
+
+  private void logIfEnabled(
+      Level level,
+      MessageFactory factory,
+      String message,
+      Object arg0, Object arg1, Object arg2) {
+    if (enabled(level)) {
+      log(level, factory.newMessage(message,
+          arg0, arg1, arg2), getLocation());
+    }
+  }
+
+  private void logIfEnabled(
+      Level level,
+      MessageFactory factory,
+      String message,
+      Object arg0, Object arg1, Object arg2, Object arg3) {
+    if (enabled(level)) {
+      log(level, factory.newMessage(message,
+          arg0, arg1, arg2, arg3), getLocation());
+    }
+  }
+
+  private void logIfEnabled(
+      Level level,
+      MessageFactory factory,
+      String message,
+      Object arg0, Object arg1, Object arg2, Object arg3, Object arg4) {
+    if (enabled(level)) {
+      log(level, factory.newMessage(message,
+          arg0, arg1, arg2, arg3, arg4), getLocation());
+    }
+  }
+
+  private void logIfEnabled(
+      Level level,
+      MessageFactory factory,
+      String message,
+      Object arg0, Object arg1, Object arg2, Object arg3, Object arg4,
+      Object arg5) {
+    if (enabled(level)) {
+      log(level, factory.newMessage(message,
+          arg0, arg1, arg2, arg3, arg4, arg5), getLocation());
+    }
+  }
+
+  private void logIfEnabled(
+      Level level,
+      MessageFactory factory,
+      String message,
+      Object arg0, Object arg1, Object arg2, Object arg3, Object arg4,
+      Object arg5, Object arg6) {
+    if (enabled(level)) {
+      log(level, factory.newMessage(message,
+          arg0, arg1, arg2, arg3, arg4, arg5, arg6), getLocation());
+    }
+  }
+
+  private void logIfEnabled(
+      Level level,
+      MessageFactory factory,
+      String message,
+      Object arg0, Object arg1, Object arg2, Object arg3, Object arg4,
+      Object arg5, Object arg6, Object arg7) {
+    if (enabled(level)) {
+      log(level, factory.newMessage(message,
+          arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7), getLocation());
+    }
+  }
+
+  private void logIfEnabled(
+      Level level,
+      MessageFactory factory,
+      String message,
+      Object arg0, Object arg1, Object arg2, Object arg3, Object arg4,
+      Object arg5, Object arg6, Object arg7, Object arg8) {
+    if (enabled(level)) {
+      log(level, factory.newMessage(message,
+          arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8), getLocation());
+    }
+  }
+
+  private void logIfEnabled(
+      Level level,
+      MessageFactory factory,
+      String message,
+      Object arg0, Object arg1, Object arg2, Object arg3, Object arg4,
+      Object arg5, Object arg6, Object arg7, Object arg8, Object arg9) {
+    if (enabled(level)) {
+      log(level, factory.newMessage(message,
+          arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9), getLocation());
     }
   }
 
@@ -114,91 +219,91 @@ public final class Logger {
   }
 
   public final void trace(final String message, final Object... params) {
-    logIfEnabled(Level.TRACE, defaultFactory().newMessage(message, params));
+    logIfEnabled(Level.TRACE, defaultFactory(), message, params);
   }
 
   public final void trace(String message, Object arg0) {
-    logIfEnabled(Level.TRACE, defaultFactory().newMessage(message, arg0));
+    logIfEnabled(Level.TRACE, defaultFactory(), message, arg0);
   }
 
   public final void trace(String message, Object arg0, Object arg1) {
-    logIfEnabled(Level.TRACE, defaultFactory().newMessage(message, arg0, arg1));
+    logIfEnabled(Level.TRACE, defaultFactory(), message, arg0, arg1);
   }
 
   public final void trace(String message, Object arg0, Object arg1, Object arg2) {
-    logIfEnabled(Level.TRACE, defaultFactory().newMessage(message, arg0, arg1, arg2));
+    logIfEnabled(Level.TRACE, defaultFactory(), message, arg0, arg1, arg2);
   }
 
   public final void trace(String message, Object arg0, Object arg1, Object arg2, Object arg3) {
-    logIfEnabled(Level.TRACE, defaultFactory().newMessage(message, arg0, arg1, arg2, arg3));
+    logIfEnabled(Level.TRACE, defaultFactory(), message, arg0, arg1, arg2, arg3);
   }
 
   public final void trace(String message, Object arg0, Object arg1, Object arg2, Object arg3, Object arg4) {
-    logIfEnabled(Level.TRACE, defaultFactory().newMessage(message, arg0, arg1, arg2, arg3, arg4));
+    logIfEnabled(Level.TRACE, defaultFactory(), message, arg0, arg1, arg2, arg3, arg4);
   }
 
   public final void trace(String message, Object arg0, Object arg1, Object arg2, Object arg3, Object arg4, Object arg5) {
-    logIfEnabled(Level.TRACE, defaultFactory().newMessage(message, arg0, arg1, arg2, arg3, arg4, arg5));
+    logIfEnabled(Level.TRACE, defaultFactory(), message, arg0, arg1, arg2, arg3, arg4, arg5);
   }
 
   public final void trace(String message, Object arg0, Object arg1, Object arg2, Object arg3, Object arg4, Object arg5, Object arg6) {
-    logIfEnabled(Level.TRACE, defaultFactory().newMessage(message, arg0, arg1, arg2, arg3, arg4, arg5, arg6));
+    logIfEnabled(Level.TRACE, defaultFactory(), message, arg0, arg1, arg2, arg3, arg4, arg5, arg6);
   }
 
   public final void trace(String message, Object arg0, Object arg1, Object arg2, Object arg3, Object arg4, Object arg5, Object arg6, Object arg7) {
-    logIfEnabled(Level.TRACE, defaultFactory().newMessage(message, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7));
+    logIfEnabled(Level.TRACE, defaultFactory(), message, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7);
   }
 
   public final void trace(String message, Object arg0, Object arg1, Object arg2, Object arg3, Object arg4, Object arg5, Object arg6, Object arg7, Object arg8) {
-    logIfEnabled(Level.TRACE, defaultFactory().newMessage(message, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8));
+    logIfEnabled(Level.TRACE, defaultFactory(), message, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8);
   }
 
   public final void trace(String message, Object arg0, Object arg1, Object arg2, Object arg3, Object arg4, Object arg5, Object arg6, Object arg7, Object arg8, Object arg9) {
-    logIfEnabled(Level.TRACE, defaultFactory().newMessage(message, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9));
+    logIfEnabled(Level.TRACE, defaultFactory(), message, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9);
   }
 
   public final void tracef(final String message, final Object... params) {
-    logIfEnabled(Level.TRACE, formattedFactory().newMessage(message, params));
+    logIfEnabled(Level.TRACE, formattedFactory(), message, params);
   }
 
   public final void tracef(String message, Object arg0) {
-    logIfEnabled(Level.TRACE, formattedFactory().newMessage(message, arg0));
+    logIfEnabled(Level.TRACE, formattedFactory(), message, arg0);
   }
 
   public final void tracef(String message, Object arg0, Object arg1) {
-    logIfEnabled(Level.TRACE, formattedFactory().newMessage(message, arg0, arg1));
+    logIfEnabled(Level.TRACE, formattedFactory(), message, arg0, arg1);
   }
 
   public final void tracef(String message, Object arg0, Object arg1, Object arg2) {
-    logIfEnabled(Level.TRACE, formattedFactory().newMessage(message, arg0, arg1, arg2));
+    logIfEnabled(Level.TRACE, formattedFactory(), message, arg0, arg1, arg2);
   }
 
   public final void tracef(String message, Object arg0, Object arg1, Object arg2, Object arg3) {
-    logIfEnabled(Level.TRACE, formattedFactory().newMessage(message, arg0, arg1, arg2, arg3));
+    logIfEnabled(Level.TRACE, formattedFactory(), message, arg0, arg1, arg2, arg3);
   }
 
   public final void tracef(String message, Object arg0, Object arg1, Object arg2, Object arg3, Object arg4) {
-    logIfEnabled(Level.TRACE, formattedFactory().newMessage(message, arg0, arg1, arg2, arg3, arg4));
+    logIfEnabled(Level.TRACE, formattedFactory(), message, arg0, arg1, arg2, arg3, arg4);
   }
 
   public final void tracef(String message, Object arg0, Object arg1, Object arg2, Object arg3, Object arg4, Object arg5) {
-    logIfEnabled(Level.TRACE, formattedFactory().newMessage(message, arg0, arg1, arg2, arg3, arg4, arg5));
+    logIfEnabled(Level.TRACE, formattedFactory(), message, arg0, arg1, arg2, arg3, arg4, arg5);
   }
 
   public final void tracef(String message, Object arg0, Object arg1, Object arg2, Object arg3, Object arg4, Object arg5, Object arg6) {
-    logIfEnabled(Level.TRACE, formattedFactory().newMessage(message, arg0, arg1, arg2, arg3, arg4, arg5, arg6));
+    logIfEnabled(Level.TRACE, formattedFactory(), message, arg0, arg1, arg2, arg3, arg4, arg5, arg6);
   }
 
   public final void tracef(String message, Object arg0, Object arg1, Object arg2, Object arg3, Object arg4, Object arg5, Object arg6, Object arg7) {
-    logIfEnabled(Level.TRACE, formattedFactory().newMessage(message, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7));
+    logIfEnabled(Level.TRACE, formattedFactory(), message, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7);
   }
 
   public final void tracef(String message, Object arg0, Object arg1, Object arg2, Object arg3, Object arg4, Object arg5, Object arg6, Object arg7, Object arg8) {
-    logIfEnabled(Level.TRACE, formattedFactory().newMessage(message, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8));
+    logIfEnabled(Level.TRACE, formattedFactory(), message, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8);
   }
 
   public final void tracef(String message, Object arg0, Object arg1, Object arg2, Object arg3, Object arg4, Object arg5, Object arg6, Object arg7, Object arg8, Object arg9) {
-    logIfEnabled(Level.TRACE, formattedFactory().newMessage(message, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9));
+    logIfEnabled(Level.TRACE, formattedFactory(), message, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9);
   }
 
   public final boolean debugEnabled() {
@@ -206,91 +311,91 @@ public final class Logger {
   }
 
   public final void debug(final String message, final Object... params) {
-    logIfEnabled(Level.DEBUG, defaultFactory().newMessage(message, params));
+    logIfEnabled(Level.DEBUG, defaultFactory(), message, params);
   }
 
   public final void debug(String message, Object arg0) {
-    logIfEnabled(Level.DEBUG, defaultFactory().newMessage(message, arg0));
+    logIfEnabled(Level.DEBUG, defaultFactory(), message, arg0);
   }
 
   public final void debug(String message, Object arg0, Object arg1) {
-    logIfEnabled(Level.DEBUG, defaultFactory().newMessage(message, arg0, arg1));
+    logIfEnabled(Level.DEBUG, defaultFactory(), message, arg0, arg1);
   }
 
   public final void debug(String message, Object arg0, Object arg1, Object arg2) {
-    logIfEnabled(Level.DEBUG, defaultFactory().newMessage(message, arg0, arg1, arg2));
+    logIfEnabled(Level.DEBUG, defaultFactory(), message, arg0, arg1, arg2);
   }
 
   public final void debug(String message, Object arg0, Object arg1, Object arg2, Object arg3) {
-    logIfEnabled(Level.DEBUG, defaultFactory().newMessage(message, arg0, arg1, arg2, arg3));
+    logIfEnabled(Level.DEBUG, defaultFactory(), message, arg0, arg1, arg2, arg3);
   }
 
   public final void debug(String message, Object arg0, Object arg1, Object arg2, Object arg3, Object arg4) {
-    logIfEnabled(Level.DEBUG, defaultFactory().newMessage(message, arg0, arg1, arg2, arg3, arg4));
+    logIfEnabled(Level.DEBUG, defaultFactory(), message, arg0, arg1, arg2, arg3, arg4);
   }
 
   public final void debug(String message, Object arg0, Object arg1, Object arg2, Object arg3, Object arg4, Object arg5) {
-    logIfEnabled(Level.DEBUG, defaultFactory().newMessage(message, arg0, arg1, arg2, arg3, arg4, arg5));
+    logIfEnabled(Level.DEBUG, defaultFactory(), message, arg0, arg1, arg2, arg3, arg4, arg5);
   }
 
   public final void debug(String message, Object arg0, Object arg1, Object arg2, Object arg3, Object arg4, Object arg5, Object arg6) {
-    logIfEnabled(Level.DEBUG, defaultFactory().newMessage(message, arg0, arg1, arg2, arg3, arg4, arg5, arg6));
+    logIfEnabled(Level.DEBUG, defaultFactory(), message, arg0, arg1, arg2, arg3, arg4, arg5, arg6);
   }
 
   public final void debug(String message, Object arg0, Object arg1, Object arg2, Object arg3, Object arg4, Object arg5, Object arg6, Object arg7) {
-    logIfEnabled(Level.DEBUG, defaultFactory().newMessage(message, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7));
+    logIfEnabled(Level.DEBUG, defaultFactory(), message, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7);
   }
 
   public final void debug(String message, Object arg0, Object arg1, Object arg2, Object arg3, Object arg4, Object arg5, Object arg6, Object arg7, Object arg8) {
-    logIfEnabled(Level.DEBUG, defaultFactory().newMessage(message, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8));
+    logIfEnabled(Level.DEBUG, defaultFactory(), message, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8);
   }
 
   public final void debug(String message, Object arg0, Object arg1, Object arg2, Object arg3, Object arg4, Object arg5, Object arg6, Object arg7, Object arg8, Object arg9) {
-    logIfEnabled(Level.DEBUG, defaultFactory().newMessage(message, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9));
+    logIfEnabled(Level.DEBUG, defaultFactory(), message, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9);
   }
 
   public final void debugf(final String message, final Object... params) {
-    logIfEnabled(Level.DEBUG, formattedFactory().newMessage(message, params));
+    logIfEnabled(Level.DEBUG, formattedFactory(), message, params);
   }
 
   public final void debugf(String message, Object arg0) {
-    logIfEnabled(Level.DEBUG, formattedFactory().newMessage(message, arg0));
+    logIfEnabled(Level.DEBUG, formattedFactory(), message, arg0);
   }
 
   public final void debugf(String message, Object arg0, Object arg1) {
-    logIfEnabled(Level.DEBUG, formattedFactory().newMessage(message, arg0, arg1));
+    logIfEnabled(Level.DEBUG, formattedFactory(), message, arg0, arg1);
   }
 
   public final void debugf(String message, Object arg0, Object arg1, Object arg2) {
-    logIfEnabled(Level.DEBUG, formattedFactory().newMessage(message, arg0, arg1, arg2));
+    logIfEnabled(Level.DEBUG, formattedFactory(), message, arg0, arg1, arg2);
   }
 
   public final void debugf(String message, Object arg0, Object arg1, Object arg2, Object arg3) {
-    logIfEnabled(Level.DEBUG, formattedFactory().newMessage(message, arg0, arg1, arg2, arg3));
+    logIfEnabled(Level.DEBUG, formattedFactory(), message, arg0, arg1, arg2, arg3);
   }
 
   public final void debugf(String message, Object arg0, Object arg1, Object arg2, Object arg3, Object arg4) {
-    logIfEnabled(Level.DEBUG, formattedFactory().newMessage(message, arg0, arg1, arg2, arg3, arg4));
+    logIfEnabled(Level.DEBUG, formattedFactory(), message, arg0, arg1, arg2, arg3, arg4);
   }
 
   public final void debugf(String message, Object arg0, Object arg1, Object arg2, Object arg3, Object arg4, Object arg5) {
-    logIfEnabled(Level.DEBUG, formattedFactory().newMessage(message, arg0, arg1, arg2, arg3, arg4, arg5));
+    logIfEnabled(Level.DEBUG, formattedFactory(), message, arg0, arg1, arg2, arg3, arg4, arg5);
   }
 
   public final void debugf(String message, Object arg0, Object arg1, Object arg2, Object arg3, Object arg4, Object arg5, Object arg6) {
-    logIfEnabled(Level.DEBUG, formattedFactory().newMessage(message, arg0, arg1, arg2, arg3, arg4, arg5, arg6));
+    logIfEnabled(Level.DEBUG, formattedFactory(), message, arg0, arg1, arg2, arg3, arg4, arg5, arg6);
   }
 
   public final void debugf(String message, Object arg0, Object arg1, Object arg2, Object arg3, Object arg4, Object arg5, Object arg6, Object arg7) {
-    logIfEnabled(Level.DEBUG, formattedFactory().newMessage(message, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7));
+    logIfEnabled(Level.DEBUG, formattedFactory(), message, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7);
   }
 
   public final void debugf(String message, Object arg0, Object arg1, Object arg2, Object arg3, Object arg4, Object arg5, Object arg6, Object arg7, Object arg8) {
-    logIfEnabled(Level.DEBUG, formattedFactory().newMessage(message, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8));
+    logIfEnabled(Level.DEBUG, formattedFactory(), message, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8);
   }
 
   public final void debugf(String message, Object arg0, Object arg1, Object arg2, Object arg3, Object arg4, Object arg5, Object arg6, Object arg7, Object arg8, Object arg9) {
-    logIfEnabled(Level.DEBUG, formattedFactory().newMessage(message, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9));
+    logIfEnabled(Level.DEBUG, formattedFactory(), message, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9);
   }
 
   public final boolean infoEnabled() {
@@ -298,91 +403,91 @@ public final class Logger {
   }
 
   public final void info(final String message, final Object... params) {
-    logIfEnabled(Level.INFO, defaultFactory().newMessage(message, params));
+    logIfEnabled(Level.INFO, defaultFactory(), message, params);
   }
 
   public final void info(String message, Object arg0) {
-    logIfEnabled(Level.INFO, defaultFactory().newMessage(message, arg0));
+    logIfEnabled(Level.INFO, defaultFactory(), message, arg0);
   }
 
   public final void info(String message, Object arg0, Object arg1) {
-    logIfEnabled(Level.INFO, defaultFactory().newMessage(message, arg0, arg1));
+    logIfEnabled(Level.INFO, defaultFactory(), message, arg0, arg1);
   }
 
   public final void info(String message, Object arg0, Object arg1, Object arg2) {
-    logIfEnabled(Level.INFO, defaultFactory().newMessage(message, arg0, arg1, arg2));
+    logIfEnabled(Level.INFO, defaultFactory(), message, arg0, arg1, arg2);
   }
 
   public final void info(String message, Object arg0, Object arg1, Object arg2, Object arg3) {
-    logIfEnabled(Level.INFO, defaultFactory().newMessage(message, arg0, arg1, arg2, arg3));
+    logIfEnabled(Level.INFO, defaultFactory(), message, arg0, arg1, arg2, arg3);
   }
 
   public final void info(String message, Object arg0, Object arg1, Object arg2, Object arg3, Object arg4) {
-    logIfEnabled(Level.INFO, defaultFactory().newMessage(message, arg0, arg1, arg2, arg3, arg4));
+    logIfEnabled(Level.INFO, defaultFactory(), message, arg0, arg1, arg2, arg3, arg4);
   }
 
   public final void info(String message, Object arg0, Object arg1, Object arg2, Object arg3, Object arg4, Object arg5) {
-    logIfEnabled(Level.INFO, defaultFactory().newMessage(message, arg0, arg1, arg2, arg3, arg4, arg5));
+    logIfEnabled(Level.INFO, defaultFactory(), message, arg0, arg1, arg2, arg3, arg4, arg5);
   }
 
   public final void info(String message, Object arg0, Object arg1, Object arg2, Object arg3, Object arg4, Object arg5, Object arg6) {
-    logIfEnabled(Level.INFO, defaultFactory().newMessage(message, arg0, arg1, arg2, arg3, arg4, arg5, arg6));
+    logIfEnabled(Level.INFO, defaultFactory(), message, arg0, arg1, arg2, arg3, arg4, arg5, arg6);
   }
 
   public final void info(String message, Object arg0, Object arg1, Object arg2, Object arg3, Object arg4, Object arg5, Object arg6, Object arg7) {
-    logIfEnabled(Level.INFO, defaultFactory().newMessage(message, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7));
+    logIfEnabled(Level.INFO, defaultFactory(), message, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7);
   }
 
   public final void info(String message, Object arg0, Object arg1, Object arg2, Object arg3, Object arg4, Object arg5, Object arg6, Object arg7, Object arg8) {
-    logIfEnabled(Level.INFO, defaultFactory().newMessage(message, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8));
+    logIfEnabled(Level.INFO, defaultFactory(), message, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8);
   }
 
   public final void info(String message, Object arg0, Object arg1, Object arg2, Object arg3, Object arg4, Object arg5, Object arg6, Object arg7, Object arg8, Object arg9) {
-    logIfEnabled(Level.INFO, defaultFactory().newMessage(message, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9));
+    logIfEnabled(Level.INFO, defaultFactory(), message, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9);
   }
 
   public final void infof(final String message, final Object... params) {
-    logIfEnabled(Level.INFO, formattedFactory().newMessage(message, params));
+    logIfEnabled(Level.INFO, formattedFactory(), message, params);
   }
 
   public final void infof(String message, Object arg0) {
-    logIfEnabled(Level.INFO, formattedFactory().newMessage(message, arg0));
+    logIfEnabled(Level.INFO, formattedFactory(), message, arg0);
   }
 
   public final void infof(String message, Object arg0, Object arg1) {
-    logIfEnabled(Level.INFO, formattedFactory().newMessage(message, arg0, arg1));
+    logIfEnabled(Level.INFO, formattedFactory(), message, arg0, arg1);
   }
 
   public final void infof(String message, Object arg0, Object arg1, Object arg2) {
-    logIfEnabled(Level.INFO, formattedFactory().newMessage(message, arg0, arg1, arg2));
+    logIfEnabled(Level.INFO, formattedFactory(), message, arg0, arg1, arg2);
   }
 
   public final void infof(String message, Object arg0, Object arg1, Object arg2, Object arg3) {
-    logIfEnabled(Level.INFO, formattedFactory().newMessage(message, arg0, arg1, arg2, arg3));
+    logIfEnabled(Level.INFO, formattedFactory(), message, arg0, arg1, arg2, arg3);
   }
 
   public final void infof(String message, Object arg0, Object arg1, Object arg2, Object arg3, Object arg4) {
-    logIfEnabled(Level.INFO, formattedFactory().newMessage(message, arg0, arg1, arg2, arg3, arg4));
+    logIfEnabled(Level.INFO, formattedFactory(), message, arg0, arg1, arg2, arg3, arg4);
   }
 
   public final void infof(String message, Object arg0, Object arg1, Object arg2, Object arg3, Object arg4, Object arg5) {
-    logIfEnabled(Level.INFO, formattedFactory().newMessage(message, arg0, arg1, arg2, arg3, arg4, arg5));
+    logIfEnabled(Level.INFO, formattedFactory(), message, arg0, arg1, arg2, arg3, arg4, arg5);
   }
 
   public final void infof(String message, Object arg0, Object arg1, Object arg2, Object arg3, Object arg4, Object arg5, Object arg6) {
-    logIfEnabled(Level.INFO, formattedFactory().newMessage(message, arg0, arg1, arg2, arg3, arg4, arg5, arg6));
+    logIfEnabled(Level.INFO, formattedFactory(), message, arg0, arg1, arg2, arg3, arg4, arg5, arg6);
   }
 
   public final void infof(String message, Object arg0, Object arg1, Object arg2, Object arg3, Object arg4, Object arg5, Object arg6, Object arg7) {
-    logIfEnabled(Level.INFO, formattedFactory().newMessage(message, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7));
+    logIfEnabled(Level.INFO, formattedFactory(), message, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7);
   }
 
   public final void infof(String message, Object arg0, Object arg1, Object arg2, Object arg3, Object arg4, Object arg5, Object arg6, Object arg7, Object arg8) {
-    logIfEnabled(Level.INFO, formattedFactory().newMessage(message, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8));
+    logIfEnabled(Level.INFO, formattedFactory(), message, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8);
   }
 
   public final void infof(String message, Object arg0, Object arg1, Object arg2, Object arg3, Object arg4, Object arg5, Object arg6, Object arg7, Object arg8, Object arg9) {
-    logIfEnabled(Level.INFO, formattedFactory().newMessage(message, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9));
+    logIfEnabled(Level.INFO, formattedFactory(), message, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9);
   }
 
   public final boolean warnEnabled() {
@@ -390,91 +495,91 @@ public final class Logger {
   }
 
   public final void warn(final String message, final Object... params) {
-    logIfEnabled(Level.WARN, defaultFactory().newMessage(message, params));
+    logIfEnabled(Level.WARN, defaultFactory(), message, params);
   }
 
   public final void warn(String message, Object arg0) {
-    logIfEnabled(Level.WARN, defaultFactory().newMessage(message, arg0));
+    logIfEnabled(Level.WARN, defaultFactory(), message, arg0);
   }
 
   public final void warn(String message, Object arg0, Object arg1) {
-    logIfEnabled(Level.WARN, defaultFactory().newMessage(message, arg0, arg1));
+    logIfEnabled(Level.WARN, defaultFactory(), message, arg0, arg1);
   }
 
   public final void warn(String message, Object arg0, Object arg1, Object arg2) {
-    logIfEnabled(Level.WARN, defaultFactory().newMessage(message, arg0, arg1, arg2));
+    logIfEnabled(Level.WARN, defaultFactory(), message, arg0, arg1, arg2);
   }
 
   public final void warn(String message, Object arg0, Object arg1, Object arg2, Object arg3) {
-    logIfEnabled(Level.WARN, defaultFactory().newMessage(message, arg0, arg1, arg2, arg3));
+    logIfEnabled(Level.WARN, defaultFactory(), message, arg0, arg1, arg2, arg3);
   }
 
   public final void warn(String message, Object arg0, Object arg1, Object arg2, Object arg3, Object arg4) {
-    logIfEnabled(Level.WARN, defaultFactory().newMessage(message, arg0, arg1, arg2, arg3, arg4));
+    logIfEnabled(Level.WARN, defaultFactory(), message, arg0, arg1, arg2, arg3, arg4);
   }
 
   public final void warn(String message, Object arg0, Object arg1, Object arg2, Object arg3, Object arg4, Object arg5) {
-    logIfEnabled(Level.WARN, defaultFactory().newMessage(message, arg0, arg1, arg2, arg3, arg4, arg5));
+    logIfEnabled(Level.WARN, defaultFactory(), message, arg0, arg1, arg2, arg3, arg4, arg5);
   }
 
   public final void warn(String message, Object arg0, Object arg1, Object arg2, Object arg3, Object arg4, Object arg5, Object arg6) {
-    logIfEnabled(Level.WARN, defaultFactory().newMessage(message, arg0, arg1, arg2, arg3, arg4, arg5, arg6));
+    logIfEnabled(Level.WARN, defaultFactory(), message, arg0, arg1, arg2, arg3, arg4, arg5, arg6);
   }
 
   public final void warn(String message, Object arg0, Object arg1, Object arg2, Object arg3, Object arg4, Object arg5, Object arg6, Object arg7) {
-    logIfEnabled(Level.WARN, defaultFactory().newMessage(message, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7));
+    logIfEnabled(Level.WARN, defaultFactory(), message, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7);
   }
 
   public final void warn(String message, Object arg0, Object arg1, Object arg2, Object arg3, Object arg4, Object arg5, Object arg6, Object arg7, Object arg8) {
-    logIfEnabled(Level.WARN, defaultFactory().newMessage(message, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8));
+    logIfEnabled(Level.WARN, defaultFactory(), message, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8);
   }
 
   public final void warn(String message, Object arg0, Object arg1, Object arg2, Object arg3, Object arg4, Object arg5, Object arg6, Object arg7, Object arg8, Object arg9) {
-    logIfEnabled(Level.WARN, defaultFactory().newMessage(message, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9));
+    logIfEnabled(Level.WARN, defaultFactory(), message, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9);
   }
 
   public final void warnf(final String message, final Object... params) {
-    logIfEnabled(Level.WARN, formattedFactory().newMessage(message, params));
+    logIfEnabled(Level.WARN, formattedFactory(), message, params);
   }
 
   public final void warnf(String message, Object arg0) {
-    logIfEnabled(Level.WARN, formattedFactory().newMessage(message, arg0));
+    logIfEnabled(Level.WARN, formattedFactory(), message, arg0);
   }
 
   public final void warnf(String message, Object arg0, Object arg1) {
-    logIfEnabled(Level.WARN, formattedFactory().newMessage(message, arg0, arg1));
+    logIfEnabled(Level.WARN, formattedFactory(), message, arg0, arg1);
   }
 
   public final void warnf(String message, Object arg0, Object arg1, Object arg2) {
-    logIfEnabled(Level.WARN, formattedFactory().newMessage(message, arg0, arg1, arg2));
+    logIfEnabled(Level.WARN, formattedFactory(), message, arg0, arg1, arg2);
   }
 
   public final void warnf(String message, Object arg0, Object arg1, Object arg2, Object arg3) {
-    logIfEnabled(Level.WARN, formattedFactory().newMessage(message, arg0, arg1, arg2, arg3));
+    logIfEnabled(Level.WARN, formattedFactory(), message, arg0, arg1, arg2, arg3);
   }
 
   public final void warnf(String message, Object arg0, Object arg1, Object arg2, Object arg3, Object arg4) {
-    logIfEnabled(Level.WARN, formattedFactory().newMessage(message, arg0, arg1, arg2, arg3, arg4));
+    logIfEnabled(Level.WARN, formattedFactory(), message, arg0, arg1, arg2, arg3, arg4);
   }
 
   public final void warnf(String message, Object arg0, Object arg1, Object arg2, Object arg3, Object arg4, Object arg5) {
-    logIfEnabled(Level.WARN, formattedFactory().newMessage(message, arg0, arg1, arg2, arg3, arg4, arg5));
+    logIfEnabled(Level.WARN, formattedFactory(), message, arg0, arg1, arg2, arg3, arg4, arg5);
   }
 
   public final void warnf(String message, Object arg0, Object arg1, Object arg2, Object arg3, Object arg4, Object arg5, Object arg6) {
-    logIfEnabled(Level.WARN, formattedFactory().newMessage(message, arg0, arg1, arg2, arg3, arg4, arg5, arg6));
+    logIfEnabled(Level.WARN, formattedFactory(), message, arg0, arg1, arg2, arg3, arg4, arg5, arg6);
   }
 
   public final void warnf(String message, Object arg0, Object arg1, Object arg2, Object arg3, Object arg4, Object arg5, Object arg6, Object arg7) {
-    logIfEnabled(Level.WARN, formattedFactory().newMessage(message, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7));
+    logIfEnabled(Level.WARN, formattedFactory(), message, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7);
   }
 
   public final void warnf(String message, Object arg0, Object arg1, Object arg2, Object arg3, Object arg4, Object arg5, Object arg6, Object arg7, Object arg8) {
-    logIfEnabled(Level.WARN, formattedFactory().newMessage(message, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8));
+    logIfEnabled(Level.WARN, formattedFactory(), message, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8);
   }
 
   public final void warnf(String message, Object arg0, Object arg1, Object arg2, Object arg3, Object arg4, Object arg5, Object arg6, Object arg7, Object arg8, Object arg9) {
-    logIfEnabled(Level.WARN, formattedFactory().newMessage(message, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9));
+    logIfEnabled(Level.WARN, formattedFactory(), message, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9);
   }
 
   public final boolean errorEnabled() {
@@ -482,91 +587,91 @@ public final class Logger {
   }
 
   public final void error(final String message, final Object... params) {
-    logIfEnabled(Level.ERROR, defaultFactory().newMessage(message, params));
+    logIfEnabled(Level.ERROR, defaultFactory(), message, params);
   }
 
   public final void error(String message, Object arg0) {
-    logIfEnabled(Level.ERROR, defaultFactory().newMessage(message, arg0));
+    logIfEnabled(Level.ERROR, defaultFactory(), message, arg0);
   }
 
   public final void error(String message, Object arg0, Object arg1) {
-    logIfEnabled(Level.ERROR, defaultFactory().newMessage(message, arg0, arg1));
+    logIfEnabled(Level.ERROR, defaultFactory(), message, arg0, arg1);
   }
 
   public final void error(String message, Object arg0, Object arg1, Object arg2) {
-    logIfEnabled(Level.ERROR, defaultFactory().newMessage(message, arg0, arg1, arg2));
+    logIfEnabled(Level.ERROR, defaultFactory(), message, arg0, arg1, arg2);
   }
 
   public final void error(String message, Object arg0, Object arg1, Object arg2, Object arg3) {
-    logIfEnabled(Level.ERROR, defaultFactory().newMessage(message, arg0, arg1, arg2, arg3));
+    logIfEnabled(Level.ERROR, defaultFactory(), message, arg0, arg1, arg2, arg3);
   }
 
   public final void error(String message, Object arg0, Object arg1, Object arg2, Object arg3, Object arg4) {
-    logIfEnabled(Level.ERROR, defaultFactory().newMessage(message, arg0, arg1, arg2, arg3, arg4));
+    logIfEnabled(Level.ERROR, defaultFactory(), message, arg0, arg1, arg2, arg3, arg4);
   }
 
   public final void error(String message, Object arg0, Object arg1, Object arg2, Object arg3, Object arg4, Object arg5) {
-    logIfEnabled(Level.ERROR, defaultFactory().newMessage(message, arg0, arg1, arg2, arg3, arg4, arg5));
+    logIfEnabled(Level.ERROR, defaultFactory(), message, arg0, arg1, arg2, arg3, arg4, arg5);
   }
 
   public final void error(String message, Object arg0, Object arg1, Object arg2, Object arg3, Object arg4, Object arg5, Object arg6) {
-    logIfEnabled(Level.ERROR, defaultFactory().newMessage(message, arg0, arg1, arg2, arg3, arg4, arg5, arg6));
+    logIfEnabled(Level.ERROR, defaultFactory(), message, arg0, arg1, arg2, arg3, arg4, arg5, arg6);
   }
 
   public final void error(String message, Object arg0, Object arg1, Object arg2, Object arg3, Object arg4, Object arg5, Object arg6, Object arg7) {
-    logIfEnabled(Level.ERROR, defaultFactory().newMessage(message, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7));
+    logIfEnabled(Level.ERROR, defaultFactory(), message, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7);
   }
 
   public final void error(String message, Object arg0, Object arg1, Object arg2, Object arg3, Object arg4, Object arg5, Object arg6, Object arg7, Object arg8) {
-    logIfEnabled(Level.ERROR, defaultFactory().newMessage(message, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8));
+    logIfEnabled(Level.ERROR, defaultFactory(), message, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8);
   }
 
   public final void error(String message, Object arg0, Object arg1, Object arg2, Object arg3, Object arg4, Object arg5, Object arg6, Object arg7, Object arg8, Object arg9) {
-    logIfEnabled(Level.ERROR, defaultFactory().newMessage(message, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9));
+    logIfEnabled(Level.ERROR, defaultFactory(), message, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9);
   }
 
   public final void errorf(final String message, final Object... params) {
-    logIfEnabled(Level.ERROR, formattedFactory().newMessage(message, params));
+    logIfEnabled(Level.ERROR, formattedFactory(), message, params);
   }
 
   public final void errorf(String message, Object arg0) {
-    logIfEnabled(Level.ERROR, formattedFactory().newMessage(message, arg0));
+    logIfEnabled(Level.ERROR, formattedFactory(), message, arg0);
   }
 
   public final void errorf(String message, Object arg0, Object arg1) {
-    logIfEnabled(Level.ERROR, formattedFactory().newMessage(message, arg0, arg1));
+    logIfEnabled(Level.ERROR, formattedFactory(), message, arg0, arg1);
   }
 
   public final void errorf(String message, Object arg0, Object arg1, Object arg2) {
-    logIfEnabled(Level.ERROR, formattedFactory().newMessage(message, arg0, arg1, arg2));
+    logIfEnabled(Level.ERROR, formattedFactory(), message, arg0, arg1, arg2);
   }
 
   public final void errorf(String message, Object arg0, Object arg1, Object arg2, Object arg3) {
-    logIfEnabled(Level.ERROR, formattedFactory().newMessage(message, arg0, arg1, arg2, arg3));
+    logIfEnabled(Level.ERROR, formattedFactory(), message, arg0, arg1, arg2, arg3);
   }
 
   public final void errorf(String message, Object arg0, Object arg1, Object arg2, Object arg3, Object arg4) {
-    logIfEnabled(Level.ERROR, formattedFactory().newMessage(message, arg0, arg1, arg2, arg3, arg4));
+    logIfEnabled(Level.ERROR, formattedFactory(), message, arg0, arg1, arg2, arg3, arg4);
   }
 
   public final void errorf(String message, Object arg0, Object arg1, Object arg2, Object arg3, Object arg4, Object arg5) {
-    logIfEnabled(Level.ERROR, formattedFactory().newMessage(message, arg0, arg1, arg2, arg3, arg4, arg5));
+    logIfEnabled(Level.ERROR, formattedFactory(), message, arg0, arg1, arg2, arg3, arg4, arg5);
   }
 
   public final void errorf(String message, Object arg0, Object arg1, Object arg2, Object arg3, Object arg4, Object arg5, Object arg6) {
-    logIfEnabled(Level.ERROR, formattedFactory().newMessage(message, arg0, arg1, arg2, arg3, arg4, arg5, arg6));
+    logIfEnabled(Level.ERROR, formattedFactory(), message, arg0, arg1, arg2, arg3, arg4, arg5, arg6);
   }
 
   public final void errorf(String message, Object arg0, Object arg1, Object arg2, Object arg3, Object arg4, Object arg5, Object arg6, Object arg7) {
-    logIfEnabled(Level.ERROR, formattedFactory().newMessage(message, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7));
+    logIfEnabled(Level.ERROR, formattedFactory(), message, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7);
   }
 
   public final void errorf(String message, Object arg0, Object arg1, Object arg2, Object arg3, Object arg4, Object arg5, Object arg6, Object arg7, Object arg8) {
-    logIfEnabled(Level.ERROR, formattedFactory().newMessage(message, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8));
+    logIfEnabled(Level.ERROR, formattedFactory(), message, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8);
   }
 
   public final void errorf(String message, Object arg0, Object arg1, Object arg2, Object arg3, Object arg4, Object arg5, Object arg6, Object arg7, Object arg8, Object arg9) {
-    logIfEnabled(Level.ERROR, formattedFactory().newMessage(message, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9));
+    logIfEnabled(Level.ERROR, formattedFactory(), message, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9);
   }
 
   public final boolean fatalEnabled() {
@@ -574,104 +679,104 @@ public final class Logger {
   }
 
   public final void fatal(final String message, final Object... params) {
-    logIfEnabled(Level.FATAL, defaultFactory().newMessage(message, params));
+    logIfEnabled(Level.FATAL, defaultFactory(), message, params);
   }
 
   public final void fatal(String message, Object arg0) {
-    logIfEnabled(Level.FATAL, defaultFactory().newMessage(message, arg0));
+    logIfEnabled(Level.FATAL, defaultFactory(), message, arg0);
   }
 
   public final void fatal(String message, Object arg0, Object arg1) {
-    logIfEnabled(Level.FATAL, defaultFactory().newMessage(message, arg0, arg1));
+    logIfEnabled(Level.FATAL, defaultFactory(), message, arg0, arg1);
   }
 
   public final void fatal(String message, Object arg0, Object arg1, Object arg2) {
-    logIfEnabled(Level.FATAL, defaultFactory().newMessage(message, arg0, arg1, arg2));
+    logIfEnabled(Level.FATAL, defaultFactory(), message, arg0, arg1, arg2);
   }
 
   public final void fatal(String message, Object arg0, Object arg1, Object arg2, Object arg3) {
-    logIfEnabled(Level.FATAL, defaultFactory().newMessage(message, arg0, arg1, arg2, arg3));
+    logIfEnabled(Level.FATAL, defaultFactory(), message, arg0, arg1, arg2, arg3);
   }
 
   public final void fatal(String message, Object arg0, Object arg1, Object arg2, Object arg3, Object arg4) {
-    logIfEnabled(Level.FATAL, defaultFactory().newMessage(message, arg0, arg1, arg2, arg3, arg4));
+    logIfEnabled(Level.FATAL, defaultFactory(), message, arg0, arg1, arg2, arg3, arg4);
   }
 
   public final void fatal(String message, Object arg0, Object arg1, Object arg2, Object arg3, Object arg4, Object arg5) {
-    logIfEnabled(Level.FATAL, defaultFactory().newMessage(message, arg0, arg1, arg2, arg3, arg4, arg5));
+    logIfEnabled(Level.FATAL, defaultFactory(), message, arg0, arg1, arg2, arg3, arg4, arg5);
   }
 
   public final void fatal(String message, Object arg0, Object arg1, Object arg2, Object arg3, Object arg4, Object arg5, Object arg6) {
-    logIfEnabled(Level.FATAL, defaultFactory().newMessage(message, arg0, arg1, arg2, arg3, arg4, arg5, arg6));
+    logIfEnabled(Level.FATAL, defaultFactory(), message, arg0, arg1, arg2, arg3, arg4, arg5, arg6);
   }
 
   public final void fatal(String message, Object arg0, Object arg1, Object arg2, Object arg3, Object arg4, Object arg5, Object arg6, Object arg7) {
-    logIfEnabled(Level.FATAL, defaultFactory().newMessage(message, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7));
+    logIfEnabled(Level.FATAL, defaultFactory(), message, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7);
   }
 
   public final void fatal(String message, Object arg0, Object arg1, Object arg2, Object arg3, Object arg4, Object arg5, Object arg6, Object arg7, Object arg8) {
-    logIfEnabled(Level.FATAL, defaultFactory().newMessage(message, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8));
+    logIfEnabled(Level.FATAL, defaultFactory(), message, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8);
   }
 
   public final void fatal(String message, Object arg0, Object arg1, Object arg2, Object arg3, Object arg4, Object arg5, Object arg6, Object arg7, Object arg8, Object arg9) {
-    logIfEnabled(Level.FATAL, defaultFactory().newMessage(message, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9));
+    logIfEnabled(Level.FATAL, defaultFactory(), message, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9);
   }
 
   public final void fatalf(final String message, final Object... params) {
-    logIfEnabled(Level.FATAL, formattedFactory().newMessage(message, params));
+    logIfEnabled(Level.FATAL, formattedFactory(), message, params);
   }
 
   public final void fatalf(String message, Object arg0) {
-    logIfEnabled(Level.FATAL, formattedFactory().newMessage(message, arg0));
+    logIfEnabled(Level.FATAL, formattedFactory(), message, arg0);
   }
 
   public final void fatalf(String message, Object arg0, Object arg1) {
-    logIfEnabled(Level.FATAL, formattedFactory().newMessage(message, arg0, arg1));
+    logIfEnabled(Level.FATAL, formattedFactory(), message, arg0, arg1);
   }
 
   public final void fatalf(String message, Object arg0, Object arg1, Object arg2) {
-    logIfEnabled(Level.FATAL, formattedFactory().newMessage(message, arg0, arg1, arg2));
+    logIfEnabled(Level.FATAL, formattedFactory(), message, arg0, arg1, arg2);
   }
 
   public final void fatalf(String message, Object arg0, Object arg1, Object arg2, Object arg3) {
-    logIfEnabled(Level.FATAL, formattedFactory().newMessage(message, arg0, arg1, arg2, arg3));
+    logIfEnabled(Level.FATAL, formattedFactory(), message, arg0, arg1, arg2, arg3);
   }
 
   public final void fatalf(String message, Object arg0, Object arg1, Object arg2, Object arg3, Object arg4) {
-    logIfEnabled(Level.FATAL, formattedFactory().newMessage(message, arg0, arg1, arg2, arg3, arg4));
+    logIfEnabled(Level.FATAL, formattedFactory(), message, arg0, arg1, arg2, arg3, arg4);
   }
 
   public final void fatalf(String message, Object arg0, Object arg1, Object arg2, Object arg3, Object arg4, Object arg5) {
-    logIfEnabled(Level.FATAL, formattedFactory().newMessage(message, arg0, arg1, arg2, arg3, arg4, arg5));
+    logIfEnabled(Level.FATAL, formattedFactory(), message, arg0, arg1, arg2, arg3, arg4, arg5);
   }
 
   public final void fatalf(String message, Object arg0, Object arg1, Object arg2, Object arg3, Object arg4, Object arg5, Object arg6) {
-    logIfEnabled(Level.FATAL, formattedFactory().newMessage(message, arg0, arg1, arg2, arg3, arg4, arg5, arg6));
+    logIfEnabled(Level.FATAL, formattedFactory(), message, arg0, arg1, arg2, arg3, arg4, arg5, arg6);
   }
 
   public final void fatalf(String message, Object arg0, Object arg1, Object arg2, Object arg3, Object arg4, Object arg5, Object arg6, Object arg7) {
-    logIfEnabled(Level.FATAL, formattedFactory().newMessage(message, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7));
+    logIfEnabled(Level.FATAL, formattedFactory(), message, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7);
   }
 
   public final void fatalf(String message, Object arg0, Object arg1, Object arg2, Object arg3, Object arg4, Object arg5, Object arg6, Object arg7, Object arg8) {
-    logIfEnabled(Level.FATAL, formattedFactory().newMessage(message, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8));
+    logIfEnabled(Level.FATAL, formattedFactory(), message, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8);
   }
 
   public final void fatalf(String message, Object arg0, Object arg1, Object arg2, Object arg3, Object arg4, Object arg5, Object arg6, Object arg7, Object arg8, Object arg9) {
-    logIfEnabled(Level.FATAL, formattedFactory().newMessage(message, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9));
+    logIfEnabled(Level.FATAL, formattedFactory(), message, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9);
   }
 
   public final void traceEntry() {
     final StackTraceElement location = getLocation();
-    logIfEnabled(Level.TRACE, defaultFactory().newMessage(location.getMethodName()), location);
+    logIfEnabled(Level.TRACE, defaultFactory(), location.getMethodName());
   }
 
   public final void traceEntry(final String message, final Object... params) {
-    logIfEnabled(Level.TRACE, defaultFactory().newMessage(message, params));
+    logIfEnabled(Level.TRACE, defaultFactory(), message, params);
   }
 
   public final void tracefEntry(final String message, final Object... params) {
-    logIfEnabled(Level.TRACE, formattedFactory().newMessage(message, params));
+    logIfEnabled(Level.TRACE, formattedFactory(), message, params);
   }
 
   private StackTraceElement getLocation() {