diff --git a/aws-lambda-java-runtime-interface-client/build-tools/checkstyle.xml b/aws-lambda-java-runtime-interface-client/build-tools/checkstyle.xml
new file mode 100644
index 00000000..263834dc
--- /dev/null
+++ b/aws-lambda-java-runtime-interface-client/build-tools/checkstyle.xml
@@ -0,0 +1,115 @@
+<?xml version="1.0"?>
+<!DOCTYPE module PUBLIC
+"-//Puppy Crawl//DTD Check Configuration 1.2//EN"
+"http://www.puppycrawl.com/dtds/configuration_1_2.dtd">
+
+<module name="Checker">
+  <module name="NewlineAtEndOfFile" />
+  <module name="OrderedProperties" />
+  <module name="FileTabCharacter" />
+  <module name="Header">
+    <property name="header"
+      value="/*\nCopyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\nSPDX-License-Identifier: Apache-2.0\n*/\n"/>
+  </module>
+  <module name="FileTabCharacter"/>
+  <module name="TreeWalker">
+    <module name="UnusedImports"/>
+    <module name="NeedBraces"/>
+    <module name="EqualsHashCode"/>
+    <module name="EmptyStatement"/>
+    <module name="EqualsAvoidNull"/>
+    <module name="MissingSwitchDefault"/>
+    <module name="MultipleVariableDeclarations"/>
+    <module name="OneStatementPerLine"/>
+    <module name="RedundantImport"/>
+    <module name="AvoidStarImport"/>
+    <module name="DefaultComesLast"/>
+    <module name="SuppressWarningsHolder" />
+    <module name="EmptyForInitializerPad" />
+    <module name="GenericWhitespace" />
+    <module name="MethodParamPad" />
+    <module name="NoLineWrap" />
+    <module name="NoWhitespaceAfter" />
+    <module name="NoWhitespaceBefore" />
+    <module name="NoWhitespaceBeforeCaseDefaultColon" />
+    <module name="OperatorWrap" />
+    <module name="ParenPad" />
+    <module name="SeparatorWrap" />
+    <module name="SingleSpaceSeparator" />
+    <module name="TypecastParenPad" />
+    <module name="WhitespaceAfter" />
+    <module name="WhitespaceAround" />
+    <module name="AvoidNestedBlocks" />
+    <module name="EmptyBlock" />
+    <module name="EmptyCatchBlock" />
+    <module name="LeftCurly" />
+    <module name="NeedBraces" />
+    <module name="RightCurly" />
+    <module name="InnerTypeLast" />
+    <module name="MutableException" />
+    <module name="OneTopLevelClass" />
+    <module name="ThrowsCount" />
+
+    <module name="AvoidNoArgumentSuperConstructorCall" />
+    <module name="CovariantEquals" />
+    <module name="DeclarationOrder" />
+    <module name="DefaultComesLast" />
+    <module name="EmptyStatement" />
+    <module name="EqualsAvoidNull" />
+    <module name="EqualsHashCode" />
+    <module name="FallThrough" />
+    <module name="IllegalInstantiation" />
+    <module name="IllegalToken" />
+    <module name="IllegalTokenText" />
+    <module name="IllegalType" />
+    <module name="InnerAssignment" />
+    <module name="MatchXpath" />
+    <module name="MissingSwitchDefault" />
+    <module name="ModifiedControlVariable" />
+    <module name="MultipleVariableDeclarations" />
+    <module name="NestedForDepth" />
+    <module name="NestedTryDepth" />
+    <module name="NoArrayTrailingComma" />
+    <module name="NoClone" />
+    <module name="NoEnumTrailingComma" />
+    <module name="NoFinalizer" />
+    <module name="OneStatementPerLine" />
+    <module name="OverloadMethodsDeclarationOrder" />
+    <module name="PackageDeclaration" />
+    <module name="ParameterAssignment" />
+    <module name="RequireThis" />
+    <module name="SimplifyBooleanExpression" />
+    <module name="SimplifyBooleanReturn" />
+    <module name="StringLiteralEquality" />
+    <module name="SuperClone" />
+    <module name="SuperFinalize" />
+    <module name="UnnecessarySemicolonAfterOuterTypeDeclaration" />
+    <module name="UnnecessarySemicolonAfterTypeMemberDeclaration" />
+    <module name="UnnecessarySemicolonInEnumeration" />
+    <module name="UnnecessarySemicolonInTryWithResources" />
+    <module name="VariableDeclarationUsageDistance" />
+
+    <module name="ImportOrder" />
+    <module name="RedundantImport" />
+    <module name="UnusedImports" />
+
+    <module name="ArrayTypeStyle" />
+    <module name="AvoidEscapedUnicodeCharacters" />
+    <module name="CommentsIndentation" />
+    <module name="DescendantToken" />
+    <module name="Indentation" />
+    <module name="NoCodeInFile" />
+    <module name="OuterTypeFilename" />
+    <module name="TodoComment" />
+    <module name="TrailingComment" />
+    <module name="UpperEll" />
+
+    <module name="LambdaBodyLength" />
+    <module name="MethodCount" />
+    <module name="MethodLength" />
+    <module name="OuterTypeNumber" />
+    <module name="RecordComponentNumber" />
+  </module>
+
+  <module name="SuppressWarningsFilter" />
+</module>
\ No newline at end of file
diff --git a/aws-lambda-java-runtime-interface-client/pom.xml b/aws-lambda-java-runtime-interface-client/pom.xml
index a4f022a4..24e73a8d 100644
--- a/aws-lambda-java-runtime-interface-client/pom.xml
+++ b/aws-lambda-java-runtime-interface-client/pom.xml
@@ -38,6 +38,7 @@
         <maven-install-plugin.version>2.4</maven-install-plugin.version>
         <maven-deploy-plugin.version>3.1.1</maven-deploy-plugin.version>
         <junit-jupiter.version>5.9.2</junit-jupiter.version>
+        <maven-checkstyle-plugin.version>3.4.0</maven-checkstyle-plugin.version>
         <!--
             The test/integration/codebuild/buildspec.*.yml files will set -DmultiArch=false
             as a workaround for executing within Github Actions. At time of writing (2022-04-08) the
@@ -238,6 +239,26 @@
                     </execution>
                 </executions>
             </plugin>
+              <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-checkstyle-plugin</artifactId>
+                <version>${maven-checkstyle-plugin.version}</version>
+                <configuration>
+                    <configLocation>build-tools/checkstyle.xml</configLocation>
+                    <failOnViolation>true</failOnViolation>
+                    <consoleOutput>true</consoleOutput>
+                    <logViolationsToConsole>true</logViolationsToConsole>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>validate</id>
+                        <phase>validate</phase>
+                        <goals>
+                            <goal>check</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
 
diff --git a/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/crac/CheckpointException.java b/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/crac/CheckpointException.java
index 8793bfcb..f802ad5f 100644
--- a/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/crac/CheckpointException.java
+++ b/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/crac/CheckpointException.java
@@ -1,12 +1,12 @@
 /*
- *  Copyright 2023 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- */
+Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+SPDX-License-Identifier: Apache-2.0
+*/
 
 package com.amazonaws.services.lambda.crac;
 
 public class CheckpointException extends Exception {
     private static final long serialVersionUID = -4956873658083157585L;
     public CheckpointException() {
-        super();
     }
 }
diff --git a/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/crac/Context.java b/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/crac/Context.java
index 2fc22cdd..d62ef014 100644
--- a/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/crac/Context.java
+++ b/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/crac/Context.java
@@ -1,6 +1,7 @@
 /*
- *  Copyright 2023 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- */
+Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+SPDX-License-Identifier: Apache-2.0
+*/
 
 package com.amazonaws.services.lambda.crac;
 
diff --git a/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/crac/ContextImpl.java b/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/crac/ContextImpl.java
index 87fb0ff2..04b1436a 100644
--- a/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/crac/ContextImpl.java
+++ b/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/crac/ContextImpl.java
@@ -1,6 +1,7 @@
 /*
- *  Copyright 2023 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- */
+Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+SPDX-License-Identifier: Apache-2.0
+*/
 
 package com.amazonaws.services.lambda.crac;
 
@@ -57,19 +58,19 @@ public synchronized void register(Resource resource) {
     }
 
     private List<Resource> getCheckpointQueueReverseOrderOfRegistration() {
-        return checkpointQueue.entrySet()
-                .stream()
-                .sorted((r1, r2) -> (int) (r2.getValue() - r1.getValue()))
-                .map(Map.Entry::getKey)
-                .collect(Collectors.toList());
+        return checkpointQueue.entrySet().
+            stream().
+            sorted((r1, r2) -> (int) (r2.getValue() - r1.getValue())).
+            map(Map.Entry::getKey).
+            collect(Collectors.toList());
     }
 
     private List<Resource> getCheckpointQueueForwardOrderOfRegistration() {
-        return checkpointQueue.entrySet()
-                .stream()
-                .sorted((r1, r2) -> (int) (r1.getValue() - r2.getValue()))
-                .map(Map.Entry::getKey)
-                .collect(Collectors.toList());
+        return checkpointQueue.entrySet().
+            stream().
+            sorted((r1, r2) -> (int) (r1.getValue() - r2.getValue())).
+            map(Map.Entry::getKey).
+            collect(Collectors.toList());
     }
 
     private void executeBeforeCheckpointHooks() throws CheckpointException {
diff --git a/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/crac/Core.java b/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/crac/Core.java
index b6a7d9e9..7e0b24a2 100644
--- a/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/crac/Core.java
+++ b/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/crac/Core.java
@@ -1,6 +1,7 @@
 /*
- *  Copyright 2023 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- */
+Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+SPDX-License-Identifier: Apache-2.0
+*/
 
 package com.amazonaws.services.lambda.crac;
 
@@ -9,11 +10,11 @@
  */
 public final class Core {
 
+    private static Context<Resource> globalContext = new ContextImpl();
+
     private Core() {
     }
 
-    private static Context<Resource> globalContext = new ContextImpl();
-
     public static Context<Resource> getGlobalContext() {
         return globalContext;
     }
diff --git a/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/crac/DNSManager.java b/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/crac/DNSManager.java
index 4c1a6cd5..6c485ec8 100644
--- a/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/crac/DNSManager.java
+++ b/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/crac/DNSManager.java
@@ -7,4 +7,4 @@
 
 class DNSManager {
     static native void clearCache();
-}
\ No newline at end of file
+}
diff --git a/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/crac/Resource.java b/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/crac/Resource.java
index 8c8d91c3..7ef93320 100644
--- a/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/crac/Resource.java
+++ b/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/crac/Resource.java
@@ -1,6 +1,7 @@
 /*
- *  Copyright 2023 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- */
+Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+SPDX-License-Identifier: Apache-2.0
+*/
 
 package com.amazonaws.services.lambda.crac;
 
diff --git a/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/crac/RestoreException.java b/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/crac/RestoreException.java
index d045a0ba..cef38e00 100644
--- a/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/crac/RestoreException.java
+++ b/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/crac/RestoreException.java
@@ -1,6 +1,7 @@
 /*
- *  Copyright 2023 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- */
+Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+SPDX-License-Identifier: Apache-2.0
+*/
 
 package com.amazonaws.services.lambda.crac;
 
@@ -8,6 +9,5 @@ public class RestoreException extends Exception {
     private static final long serialVersionUID = -823900409868237860L;
 
     public RestoreException() {
-        super();
     }
 }
diff --git a/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/runtime/api/client/AWSLambda.java b/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/runtime/api/client/AWSLambda.java
index b7c5641a..75513d36 100644
--- a/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/runtime/api/client/AWSLambda.java
+++ b/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/runtime/api/client/AWSLambda.java
@@ -23,7 +23,6 @@
 import com.amazonaws.services.lambda.runtime.logging.LogFormat;
 import com.amazonaws.services.lambda.runtime.logging.LogLevel;
 import com.amazonaws.services.lambda.runtime.serialization.util.ReflectUtil;
-
 import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.FileDescriptor;
@@ -50,6 +49,8 @@
  */
 public class AWSLambda {
 
+    protected static URLClassLoader customerClassLoader;
+
     private static final String TRUST_STORE_PROPERTY = "javax.net.ssl.trustStore";
 
     private static final String JAVA_SECURITY_PROPERTIES = "java.security.properties";
@@ -68,8 +69,6 @@ public class AWSLambda {
 
     private static final String AWS_LAMBDA_INITIALIZATION_TYPE = System.getenv(ReservedRuntimeEnvironmentVariables.AWS_LAMBDA_INITIALIZATION_TYPE);
 
-    protected static URLClassLoader customerClassLoader;
-
     private static LambdaRuntimeApiClient runtimeClient;
 
     static {
@@ -238,7 +237,8 @@ private static void startRuntime(String handler, LambdaContextLogger lambdaLogge
             try {
                 payload = requestHandler.call(request);
                 runtimeClient.reportInvocationSuccess(request.getId(), payload.toByteArray());
-                boolean ignored = Thread.interrupted(); // clear interrupted flag in case if it was set by user's code
+                // clear interrupted flag in case if it was set by user's code
+                boolean ignored = Thread.interrupted();
             } catch (UserFault f) {
                 shouldExit = f.fatal;
                 userFault = f;
diff --git a/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/runtime/api/client/ClasspathLoader.java b/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/runtime/api/client/ClasspathLoader.java
index 28f11bbf..4204f301 100644
--- a/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/runtime/api/client/ClasspathLoader.java
+++ b/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/runtime/api/client/ClasspathLoader.java
@@ -1,4 +1,7 @@
-/* Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. */
+/*
+Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+SPDX-License-Identifier: Apache-2.0
+*/
 
 package com.amazonaws.services.lambda.runtime.api.client;
 
diff --git a/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/runtime/api/client/CustomerClassLoader.java b/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/runtime/api/client/CustomerClassLoader.java
index ee554c14..b8aabbf3 100644
--- a/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/runtime/api/client/CustomerClassLoader.java
+++ b/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/runtime/api/client/CustomerClassLoader.java
@@ -1,4 +1,7 @@
-/* Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. */
+/*
+Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+SPDX-License-Identifier: Apache-2.0
+*/
 
 package com.amazonaws.services.lambda.runtime.api.client;
 
@@ -24,7 +27,8 @@ class CustomerClassLoader extends URLClassLoader {
         @Override
         public boolean accept(File dir, String name) {
             int offset = name.length() - 4;
-            if (offset <= 0) { /* must be at least A.jar */
+            // must be at least A.jar
+            if (offset <= 0) {
                 return false;
             } else {
                 return name.startsWith(".jar", offset);
diff --git a/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/runtime/api/client/EventHandlerLoader.java b/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/runtime/api/client/EventHandlerLoader.java
index 7c23be6e..096bb862 100644
--- a/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/runtime/api/client/EventHandlerLoader.java
+++ b/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/runtime/api/client/EventHandlerLoader.java
@@ -1,4 +1,7 @@
-/* Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. */
+/*
+Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+SPDX-License-Identifier: Apache-2.0
+*/
 
 package com.amazonaws.services.lambda.runtime.api.client;
 
@@ -21,7 +24,6 @@
 import com.amazonaws.services.lambda.runtime.serialization.factories.JacksonFactory;
 import com.amazonaws.services.lambda.runtime.serialization.util.Functions;
 import com.amazonaws.services.lambda.runtime.serialization.util.ReflectUtil;
-
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -42,8 +44,9 @@
 import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
-
-import static com.amazonaws.services.lambda.runtime.api.client.UserFault.*;
+import static com.amazonaws.services.lambda.runtime.api.client.UserFault.filterStackTrace;
+import static com.amazonaws.services.lambda.runtime.api.client.UserFault.makeUserFault;
+import static com.amazonaws.services.lambda.runtime.api.client.UserFault.trace;
 
 public final class EventHandlerLoader {
     private static final byte[] _JsonNull = new byte[]{'n', 'u', 'l', 'l'};
@@ -54,8 +57,42 @@ private enum Platform {
         UNKNOWN
     }
 
+    private static volatile PojoSerializer<LambdaClientContext> contextSerializer;
+    private static volatile PojoSerializer<LambdaCognitoIdentity> cognitoSerializer;
+
     private static final EnumMap<Platform, Map<Type, PojoSerializer<Object>>> typeCache = new EnumMap<>(Platform.class);
 
+    private static final Comparator<Method> methodPriority = new Comparator<Method>() {
+        public int compare(Method lhs, Method rhs) {
+
+            //1. Non bridge methods are preferred over bridge methods.
+            if (!lhs.isBridge() && rhs.isBridge()) {
+                return -1;
+            } else if (!rhs.isBridge() && lhs.isBridge()) {
+                return 1;
+            }
+
+            //2. We prefer longer signatures to shorter signatures. Except we count a method whose last argument is
+            //Context as having 1 more argument than it really does. This is a stupid thing to do, but we
+            //need to keep it for back compat reasons.
+            Class<?>[] lParams = lhs.getParameterTypes();
+            Class<?>[] rParams = rhs.getParameterTypes();
+
+            int lParamCompareLength = lParams.length;
+            int rParamCompareLength = rParams.length;
+
+            if (lastParameterIsContext(lParams)) {
+                ++lParamCompareLength;
+            }
+
+            if (lastParameterIsContext(rParams)) {
+                ++rParamCompareLength;
+            }
+
+            return -Integer.compare(lParamCompareLength, rParamCompareLength);
+        }
+    };
+
     private EventHandlerLoader() {
     }
 
@@ -105,9 +142,6 @@ private static PojoSerializer<Object> getSerializerCached(Platform platform, Typ
         return serializer;
     }
 
-    private static volatile PojoSerializer<LambdaClientContext> contextSerializer;
-    private static volatile PojoSerializer<LambdaCognitoIdentity> cognitoSerializer;
-
     private static PojoSerializer<LambdaClientContext> getContextSerializer() {
         if (contextSerializer == null) {
             contextSerializer = GsonFactory.getInstance().getSerializer(LambdaClientContext.class);
@@ -152,761 +186,733 @@ private static boolean isVoid(Type type) {
         return Void.TYPE.equals(type) || (type instanceof Class) && Void.class.isAssignableFrom((Class<?>) type);
     }
 
-    /**
-     * Wraps a RequestHandler as a lower level stream handler using supplied types.
-     * Optional types mean that the input and/or output should be ignored respectiveley
-     */
-    @SuppressWarnings("rawtypes")
-    private static final class PojoHandlerAsStreamHandler implements RequestStreamHandler {
-
-        public RequestHandler innerHandler;
-        public final Optional<Type> inputType;
-        public final Optional<Type> outputType;
-
-        public PojoHandlerAsStreamHandler(
-                RequestHandler innerHandler,
-                Optional<Type> inputType,
-                Optional<Type> outputType
-        ) {
-            this.innerHandler = innerHandler;
-            this.inputType = inputType;
-            this.outputType = outputType;
-
-
-            if (inputType.isPresent()) {
-                getSerializerCached(Platform.UNKNOWN, inputType.get());
-            }
-
-            if (outputType.isPresent()) {
-                getSerializerCached(Platform.UNKNOWN, outputType.get());
+    private static <T> Constructor<T> getConstructor(Class<T> clazz) throws Exception {
+        final Constructor<T> constructor;
+        try {
+            constructor = clazz.getConstructor();
+        } catch (NoSuchMethodException e) {
+            if (clazz.getEnclosingClass() != null && !Modifier.isStatic(clazz.getModifiers())) {
+                throw new Exception("Class "
+                        + clazz.getName()
+                        + " cannot be instantiated because it is a non-static inner class");
+            } else {
+                throw new Exception("Class " + clazz.getName() + " has no public zero-argument constructor", e);
             }
         }
+        return constructor;
+    }
 
-        @SuppressWarnings("unchecked")
-        @Override
-        public void handleRequest(InputStream inputStream, OutputStream outputStream, Context context)
-                throws IOException {
-            final Object input;
-            final Platform platform = getPlatform(context);
-            try {
-                if (inputType.isPresent()) {
-                    input = getSerializerCached(platform, inputType.get()).fromJson(inputStream);
-                } else {
-                    input = null;
-                }
-            } catch (Throwable t) {
-                throw new RuntimeException("An error occurred during JSON parsing", filterStackTrace(t));
-            }
-
-            final Object output;
-            try {
-                output = innerHandler.handleRequest(input, context);
-            } catch (Throwable t) {
-                throw UnsafeUtil.throwException(filterStackTrace(t));
-            }
-
-            try {
-                if (outputType.isPresent()) {
-                    PojoSerializer<Object> serializer = getSerializerCached(platform, outputType.get());
-                    serializer.toJson(output, outputStream);
-                } else {
-                    outputStream.write(_JsonNull);
-                }
-            } catch (Throwable t) {
-                throw new RuntimeException("An error occurred during JSON serialization of response", t);
-            }
+    private static <T> T newInstance(Constructor<? extends T> constructor) {
+        try {
+            return constructor.newInstance();
+        } catch (UserFault e) {
+            throw e;
+        } catch (InvocationTargetException e) {
+            throw makeUserFault(e.getCause() == null ? e : e.getCause(), true);
+        } catch (InstantiationException e) {
+            throw UnsafeUtil.throwException(e.getCause() == null ? e : e.getCause());
+        } catch (IllegalAccessException e) {
+            throw UnsafeUtil.throwException(e);
         }
     }
 
     /**
-     * Wraps a java.lang.reflect.Method as a POJO RequestHandler
+     * perform a breadth-first search for the first parameterized type for iface
+     *
+     * @return null of no type found. Otherwise the type found.
      */
-    private static final class PojoMethodRequestHandler implements RequestHandler<Object, Object> {
-        public final Method m;
-        public final Type pType;
-        public final Object instance;
-        public final boolean needsContext;
-        public final int argSize;
-
-        public PojoMethodRequestHandler(Method m, Type pType, Type rType, Object instance, boolean needsContext) {
-            this.m = m;
-            this.pType = pType;
-            this.instance = instance;
-            this.needsContext = needsContext;
-            this.argSize = (needsContext ? 1 : 0) + (pType != null ? 1 : 0);
-        }
+    private static Type[] findInterfaceParameters(Class<?> clazz, Class<?> iface) {
+        LinkedList<ClassContext> clazzes = new LinkedList<>();
+        clazzes.addFirst(new ClassContext(clazz, (Type[]) null));
+        while (!clazzes.isEmpty()) {
+            final ClassContext curContext = clazzes.removeLast();
+            Type[] interfaces = curContext.clazz.getGenericInterfaces();
 
-        public static PojoMethodRequestHandler fromMethod(
-                Class<?> clazz,
-                Method m,
-                Type pType,
-                Type rType,
-                boolean needsContext
-        ) throws Exception {
-            final Object instance;
-            if (Modifier.isStatic(m.getModifiers())) {
-                instance = null;
-            } else {
-                instance = newInstance(getConstructor(clazz));
+            for (Type type : interfaces) {
+                if (type instanceof ParameterizedType) {
+                    ParameterizedType candidate = (ParameterizedType) type;
+                    Type rawType = candidate.getRawType();
+                    if (!(rawType instanceof Class)) {
+                        //should be impossible
+                        System.err.println("raw type is not a class: " + rawType);
+                        continue;
+                    }
+                    Class<?> rawClass = (Class<?>) rawType;
+                    if (iface.isAssignableFrom(rawClass)) {
+                        return new ClassContext(candidate, curContext).actualTypeArguments;
+                    } else {
+                        clazzes.addFirst(new ClassContext(candidate, curContext));
+                    }
+                } else if (type instanceof Class) {
+                    clazzes.addFirst(new ClassContext((Class<?>) type, curContext));
+                } else {
+                    //should never happen?
+                    System.err.println("Unexpected type class " + type.getClass().getName());
+                }
             }
 
-            return new PojoMethodRequestHandler(m, pType, rType, instance, needsContext);
-        }
-
-        public static LambdaRequestHandler makeRequestHandler(
-                Class<?> clazz,
-                Method m,
-                Type pType,
-                Type rType,
-                boolean needsContext
-        ) {
-            try {
-                return wrapPojoHandler(fromMethod(clazz, m, pType, rType, needsContext), pType, rType);
-            } catch (UserFault f) {
-                return new UserFaultHandler(f);
-            } catch (Throwable t) {
-                return new UserFaultHandler(makeUserFault(t));
+            final Type superClass = curContext.clazz.getGenericSuperclass();
+            if (superClass instanceof ParameterizedType) {
+                clazzes.addFirst(new ClassContext((ParameterizedType) superClass, curContext));
+            } else if (superClass != null) {
+                clazzes.addFirst(new ClassContext((Class<?>) superClass, curContext));
             }
         }
+        return null;
+    }
 
-        @Override
-        public Object handleRequest(Object input, Context context) {
-            final Object[] args = new Object[argSize];
-            int idx = 0;
 
-            if (pType != null) {
-                args[idx++] = input;
-            }
+    @SuppressWarnings({"rawtypes"})
+    private static LambdaRequestHandler wrapRequestHandlerClass(final Class<? extends RequestHandler> clazz) {
+        Type[] ptypes = findInterfaceParameters(clazz, RequestHandler.class);
+        if (ptypes == null) {
+            return new UserFaultHandler(makeUserFault("Class "
+                    + clazz.getName()
+                    + " does not implement RequestHandler with concrete type parameters"));
+        }
+        if (ptypes.length != 2) {
+            return new UserFaultHandler(makeUserFault(
+                    "Invalid class signature for RequestHandler. Expected two generic types, got " + ptypes.length));
+        }
 
-            if (this.needsContext) {
-                args[idx++] = context;
-            }
+        for (Type t : ptypes) {
+            if (t instanceof TypeVariable) {
+                Type[] bounds = ((TypeVariable) t).getBounds();
+                boolean foundBound = false;
+                if (bounds != null) {
+                    for (Type bound : bounds) {
+                        if (!Object.class.equals(bound)) {
+                            foundBound = true;
+                            break;
+                        }
+                    }
+                }
 
-            try {
-                return m.invoke(this.instance, args);
-            } catch (InvocationTargetException e) {
-                if (e.getCause() != null) {
-                    throw UnsafeUtil.throwException(filterStackTrace(e.getCause()));
-                } else {
-                    throw UnsafeUtil.throwException(filterStackTrace(e));
+                if (!foundBound) {
+                    return new UserFaultHandler(makeUserFault("Class " + clazz.getName()
+                            + " does not implement RequestHandler with concrete type parameters: parameter "
+                            + t + " has no upper bound."));
                 }
-            } catch (Throwable t) {
-                throw UnsafeUtil.throwException(filterStackTrace(t));
             }
         }
-    }
 
-    /**
-     * Wraps a java.lang.reflect.Method object as a RequestStreamHandler
-     */
-    private static final class StreamMethodRequestHandler implements RequestStreamHandler {
-        public final Method m;
-        public final Object instance;
-        public final boolean needsInput;
-        public final boolean needsOutput;
-        public final boolean needsContext;
-        public final int argSize;
+        final Type pType = ptypes[0];
+        final Type rType = ptypes[1];
 
-        public StreamMethodRequestHandler(
-                Method m,
-                Object instance,
-                boolean needsInput,
-                boolean needsOutput,
-                boolean needsContext
-        ) {
-            this.m = m;
-            this.instance = instance;
-            this.needsInput = needsInput;
-            this.needsOutput = needsOutput;
-            this.needsContext = needsContext;
-            this.argSize = (needsInput ? 1 : 0) + (needsOutput ? 1 : 0) + (needsContext ? 1 : 0);
+        final Constructor<? extends RequestHandler> constructor;
+        try {
+            constructor = getConstructor(clazz);
+            return wrapPojoHandler(newInstance(constructor), pType, rType);
+        } catch (UserFault f) {
+            return new UserFaultHandler(f);
+        } catch (Throwable e) {
+            return new UserFaultHandler(makeUserFault(e));
         }
+    }
 
-        public static StreamMethodRequestHandler fromMethod(
-                Class<?> clazz,
-                Method m,
-                boolean needsInput,
-                boolean needsOutput,
-                boolean needsContext
-        ) throws Exception {
-            if (!isVoid(m.getReturnType())) {
-                System.err.println("Will ignore return type " + m.getReturnType() + " on byte stream handler");
-            }
-            final Object instance = Modifier.isStatic(m.getModifiers())
-                    ? null
-                    : newInstance(getConstructor(clazz));
+    private static LambdaRequestHandler wrapRequestStreamHandlerClass(final Class<? extends RequestStreamHandler> clazz) {
+        final Constructor<? extends RequestStreamHandler> constructor;
+        try {
+            constructor = getConstructor(clazz);
+            return wrapRequestStreamHandler(newInstance(constructor));
+        } catch (UserFault f) {
+            return new UserFaultHandler(f);
+        } catch (Throwable e) {
+            return new UserFaultHandler(makeUserFault(e));
+        }
+    }
 
-            return new StreamMethodRequestHandler(m, instance, needsInput, needsOutput, needsContext);
+    private static LambdaRequestHandler loadStreamingRequestHandler(Class<?> clazz) {
+        if (RequestStreamHandler.class.isAssignableFrom(clazz)) {
+            return wrapRequestStreamHandlerClass(clazz.asSubclass(RequestStreamHandler.class));
+        } else if (RequestHandler.class.isAssignableFrom(clazz)) {
+            return wrapRequestHandlerClass(clazz.asSubclass(RequestHandler.class));
+        } else {
+            return new UserFaultHandler(makeUserFault("Class does not implement an appropriate handler interface: "
+                    + clazz.getName()));
         }
+    }
 
-        public static LambdaRequestHandler makeRequestHandler(
-                Class<?> clazz,
-                Method m,
-                boolean needsInput,
-                boolean needsOutput,
-                boolean needsContext
-        ) {
-            try {
-                return wrapRequestStreamHandler(fromMethod(clazz, m, needsInput, needsOutput, needsContext));
-            } catch (UserFault f) {
-                return new UserFaultHandler(f);
-            } catch (Throwable t) {
-                return new UserFaultHandler(makeUserFault(t));
-            }
+    public static LambdaRequestHandler loadEventHandler(HandlerInfo handlerInfo) {
+        if (handlerInfo.methodName == null) {
+            return loadStreamingRequestHandler(handlerInfo.clazz);
+        } else {
+            return loadEventPojoHandler(handlerInfo);
         }
+    }
 
-        @Override
-        public void handleRequest(InputStream inputStream, OutputStream outputStream, Context context)
-                throws IOException {
-            final Object[] args = new Object[argSize];
-            int idx = 0;
+    private static Optional<LambdaRequestHandler> getOneLengthHandler(
+            Class<?> clazz,
+            Method m,
+            Type pType,
+            Type rType
+    ) {
+        if (InputStream.class.equals(pType)) {
+            return Optional.of(StreamMethodRequestHandler.makeRequestHandler(clazz, m, true, false, false));
+        } else if (OutputStream.class.equals(pType)) {
+            return Optional.of(StreamMethodRequestHandler.makeRequestHandler(clazz, m, false, true, false));
+        } else if (isContext(pType)) {
+            return Optional.of(PojoMethodRequestHandler.makeRequestHandler(clazz, m, null, rType, true));
+        } else {
+            return Optional.of(PojoMethodRequestHandler.makeRequestHandler(clazz, m, pType, rType, false));
+        }
+    }
 
-            if (needsInput) {
-                args[idx++] = inputStream;
+    private static Optional<LambdaRequestHandler> getTwoLengthHandler(
+            Class<?> clazz,
+            Method m,
+            Type pType1,
+            Type pType2,
+            Type rType
+    ) {
+        if (OutputStream.class.equals(pType1)) {
+            if (isContext(pType2)) {
+                return Optional.of(StreamMethodRequestHandler.makeRequestHandler(clazz, m, false, true, true));
             } else {
-                inputStream.close();
-            }
-
-            if (needsOutput) {
-                args[idx++] = outputStream;
-            }
-
-            if (needsContext) {
-                args[idx++] = context;
+                System.err.println(
+                        "Ignoring two-argument overload because first argument type is OutputStream and second argument type is not Context");
+                return Optional.empty();
             }
-
-            try {
-                m.invoke(this.instance, args);
-                if (!needsOutput) {
-                    outputStream.write(_JsonNull);
-                }
-            } catch (InvocationTargetException e) {
-                if (e.getCause() != null) {
-                    throw UnsafeUtil.throwException(filterStackTrace(e.getCause()));
-                } else {
-                    throw UnsafeUtil.throwException(filterStackTrace(e));
-                }
-            } catch (Throwable t) {
-                throw UnsafeUtil.throwException(filterStackTrace(t));
+        } else if (isContext(pType1)) {
+            System.err.println("Ignoring two-argument overload because first argument type is Context");
+            return Optional.empty();
+        } else if (InputStream.class.equals(pType1)) {
+            if (OutputStream.class.equals(pType2)) {
+                return Optional.of(StreamMethodRequestHandler.makeRequestHandler(clazz, m, true, true, false));
+            } else if (isContext(pType2)) {
+                return Optional.of(StreamMethodRequestHandler.makeRequestHandler(clazz, m, true, false, true));
+            } else {
+                System.err.println("Ignoring two-argument overload because second parameter type, "
+                        + ReflectUtil.getRawClass(pType2).getName()
+                        + ", is not OutputStream.");
+                return Optional.empty();
             }
+        } else if (isContext(pType2)) {
+            return Optional.of(PojoMethodRequestHandler.makeRequestHandler(clazz, m, pType1, rType, true));
+        } else {
+            System.err.println("Ignoring two-argument overload because second parameter type is not Context");
+            return Optional.empty();
         }
     }
 
-    private static <T> Constructor<T> getConstructor(Class<T> clazz) throws Exception {
-        final Constructor<T> constructor;
-        try {
-            constructor = clazz.getConstructor();
-        } catch (NoSuchMethodException e) {
-            if (clazz.getEnclosingClass() != null && !Modifier.isStatic(clazz.getModifiers())) {
-                throw new Exception("Class "
-                        + clazz.getName()
-                        + " cannot be instantiated because it is a non-static inner class");
-            } else {
-                throw new Exception("Class " + clazz.getName() + " has no public zero-argument constructor", e);
-            }
+    private static Optional<LambdaRequestHandler> getThreeLengthHandler(
+            Class<?> clazz,
+            Method m,
+            Type pType1,
+            Type pType2,
+            Type pType3,
+            Type rType
+    ) {
+        if (InputStream.class.equals(pType1) && OutputStream.class.equals(pType2) && isContext(pType3)) {
+            return Optional.of(StreamMethodRequestHandler.makeRequestHandler(clazz, m, true, true, true));
+        } else {
+            System.err.println(
+                    "Ignoring three-argument overload because argument signature is not (InputStream, OutputStream, Context");
+            return Optional.empty();
         }
-        return constructor;
     }
 
-    private static <T> T newInstance(Constructor<? extends T> constructor) {
-        try {
-            return constructor.newInstance();
-        } catch (UserFault e) {
-            throw e;
-        } catch (InvocationTargetException e) {
-            throw makeUserFault(e.getCause() == null ? e : e.getCause(), true);
-        } catch (InstantiationException e) {
-            throw UnsafeUtil.throwException(e.getCause() == null ? e : e.getCause());
-        } catch (IllegalAccessException e) {
-            throw UnsafeUtil.throwException(e);
+    private static Optional<LambdaRequestHandler> getHandlerFromOverload(Class<?> clazz, Method m) {
+        final Type rType = m.getGenericReturnType();
+        final Type[] pTypes = m.getGenericParameterTypes();
+
+        if (pTypes.length == 0) {
+            return Optional.of(PojoMethodRequestHandler.makeRequestHandler(clazz, m, null, rType, false));
+        } else if (pTypes.length == 1) {
+            return getOneLengthHandler(clazz, m, pTypes[0], rType);
+        } else if (pTypes.length == 2) {
+            return getTwoLengthHandler(clazz, m, pTypes[0], pTypes[1], rType);
+        } else if (pTypes.length == 3) {
+            return getThreeLengthHandler(clazz, m, pTypes[0], pTypes[1], pTypes[2], rType);
+        } else {
+            System.err.println("Ignoring an overload of method "
+                    + m.getName()
+                    + " because it has too many parameters: Expected at most 3, got "
+                    + pTypes.length);
+            return Optional.empty();
         }
     }
 
-    private static final class ClassContext {
-        public final Class<?> clazz;
-        public final Type[] actualTypeArguments;
+    private static boolean isContext(Type t) {
+        return Context.class.equals(t);
+    }
 
-        @SuppressWarnings({"rawtypes"})
-        private TypeVariable[] typeParameters;
+    /**
+     * Returns true if the last type in params is a lambda context object interface (Context).
+     */
+    private static boolean lastParameterIsContext(Class<?>[] params) {
+        return params.length != 0 && isContext(params[params.length - 1]);
+    }
 
-        public ClassContext(Class<?> clazz, Type[] actualTypeArguments) {
-            this.clazz = clazz;
-            this.actualTypeArguments = actualTypeArguments;
+    /**
+     * Implement a comparator for Methods. We sort overloaded handler methods using this comparator, and then pick the
+     * lowest sorted method.
+     */
+    
+    private static LambdaRequestHandler loadEventPojoHandler(HandlerInfo handlerInfo) {
+        Method[] methods;
+        try {
+            methods = handlerInfo.clazz.getMethods();
+        } catch (NoClassDefFoundError e) {
+            return new LambdaRequestHandler.UserFaultHandler(new UserFault(
+                    "Error loading method " + handlerInfo.methodName + " on class " + handlerInfo.clazz.getName(),
+                    e.getClass().getName(),
+                    trace(e)
+            ));
+        }
+        if (methods.length == 0) {
+            final String msg = "Class "
+                    + handlerInfo.getClass().getName()
+                    + " has no public method named "
+                    + handlerInfo.methodName;
+            return new UserFaultHandler(makeUserFault(msg));
         }
 
-        @SuppressWarnings({"rawtypes"})
-        public ClassContext(Class<?> clazz, ClassContext curContext) {
-            this.typeParameters = clazz.getTypeParameters();
-            if (typeParameters.length == 0 || curContext.actualTypeArguments == null) {
-                this.clazz = clazz;
-                this.actualTypeArguments = null;
-            } else {
-                Type[] types = new Type[typeParameters.length];
-                for (int i = 0; i < types.length; i++) {
-                    types[i] = curContext.resolveTypeVariable(typeParameters[i]);
-                }
+        /*
+         * We support the following signatures
+         * Anything (InputStream, OutputStream, Context)
+         * Anything (InputStream, OutputStream)
+         * Anything (OutputStream, Context)
+         * Anything (InputStream, Context)
+         * Anything (InputStream)
+         * Anything (OutputStream)
+         * Anything (Context)
+         * Anything (AlmostAnything, Context)
+         * Anything (AlmostAnything)
+         * Anything ()
+         *
+         * where AlmostAnything is any type except InputStream, OutputStream, Context
+         * Anything represents any type (primitive, void, or Object)
+         *
+         * prefer methods with longer signatures, add extra weight to those ending with a Context object
+         *
+         */
 
-                this.clazz = clazz;
-                this.actualTypeArguments = types;
+        int slide = 0;
+
+        for (int i = 0; i < methods.length; i++) {
+            Method m = methods[i];
+            methods[i - slide] = m;
+            if (!m.getName().equals(handlerInfo.methodName)) {
+                slide++;
+                continue;
             }
         }
 
-        @SuppressWarnings({"rawtypes"})
-        public ClassContext(ParameterizedType type, ClassContext curContext) {
-            Type[] types = type.getActualTypeArguments();
-            for (int i = 0; i < types.length; i++) {
-                Type t = types[i];
-                if (t instanceof TypeVariable) {
-                    types[i] = curContext.resolveTypeVariable((TypeVariable) t);
-                }
-            }
+        final int end = methods.length - slide;
+        Arrays.sort(methods, 0, end, methodPriority);
 
-            Type t = type.getRawType();
-            if (t instanceof Class) {
-                this.clazz = (Class) t;
-            } else if (t instanceof TypeVariable) {
-                this.clazz = (Class) ((TypeVariable) t).getGenericDeclaration();
+        for (int i = 0; i < end; i++) {
+            Method m = methods[i];
+            Optional<LambdaRequestHandler> result = getHandlerFromOverload(handlerInfo.clazz, m);
+            if (result.isPresent()) {
+                return result.get();
             } else {
-                throw new RuntimeException("Type " + t + " is of unexpected type " + t.getClass());
+                continue;
             }
-            this.actualTypeArguments = types;
         }
 
-        @SuppressWarnings({"rawtypes"})
-        public Type resolveTypeVariable(TypeVariable t) {
-            TypeVariable[] variables = getTypeParameters();
-            for (int i = 0; i < variables.length; i++) {
-                if (t.getName().equals(variables[i].getName())) {
-                    return actualTypeArguments == null ? variables[i] : actualTypeArguments[i];
-                }
-            }
-
-            return t;
-        }
+        return new UserFaultHandler(makeUserFault("No public method named "
+                + handlerInfo.methodName
+                + " with appropriate method signature found on class "
+                + handlerInfo.clazz.getName()));
+    }
 
-        @SuppressWarnings({"rawtypes"})
-        private TypeVariable[] getTypeParameters() {
-            if (typeParameters == null) {
-                typeParameters = clazz.getTypeParameters();
-            }
-            return typeParameters;
-        }
+    @SuppressWarnings({"rawtypes"})
+    private static LambdaRequestHandler wrapPojoHandler(RequestHandler instance, Type pType, Type rType) {
+        return wrapRequestStreamHandler(new PojoHandlerAsStreamHandler(instance, Optional.ofNullable(pType),
+                isVoid(rType) ? Optional.<Type>empty() : Optional.of(rType)
+        ));
     }
 
-    /**
-     * perform a breadth-first search for the first parameterized type for iface
-     *
-     * @return null of no type found. Otherwise the type found.
-     */
-    private static Type[] findInterfaceParameters(Class<?> clazz, Class<?> iface) {
-        LinkedList<ClassContext> clazzes = new LinkedList<>();
-        clazzes.addFirst(new ClassContext(clazz, (Type[]) null));
-        while (!clazzes.isEmpty()) {
-            final ClassContext curContext = clazzes.removeLast();
-            Type[] interfaces = curContext.clazz.getGenericInterfaces();
+    private static LambdaRequestHandler wrapRequestStreamHandler(final RequestStreamHandler handler) {
+        return new LambdaRequestHandler() {
+            private final ByteArrayOutputStream output = new ByteArrayOutputStream(1024);
+            private Functions.V2<String, String> log4jContextPutMethod = null;
 
-            for (Type type : interfaces) {
-                if (type instanceof ParameterizedType) {
-                    ParameterizedType candidate = (ParameterizedType) type;
-                    Type rawType = candidate.getRawType();
-                    if (!(rawType instanceof Class)) {
-                        //should be impossible
-                        System.err.println("raw type is not a class: " + rawType);
-                        continue;
-                    }
-                    Class<?> rawClass = (Class<?>) rawType;
-                    if (iface.isAssignableFrom(rawClass)) {
-                        return new ClassContext(candidate, curContext).actualTypeArguments;
-                    } else {
-                        clazzes.addFirst(new ClassContext(candidate, curContext));
-                    }
-                } else if (type instanceof Class) {
-                    clazzes.addFirst(new ClassContext((Class<?>) type, curContext));
-                } else {
-                    //should never happen?
-                    System.err.println("Unexpected type class " + type.getClass().getName());
+            private void safeAddRequestIdToLog4j(String log4jContextClassName,
+                                                 InvocationRequest request, Class contextMapValueClass) {
+                try {
+                    Class<?> log4jContextClass = ReflectUtil.loadClass(AWSLambda.customerClassLoader, log4jContextClassName);
+                    log4jContextPutMethod = ReflectUtil.loadStaticV2(log4jContextClass, "put", false, String.class, contextMapValueClass);
+                    log4jContextPutMethod.call("AWSRequestId", request.getId());
+                } catch (Exception e) {
+                    // nothing to do here
                 }
             }
 
-            final Type superClass = curContext.clazz.getGenericSuperclass();
-            if (superClass instanceof ParameterizedType) {
-                clazzes.addFirst(new ClassContext((ParameterizedType) superClass, curContext));
-            } else if (superClass != null) {
-                clazzes.addFirst(new ClassContext((Class<?>) superClass, curContext));
+            /**
+             * Passes the LambdaContext to the logger so that the JSON formatter can include the requestId.
+             *
+             * We do casting here because both the LambdaRuntime and the LambdaLogger is in the core package,
+             * and the setLambdaContext(context) is a method we don't want to publish for customers. That method is
+             * only implemented on the internal LambdaContextLogger, so we check and cast to be able to call it.
+             * @param context the LambdaContext
+             */
+            private void safeAddContextToLambdaLogger(LambdaContext context) {
+                LambdaLogger logger = com.amazonaws.services.lambda.runtime.LambdaRuntime.getLogger();
+                if (logger instanceof LambdaContextLogger) {
+                    LambdaContextLogger contextLogger = (LambdaContextLogger) logger;
+                    contextLogger.setLambdaContext(context);
+                }
             }
-        }
-        return null;
-    }
 
+            public ByteArrayOutputStream call(InvocationRequest request) throws Error, Exception {
+                output.reset();
 
-    @SuppressWarnings({"rawtypes"})
-    private static LambdaRequestHandler wrapRequestHandlerClass(final Class<? extends RequestHandler> clazz) {
-        Type[] ptypes = findInterfaceParameters(clazz, RequestHandler.class);
-        if (ptypes == null) {
-            return new UserFaultHandler(makeUserFault("Class "
-                    + clazz.getName()
-                    + " does not implement RequestHandler with concrete type parameters"));
-        }
-        if (ptypes.length != 2) {
-            return new UserFaultHandler(makeUserFault(
-                    "Invalid class signature for RequestHandler. Expected two generic types, got " + ptypes.length));
-        }
-
-        for (Type t : ptypes) {
-            if (t instanceof TypeVariable) {
-                Type[] bounds = ((TypeVariable) t).getBounds();
-                boolean foundBound = false;
-                if (bounds != null) {
-                    for (Type bound : bounds) {
-                        if (!Object.class.equals(bound)) {
-                            foundBound = true;
-                            break;
-                        }
-                    }
+                LambdaCognitoIdentity cognitoIdentity = null;
+                if (request.getCognitoIdentity() != null && !request.getCognitoIdentity().isEmpty()) {
+                    cognitoIdentity = getCognitoSerializer().fromJson(request.getCognitoIdentity());
                 }
 
-                if (!foundBound) {
-                    return new UserFaultHandler(makeUserFault("Class " + clazz.getName()
-                            + " does not implement RequestHandler with concrete type parameters: parameter "
-                            + t + " has no upper bound."));
+                LambdaClientContext clientContext = null;
+                if (request.getClientContext() != null && !request.getClientContext().isEmpty()) {
+                    //Use GSON here because it handles immutable types without requiring annotations
+                    clientContext = getContextSerializer().fromJson(request.getClientContext());
                 }
-            }
-        }
 
-        final Type pType = ptypes[0];
-        final Type rType = ptypes[1];
+                LambdaContext context = new LambdaContext(
+                        LambdaEnvironment.MEMORY_LIMIT,
+                        request.getDeadlineTimeInMs(),
+                        request.getId(),
+                        LambdaEnvironment.LOG_GROUP_NAME,
+                        LambdaEnvironment.LOG_STREAM_NAME,
+                        LambdaEnvironment.FUNCTION_NAME,
+                        cognitoIdentity,
+                        LambdaEnvironment.FUNCTION_VERSION,
+                        request.getInvokedFunctionArn(),
+                        clientContext
+                );
 
-        final Constructor<? extends RequestHandler> constructor;
-        try {
-            constructor = getConstructor(clazz);
-            return wrapPojoHandler(newInstance(constructor), pType, rType);
-        } catch (UserFault f) {
-            return new UserFaultHandler(f);
-        } catch (Throwable e) {
-            return new UserFaultHandler(makeUserFault(e));
-        }
-    }
+                safeAddContextToLambdaLogger(context);
 
-    private static LambdaRequestHandler wrapRequestStreamHandlerClass(final Class<? extends RequestStreamHandler> clazz) {
-        final Constructor<? extends RequestStreamHandler> constructor;
-        try {
-            constructor = getConstructor(clazz);
-            return wrapRequestStreamHandler(newInstance(constructor));
-        } catch (UserFault f) {
-            return new UserFaultHandler(f);
-        } catch (Throwable e) {
-            return new UserFaultHandler(makeUserFault(e));
-        }
-    }
+                if (LambdaRuntimeInternal.getUseLog4jAppender()) {
+                    safeAddRequestIdToLog4j("org.apache.log4j.MDC", request, Object.class);
+                    safeAddRequestIdToLog4j("org.apache.logging.log4j.ThreadContext", request, String.class);
+                    // if put method not assigned in either call to safeAddRequestIdtoLog4j then log4jContextPutMethod = null
+                    if (log4jContextPutMethod == null) {
+                        System.err.println("Customer using log4j appender but unable to load either " 
+                            + "org.apache.log4j.MDC or org.apache.logging.log4j.ThreadContext. " 
+                            + "Customer cannot see RequestId in log4j log lines.");
+                    }
+                }
 
-    private static LambdaRequestHandler loadStreamingRequestHandler(Class<?> clazz) {
-        if (RequestStreamHandler.class.isAssignableFrom(clazz)) {
-            return wrapRequestStreamHandlerClass(clazz.asSubclass(RequestStreamHandler.class));
-        } else if (RequestHandler.class.isAssignableFrom(clazz)) {
-            return wrapRequestHandlerClass(clazz.asSubclass(RequestHandler.class));
-        } else {
-            return new UserFaultHandler(makeUserFault("Class does not implement an appropriate handler interface: "
-                    + clazz.getName()));
-        }
+                ByteArrayInputStream bais = new ByteArrayInputStream(request.getContent());
+                handler.handleRequest(bais, output, context);
+                return output;
+            }
+        };
     }
 
-    public static LambdaRequestHandler loadEventHandler(HandlerInfo handlerInfo) {
-        if (handlerInfo.methodName == null) {
-            return loadStreamingRequestHandler(handlerInfo.clazz);
-        } else {
-            return loadEventPojoHandler(handlerInfo);
-        }
-    }
+    /**
+     * Wraps a RequestHandler as a lower level stream handler using supplied types.
+     * Optional types mean that the input and/or output should be ignored respectiveley
+     */
+    @SuppressWarnings("rawtypes")
+    private static final class PojoHandlerAsStreamHandler implements RequestStreamHandler {
 
-    private static Optional<LambdaRequestHandler> getOneLengthHandler(
-            Class<?> clazz,
-            Method m,
-            Type pType,
-            Type rType
-    ) {
-        if (InputStream.class.equals(pType)) {
-            return Optional.of(StreamMethodRequestHandler.makeRequestHandler(clazz, m, true, false, false));
-        } else if (OutputStream.class.equals(pType)) {
-            return Optional.of(StreamMethodRequestHandler.makeRequestHandler(clazz, m, false, true, false));
-        } else if (isContext(pType)) {
-            return Optional.of(PojoMethodRequestHandler.makeRequestHandler(clazz, m, null, rType, true));
-        } else {
-            return Optional.of(PojoMethodRequestHandler.makeRequestHandler(clazz, m, pType, rType, false));
-        }
-    }
+        public RequestHandler innerHandler;
+        public final Optional<Type> inputType;
+        public final Optional<Type> outputType;
 
-    private static Optional<LambdaRequestHandler> getTwoLengthHandler(
-            Class<?> clazz,
-            Method m,
-            Type pType1,
-            Type pType2,
-            Type rType
-    ) {
-        if (OutputStream.class.equals(pType1)) {
-            if (isContext(pType2)) {
-                return Optional.of(StreamMethodRequestHandler.makeRequestHandler(clazz, m, false, true, true));
-            } else {
-                System.err.println(
-                        "Ignoring two-argument overload because first argument type is OutputStream and second argument type is not Context");
-                return Optional.empty();
+        public PojoHandlerAsStreamHandler(
+                RequestHandler innerHandler,
+                Optional<Type> inputType,
+                Optional<Type> outputType
+        ) {
+            this.innerHandler = innerHandler;
+            this.inputType = inputType;
+            this.outputType = outputType;
+
+
+            if (inputType.isPresent()) {
+                getSerializerCached(Platform.UNKNOWN, inputType.get());
             }
-        } else if (isContext(pType1)) {
-            System.err.println("Ignoring two-argument overload because first argument type is Context");
-            return Optional.empty();
-        } else if (InputStream.class.equals(pType1)) {
-            if (OutputStream.class.equals(pType2)) {
-                return Optional.of(StreamMethodRequestHandler.makeRequestHandler(clazz, m, true, true, false));
-            } else if (isContext(pType2)) {
-                return Optional.of(StreamMethodRequestHandler.makeRequestHandler(clazz, m, true, false, true));
-            } else {
-                System.err.println("Ignoring two-argument overload because second parameter type, "
-                        + ReflectUtil.getRawClass(pType2).getName()
-                        + ", is not OutputStream.");
-                return Optional.empty();
+
+            if (outputType.isPresent()) {
+                getSerializerCached(Platform.UNKNOWN, outputType.get());
             }
-        } else if (isContext(pType2)) {
-            return Optional.of(PojoMethodRequestHandler.makeRequestHandler(clazz, m, pType1, rType, true));
-        } else {
-            System.err.println("Ignoring two-argument overload because second parameter type is not Context");
-            return Optional.empty();
         }
-    }
 
-    private static Optional<LambdaRequestHandler> getThreeLengthHandler(
-            Class<?> clazz,
-            Method m,
-            Type pType1,
-            Type pType2,
-            Type pType3,
-            Type rType
-    ) {
-        if (InputStream.class.equals(pType1) && OutputStream.class.equals(pType2) && isContext(pType3)) {
-            return Optional.of(StreamMethodRequestHandler.makeRequestHandler(clazz, m, true, true, true));
-        } else {
-            System.err.println(
-                    "Ignoring three-argument overload because argument signature is not (InputStream, OutputStream, Context");
-            return Optional.empty();
-        }
-    }
+        @SuppressWarnings("unchecked")
+        @Override
+        public void handleRequest(InputStream inputStream, OutputStream outputStream, Context context)
+                throws IOException {
+            final Object input;
+            final Platform platform = getPlatform(context);
+            try {
+                if (inputType.isPresent()) {
+                    input = getSerializerCached(platform, inputType.get()).fromJson(inputStream);
+                } else {
+                    input = null;
+                }
+            } catch (Throwable t) {
+                throw new RuntimeException("An error occurred during JSON parsing", filterStackTrace(t));
+            }
 
-    private static Optional<LambdaRequestHandler> getHandlerFromOverload(Class<?> clazz, Method m) {
-        final Type rType = m.getGenericReturnType();
-        final Type[] pTypes = m.getGenericParameterTypes();
+            final Object output;
+            try {
+                output = innerHandler.handleRequest(input, context);
+            } catch (Throwable t) {
+                throw UnsafeUtil.throwException(filterStackTrace(t));
+            }
 
-        if (pTypes.length == 0) {
-            return Optional.of(PojoMethodRequestHandler.makeRequestHandler(clazz, m, null, rType, false));
-        } else if (pTypes.length == 1) {
-            return getOneLengthHandler(clazz, m, pTypes[0], rType);
-        } else if (pTypes.length == 2) {
-            return getTwoLengthHandler(clazz, m, pTypes[0], pTypes[1], rType);
-        } else if (pTypes.length == 3) {
-            return getThreeLengthHandler(clazz, m, pTypes[0], pTypes[1], pTypes[2], rType);
-        } else {
-            System.err.println("Ignoring an overload of method "
-                    + m.getName()
-                    + " because it has too many parameters: Expected at most 3, got "
-                    + pTypes.length);
-            return Optional.empty();
+            try {
+                if (outputType.isPresent()) {
+                    PojoSerializer<Object> serializer = getSerializerCached(platform, outputType.get());
+                    serializer.toJson(output, outputStream);
+                } else {
+                    outputStream.write(_JsonNull);
+                }
+            } catch (Throwable t) {
+                throw new RuntimeException("An error occurred during JSON serialization of response", t);
+            }
         }
     }
 
-    private static boolean isContext(Type t) {
-        return Context.class.equals(t);
-    }
-
     /**
-     * Returns true if the last type in params is a lambda context object interface (Context).
+     * Wraps a java.lang.reflect.Method as a POJO RequestHandler
      */
-    private static boolean lastParameterIsContext(Class<?>[] params) {
-        return params.length != 0 && isContext(params[params.length - 1]);
-    }
+    private static final class PojoMethodRequestHandler implements RequestHandler<Object, Object> {
+        public final Method m;
+        public final Type pType;
+        public final Object instance;
+        public final boolean needsContext;
+        public final int argSize;
 
-    /**
-     * Implement a comparator for Methods. We sort overloaded handler methods using this comparator, and then pick the
-     * lowest sorted method.
-     */
-    private static final Comparator<Method> methodPriority = new Comparator<Method>() {
-        public int compare(Method lhs, Method rhs) {
+        public PojoMethodRequestHandler(Method m, Type pType, Type rType, Object instance, boolean needsContext) {
+            this.m = m;
+            this.pType = pType;
+            this.instance = instance;
+            this.needsContext = needsContext;
+            this.argSize = (needsContext ? 1 : 0) + (pType != null ? 1 : 0);
+        }
 
-            //1. Non bridge methods are preferred over bridge methods.
-            if (!lhs.isBridge() && rhs.isBridge()) {
-                return -1;
-            } else if (!rhs.isBridge() && lhs.isBridge()) {
-                return 1;
+        public static PojoMethodRequestHandler fromMethod(
+                Class<?> clazz,
+                Method m,
+                Type pType,
+                Type rType,
+                boolean needsContext
+        ) throws Exception {
+            final Object instance;
+            if (Modifier.isStatic(m.getModifiers())) {
+                instance = null;
+            } else {
+                instance = newInstance(getConstructor(clazz));
             }
 
-            //2. We prefer longer signatures to shorter signatures. Except we count a method whose last argument is
-            //Context as having 1 more argument than it really does. This is a stupid thing to do, but we
-            //need to keep it for back compat reasons.
-            Class<?>[] lParams = lhs.getParameterTypes();
-            Class<?>[] rParams = rhs.getParameterTypes();
+            return new PojoMethodRequestHandler(m, pType, rType, instance, needsContext);
+        }
 
-            int lParamCompareLength = lParams.length;
-            int rParamCompareLength = rParams.length;
+        public static LambdaRequestHandler makeRequestHandler(
+                Class<?> clazz,
+                Method m,
+                Type pType,
+                Type rType,
+                boolean needsContext
+        ) {
+            try {
+                return wrapPojoHandler(fromMethod(clazz, m, pType, rType, needsContext), pType, rType);
+            } catch (UserFault f) {
+                return new UserFaultHandler(f);
+            } catch (Throwable t) {
+                return new UserFaultHandler(makeUserFault(t));
+            }
+        }
 
-            if (lastParameterIsContext(lParams)) {
-                ++lParamCompareLength;
+        @Override
+        public Object handleRequest(Object input, Context context) {
+            final Object[] args = new Object[argSize];
+            int idx = 0;
+
+            if (pType != null) {
+                args[idx++] = input;
+            }
+
+            if (this.needsContext) {
+                args[idx++] = context;
             }
 
-            if (lastParameterIsContext(rParams)) {
-                ++rParamCompareLength;
+            try {
+                return m.invoke(this.instance, args);
+            } catch (InvocationTargetException e) {
+                if (e.getCause() != null) {
+                    throw UnsafeUtil.throwException(filterStackTrace(e.getCause()));
+                } else {
+                    throw UnsafeUtil.throwException(filterStackTrace(e));
+                }
+            } catch (Throwable t) {
+                throw UnsafeUtil.throwException(filterStackTrace(t));
+            }
+        }
+    }
+
+    /**
+     * Wraps a java.lang.reflect.Method object as a RequestStreamHandler
+     */
+    private static final class StreamMethodRequestHandler implements RequestStreamHandler {
+        public final Method m;
+        public final Object instance;
+        public final boolean needsInput;
+        public final boolean needsOutput;
+        public final boolean needsContext;
+        public final int argSize;
+
+        public StreamMethodRequestHandler(
+                Method m,
+                Object instance,
+                boolean needsInput,
+                boolean needsOutput,
+                boolean needsContext
+        ) {
+            this.m = m;
+            this.instance = instance;
+            this.needsInput = needsInput;
+            this.needsOutput = needsOutput;
+            this.needsContext = needsContext;
+            this.argSize = (needsInput ? 1 : 0) + (needsOutput ? 1 : 0) + (needsContext ? 1 : 0);
+        }
+
+        public static StreamMethodRequestHandler fromMethod(
+                Class<?> clazz,
+                Method m,
+                boolean needsInput,
+                boolean needsOutput,
+                boolean needsContext
+        ) throws Exception {
+            if (!isVoid(m.getReturnType())) {
+                System.err.println("Will ignore return type " + m.getReturnType() + " on byte stream handler");
             }
+            final Object instance = Modifier.isStatic(m.getModifiers())
+                    ? null
+                    : newInstance(getConstructor(clazz));
 
-            return -Integer.compare(lParamCompareLength, rParamCompareLength);
+            return new StreamMethodRequestHandler(m, instance, needsInput, needsOutput, needsContext);
         }
-    };
 
-    private static LambdaRequestHandler loadEventPojoHandler(HandlerInfo handlerInfo) {
-        Method[] methods;
-        try {
-            methods = handlerInfo.clazz.getMethods();
-        } catch (NoClassDefFoundError e) {
-            return new LambdaRequestHandler.UserFaultHandler(new UserFault(
-                    "Error loading method " + handlerInfo.methodName + " on class " + handlerInfo.clazz.getName(),
-                    e.getClass().getName(),
-                    trace(e)
-            ));
-        }
-        if (methods.length == 0) {
-            final String msg = "Class "
-                    + handlerInfo.getClass().getName()
-                    + " has no public method named "
-                    + handlerInfo.methodName;
-            return new UserFaultHandler(makeUserFault(msg));
+        public static LambdaRequestHandler makeRequestHandler(
+                Class<?> clazz,
+                Method m,
+                boolean needsInput,
+                boolean needsOutput,
+                boolean needsContext
+        ) {
+            try {
+                return wrapRequestStreamHandler(fromMethod(clazz, m, needsInput, needsOutput, needsContext));
+            } catch (UserFault f) {
+                return new UserFaultHandler(f);
+            } catch (Throwable t) {
+                return new UserFaultHandler(makeUserFault(t));
+            }
         }
 
-        /*
-         * We support the following signatures
-         * Anything (InputStream, OutputStream, Context)
-         * Anything (InputStream, OutputStream)
-         * Anything (OutputStream, Context)
-         * Anything (InputStream, Context)
-         * Anything (InputStream)
-         * Anything (OutputStream)
-         * Anything (Context)
-         * Anything (AlmostAnything, Context)
-         * Anything (AlmostAnything)
-         * Anything ()
-         *
-         * where AlmostAnything is any type except InputStream, OutputStream, Context
-         * Anything represents any type (primitive, void, or Object)
-         *
-         * prefer methods with longer signatures, add extra weight to those ending with a Context object
-         *
-         */
+        @Override
+        public void handleRequest(InputStream inputStream, OutputStream outputStream, Context context)
+                throws IOException {
+            final Object[] args = new Object[argSize];
+            int idx = 0;
 
-        int slide = 0;
+            if (needsInput) {
+                args[idx++] = inputStream;
+            } else {
+                inputStream.close();
+            }
 
-        for (int i = 0; i < methods.length; i++) {
-            Method m = methods[i];
-            methods[i - slide] = m;
-            if (!m.getName().equals(handlerInfo.methodName)) {
-                slide++;
-                continue;
+            if (needsOutput) {
+                args[idx++] = outputStream;
             }
-        }
 
-        final int end = methods.length - slide;
-        Arrays.sort(methods, 0, end, methodPriority);
+            if (needsContext) {
+                args[idx++] = context;
+            }
 
-        for (int i = 0; i < end; i++) {
-            Method m = methods[i];
-            Optional<LambdaRequestHandler> result = getHandlerFromOverload(handlerInfo.clazz, m);
-            if (result.isPresent()) {
-                return result.get();
-            } else {
-                continue;
+            try {
+                m.invoke(this.instance, args);
+                if (!needsOutput) {
+                    outputStream.write(_JsonNull);
+                }
+            } catch (InvocationTargetException e) {
+                if (e.getCause() != null) {
+                    throw UnsafeUtil.throwException(filterStackTrace(e.getCause()));
+                } else {
+                    throw UnsafeUtil.throwException(filterStackTrace(e));
+                }
+            } catch (Throwable t) {
+                throw UnsafeUtil.throwException(filterStackTrace(t));
             }
         }
-
-        return new UserFaultHandler(makeUserFault("No public method named "
-                + handlerInfo.methodName
-                + " with appropriate method signature found on class "
-                + handlerInfo.clazz.getName()));
     }
 
-    @SuppressWarnings({"rawtypes"})
-    private static LambdaRequestHandler wrapPojoHandler(RequestHandler instance, Type pType, Type rType) {
-        return wrapRequestStreamHandler(new PojoHandlerAsStreamHandler(instance, Optional.ofNullable(pType),
-                isVoid(rType) ? Optional.<Type>empty() : Optional.of(rType)
-        ));
-    }
+    private static final class ClassContext {
+        public final Class<?> clazz;
+        public final Type[] actualTypeArguments;
 
-    private static LambdaRequestHandler wrapRequestStreamHandler(final RequestStreamHandler handler) {
-        return new LambdaRequestHandler() {
-            private final ByteArrayOutputStream output = new ByteArrayOutputStream(1024);
-            private Functions.V2<String, String> log4jContextPutMethod = null;
+        @SuppressWarnings({"rawtypes"})
+        private TypeVariable[] typeParameters;
 
-            private void safeAddRequestIdToLog4j(String log4jContextClassName,
-                                                 InvocationRequest request, Class contextMapValueClass) {
-                try {
-                    Class<?> log4jContextClass = ReflectUtil.loadClass(AWSLambda.customerClassLoader, log4jContextClassName);
-                    log4jContextPutMethod = ReflectUtil.loadStaticV2(log4jContextClass, "put", false, String.class, contextMapValueClass);
-                    log4jContextPutMethod.call("AWSRequestId", request.getId());
-                } catch (Exception e) {
+        public ClassContext(Class<?> clazz, Type[] actualTypeArguments) {
+            this.clazz = clazz;
+            this.actualTypeArguments = actualTypeArguments;
+        }
+
+        @SuppressWarnings({"rawtypes"})
+        public ClassContext(Class<?> clazz, ClassContext curContext) {
+            this.typeParameters = clazz.getTypeParameters();
+            if (typeParameters.length == 0 || curContext.actualTypeArguments == null) {
+                this.clazz = clazz;
+                this.actualTypeArguments = null;
+            } else {
+                Type[] types = new Type[typeParameters.length];
+                for (int i = 0; i < types.length; i++) {
+                    types[i] = curContext.resolveTypeVariable(typeParameters[i]);
                 }
+
+                this.clazz = clazz;
+                this.actualTypeArguments = types;
             }
+        }
 
-            /**
-             * Passes the LambdaContext to the logger so that the JSON formatter can include the requestId.
-             *
-             * We do casting here because both the LambdaRuntime and the LambdaLogger is in the core package,
-             * and the setLambdaContext(context) is a method we don't want to publish for customers. That method is
-             * only implemented on the internal LambdaContextLogger, so we check and cast to be able to call it.
-             * @param context the LambdaContext
-             */
-            private void safeAddContextToLambdaLogger(LambdaContext context) {
-                LambdaLogger logger = com.amazonaws.services.lambda.runtime.LambdaRuntime.getLogger();
-                if (logger instanceof LambdaContextLogger) {
-                    LambdaContextLogger contextLogger = (LambdaContextLogger) logger;
-                    contextLogger.setLambdaContext(context);
+        @SuppressWarnings({"rawtypes"})
+        public ClassContext(ParameterizedType type, ClassContext curContext) {
+            Type[] types = type.getActualTypeArguments();
+            for (int i = 0; i < types.length; i++) {
+                Type t = types[i];
+                if (t instanceof TypeVariable) {
+                    types[i] = curContext.resolveTypeVariable((TypeVariable) t);
                 }
             }
 
-            public ByteArrayOutputStream call(InvocationRequest request) throws Error, Exception {
-                output.reset();
-
-                LambdaCognitoIdentity cognitoIdentity = null;
-                if (request.getCognitoIdentity() != null && !request.getCognitoIdentity().isEmpty()) {
-                    cognitoIdentity = getCognitoSerializer().fromJson(request.getCognitoIdentity());
-                }
+            Type t = type.getRawType();
+            if (t instanceof Class) {
+                this.clazz = (Class) t;
+            } else if (t instanceof TypeVariable) {
+                this.clazz = (Class) ((TypeVariable) t).getGenericDeclaration();
+            } else {
+                throw new RuntimeException("Type " + t + " is of unexpected type " + t.getClass());
+            }
+            this.actualTypeArguments = types;
+        }
 
-                LambdaClientContext clientContext = null;
-                if (request.getClientContext() != null && !request.getClientContext().isEmpty()) {
-                    //Use GSON here because it handles immutable types without requiring annotations
-                    clientContext = getContextSerializer().fromJson(request.getClientContext());
+        @SuppressWarnings({"rawtypes"})
+        public Type resolveTypeVariable(TypeVariable t) {
+            TypeVariable[] variables = getTypeParameters();
+            for (int i = 0; i < variables.length; i++) {
+                if (t.getName().equals(variables[i].getName())) {
+                    return actualTypeArguments == null ? variables[i] : actualTypeArguments[i];
                 }
+            }
 
-                LambdaContext context = new LambdaContext(
-                        LambdaEnvironment.MEMORY_LIMIT,
-                        request.getDeadlineTimeInMs(),
-                        request.getId(),
-                        LambdaEnvironment.LOG_GROUP_NAME,
-                        LambdaEnvironment.LOG_STREAM_NAME,
-                        LambdaEnvironment.FUNCTION_NAME,
-                        cognitoIdentity,
-                        LambdaEnvironment.FUNCTION_VERSION,
-                        request.getInvokedFunctionArn(),
-                        clientContext
-                );
-
-                safeAddContextToLambdaLogger(context);
-
-                if (LambdaRuntimeInternal.getUseLog4jAppender()) {
-                    safeAddRequestIdToLog4j("org.apache.log4j.MDC", request, Object.class);
-                    safeAddRequestIdToLog4j("org.apache.logging.log4j.ThreadContext", request, String.class);
-                    // if put method not assigned in either call to safeAddRequestIdtoLog4j then log4jContextPutMethod = null
-                    if (log4jContextPutMethod == null) {
-                        System.err.println("Customer using log4j appender but unable to load either " +
-                                "org.apache.log4j.MDC or org.apache.logging.log4j.ThreadContext. " +
-                                "Customer cannot see RequestId in log4j log lines.");
-                    }
-                }
+            return t;
+        }
 
-                ByteArrayInputStream bais = new ByteArrayInputStream(request.getContent());
-                handler.handleRequest(bais, output, context);
-                return output;
+        @SuppressWarnings({"rawtypes"})
+        private TypeVariable[] getTypeParameters() {
+            if (typeParameters == null) {
+                typeParameters = clazz.getTypeParameters();
             }
-        };
+            return typeParameters;
+        }
     }
+
 }
diff --git a/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/runtime/api/client/HandlerInfo.java b/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/runtime/api/client/HandlerInfo.java
index 8f95ba85..54e2f671 100644
--- a/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/runtime/api/client/HandlerInfo.java
+++ b/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/runtime/api/client/HandlerInfo.java
@@ -1,15 +1,16 @@
-/* Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. */
+/*
+Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+SPDX-License-Identifier: Apache-2.0
+*/
 
 package com.amazonaws.services.lambda.runtime.api.client;
 
 public final class HandlerInfo {
-    public static class InvalidHandlerException extends RuntimeException {
-        public static final long serialVersionUID = -1;
-    }
-
+    
     public final Class<?> clazz;
     public final String methodName;
 
+
     public HandlerInfo(Class<?> clazz, String methodName) {
         this.clazz = clazz;
         this.methodName = methodName;
@@ -37,4 +38,8 @@ public static String className(String handler) {
         final int colonLoc = handler.lastIndexOf("::");
         return (colonLoc < 0) ? handler : handler.substring(0, colonLoc);
     }
+
+    public static class InvalidHandlerException extends RuntimeException {
+        public static final long serialVersionUID = -1;
+    }
 }
diff --git a/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/runtime/api/client/LambdaEnvironment.java b/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/runtime/api/client/LambdaEnvironment.java
index 62ba7b0f..77838f72 100644
--- a/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/runtime/api/client/LambdaEnvironment.java
+++ b/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/runtime/api/client/LambdaEnvironment.java
@@ -1,10 +1,19 @@
-/* Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. */
+/*
+Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+SPDX-License-Identifier: Apache-2.0
+*/
 
 package com.amazonaws.services.lambda.runtime.api.client;
 
 import com.amazonaws.services.lambda.runtime.api.client.util.EnvReader;
-
-import static com.amazonaws.services.lambda.runtime.api.client.ReservedRuntimeEnvironmentVariables.*;
+import static com.amazonaws.services.lambda.runtime.api.client.ReservedRuntimeEnvironmentVariables.AWS_LAMBDA_FUNCTION_MEMORY_SIZE;
+import static com.amazonaws.services.lambda.runtime.api.client.ReservedRuntimeEnvironmentVariables.AWS_LAMBDA_FUNCTION_NAME;
+import static com.amazonaws.services.lambda.runtime.api.client.ReservedRuntimeEnvironmentVariables.AWS_LAMBDA_FUNCTION_VERSION;
+import static com.amazonaws.services.lambda.runtime.api.client.ReservedRuntimeEnvironmentVariables.AWS_LAMBDA_LOG_FORMAT;
+import static com.amazonaws.services.lambda.runtime.api.client.ReservedRuntimeEnvironmentVariables.AWS_LAMBDA_LOG_GROUP_NAME;
+import static com.amazonaws.services.lambda.runtime.api.client.ReservedRuntimeEnvironmentVariables.AWS_LAMBDA_LOG_LEVEL;
+import static com.amazonaws.services.lambda.runtime.api.client.ReservedRuntimeEnvironmentVariables.AWS_LAMBDA_LOG_STREAM_NAME;
+import static com.amazonaws.services.lambda.runtime.api.client.ReservedRuntimeEnvironmentVariables.AWS_LAMBDA_RUNTIME_API;
 import static java.lang.Integer.parseInt;
 
 public class LambdaEnvironment {
diff --git a/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/runtime/api/client/LambdaRequestHandler.java b/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/runtime/api/client/LambdaRequestHandler.java
index 89993b2b..ce9254ef 100644
--- a/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/runtime/api/client/LambdaRequestHandler.java
+++ b/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/runtime/api/client/LambdaRequestHandler.java
@@ -1,14 +1,24 @@
-/* Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. */
+/*
+Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+SPDX-License-Identifier: Apache-2.0
+*/
 
 package com.amazonaws.services.lambda.runtime.api.client;
 
 import com.amazonaws.services.lambda.runtime.api.client.runtimeapi.dto.InvocationRequest;
-
 import java.io.ByteArrayOutputStream;
 
 public interface LambdaRequestHandler {
     ByteArrayOutputStream call(InvocationRequest request) throws Error, Exception;
 
+    static LambdaRequestHandler initErrorHandler(final Throwable e, String className) {
+        return new UserFaultHandler(UserFault.makeInitErrorUserFault(e, className));
+    }
+
+    static LambdaRequestHandler classNotFound(final Throwable e, String className) {
+        return new UserFaultHandler(UserFault.makeClassNotFoundUserFault(e, className));
+    }
+
     class UserFaultHandler implements LambdaRequestHandler {
         public final UserFault fault;
 
@@ -20,12 +30,4 @@ public ByteArrayOutputStream call(InvocationRequest request) {
             throw fault;
         }
     }
-
-    static LambdaRequestHandler initErrorHandler(final Throwable e, String className) {
-        return new UserFaultHandler(UserFault.makeInitErrorUserFault(e, className));
-    }
-
-    static LambdaRequestHandler classNotFound(final Throwable e, String className) {
-        return new UserFaultHandler(UserFault.makeClassNotFoundUserFault(e, className));
-    }
 }
diff --git a/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/runtime/api/client/PojoSerializerLoader.java b/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/runtime/api/client/PojoSerializerLoader.java
index 819f9872..daea5911 100644
--- a/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/runtime/api/client/PojoSerializerLoader.java
+++ b/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/runtime/api/client/PojoSerializerLoader.java
@@ -1,10 +1,12 @@
-/* Copyright 2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. */
+/*
+Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+SPDX-License-Identifier: Apache-2.0
+*/
 
 package com.amazonaws.services.lambda.runtime.api.client;
 
-import com.amazonaws.services.lambda.runtime.serialization.PojoSerializer;
 import com.amazonaws.services.lambda.runtime.CustomPojoSerializer;
-
+import com.amazonaws.services.lambda.runtime.serialization.PojoSerializer;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.lang.reflect.Type;
diff --git a/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/runtime/api/client/ReservedRuntimeEnvironmentVariables.java b/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/runtime/api/client/ReservedRuntimeEnvironmentVariables.java
index eca5cef1..7500a494 100644
--- a/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/runtime/api/client/ReservedRuntimeEnvironmentVariables.java
+++ b/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/runtime/api/client/ReservedRuntimeEnvironmentVariables.java
@@ -1,18 +1,8 @@
 /*
- * Copyright 2017-2020 original authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+SPDX-License-Identifier: Apache-2.0
+*/
+
 package com.amazonaws.services.lambda.runtime.api.client;
 
 /**
diff --git a/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/runtime/api/client/TooManyServiceProvidersFoundException.java b/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/runtime/api/client/TooManyServiceProvidersFoundException.java
index bba40034..07fac717 100644
--- a/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/runtime/api/client/TooManyServiceProvidersFoundException.java
+++ b/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/runtime/api/client/TooManyServiceProvidersFoundException.java
@@ -1,4 +1,7 @@
-/* Copyright 2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. */
+/*
+Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+SPDX-License-Identifier: Apache-2.0
+*/
 
 package com.amazonaws.services.lambda.runtime.api.client;
 
@@ -17,4 +20,4 @@ public TooManyServiceProvidersFoundException(Throwable cause) {
     public TooManyServiceProvidersFoundException(String message, Throwable cause) {
         super(message, cause);
     }
-}
\ No newline at end of file
+}
diff --git a/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/runtime/api/client/UserFault.java b/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/runtime/api/client/UserFault.java
index fc8eb005..c7c5c9dd 100644
--- a/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/runtime/api/client/UserFault.java
+++ b/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/runtime/api/client/UserFault.java
@@ -1,4 +1,7 @@
-/* Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. */
+/*
+Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+SPDX-License-Identifier: Apache-2.0
+*/
 
 package com.amazonaws.services.lambda.runtime.api.client;
 
@@ -10,13 +13,12 @@
 public final class UserFault extends RuntimeException {
     private static final long serialVersionUID = -479308856905162038L;
 
+    private static final String packagePrefix = AWSLambda.class.getPackage().getName();
     public final String msg;
     public final String exception;
     public final String trace;
     public final Boolean fatal;
 
-    private static final String packagePrefix = AWSLambda.class.getPackage().getName();
-
     public UserFault(String msg, String exception, String trace) {
         this.msg = msg;
         this.exception = exception;
@@ -94,7 +96,7 @@ private static <T extends Throwable> T filterStackTrace(T t, Set<Throwable> visi
         }
 
         Throwable[] suppressedExceptions = t.getSuppressed();
-        for(Throwable suppressed: suppressedExceptions) {
+        for (Throwable suppressed: suppressedExceptions) {
             if (!visitedSuppressed.contains(suppressed)) {
                 visitedSuppressed.add(suppressed);
                 filterStackTrace(suppressed, visited, visitedSuppressed);
diff --git a/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/runtime/api/client/api/LambdaClientContext.java b/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/runtime/api/client/api/LambdaClientContext.java
index 3b8976b7..3baa5347 100644
--- a/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/runtime/api/client/api/LambdaClientContext.java
+++ b/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/runtime/api/client/api/LambdaClientContext.java
@@ -1,10 +1,12 @@
-/* Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. */
+/*
+Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+SPDX-License-Identifier: Apache-2.0
+*/
 
 package com.amazonaws.services.lambda.runtime.api.client.api;
 
 import com.amazonaws.services.lambda.runtime.Client;
 import com.amazonaws.services.lambda.runtime.ClientContext;
-
 import java.util.Map;
 
 public class LambdaClientContext implements ClientContext {
diff --git a/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/runtime/api/client/api/LambdaClientContextClient.java b/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/runtime/api/client/api/LambdaClientContextClient.java
index 66e86d3f..b76a25f5 100644
--- a/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/runtime/api/client/api/LambdaClientContextClient.java
+++ b/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/runtime/api/client/api/LambdaClientContextClient.java
@@ -1,4 +1,7 @@
-/* Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. */
+/*
+Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+SPDX-License-Identifier: Apache-2.0
+*/
 
 package com.amazonaws.services.lambda.runtime.api.client.api;
 
diff --git a/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/runtime/api/client/api/LambdaCognitoIdentity.java b/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/runtime/api/client/api/LambdaCognitoIdentity.java
index 5b9df4f2..89e60d34 100644
--- a/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/runtime/api/client/api/LambdaCognitoIdentity.java
+++ b/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/runtime/api/client/api/LambdaCognitoIdentity.java
@@ -1,4 +1,7 @@
-/* Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. */
+/*
+Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+SPDX-License-Identifier: Apache-2.0
+*/
 
 package com.amazonaws.services.lambda.runtime.api.client.api;
 
diff --git a/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/runtime/api/client/api/LambdaContext.java b/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/runtime/api/client/api/LambdaContext.java
index 3d57ce4c..2ce3b844 100644
--- a/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/runtime/api/client/api/LambdaContext.java
+++ b/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/runtime/api/client/api/LambdaContext.java
@@ -1,4 +1,7 @@
-/* Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. */
+/*
+Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+SPDX-License-Identifier: Apache-2.0
+*/
 
 package com.amazonaws.services.lambda.runtime.api.client.api;
 
diff --git a/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/runtime/api/client/logging/AbstractLambdaLogger.java b/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/runtime/api/client/logging/AbstractLambdaLogger.java
index 5d93be00..f987b0bd 100644
--- a/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/runtime/api/client/logging/AbstractLambdaLogger.java
+++ b/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/runtime/api/client/logging/AbstractLambdaLogger.java
@@ -1,13 +1,15 @@
-/* Copyright 2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. */
+/*
+Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+SPDX-License-Identifier: Apache-2.0
+*/
 
 package com.amazonaws.services.lambda.runtime.api.client.logging;
 
-import static java.nio.charset.StandardCharsets.UTF_8;
-
-import com.amazonaws.services.lambda.runtime.api.client.api.LambdaContext;
 import com.amazonaws.services.lambda.runtime.LambdaLogger;
+import com.amazonaws.services.lambda.runtime.api.client.api.LambdaContext;
 import com.amazonaws.services.lambda.runtime.logging.LogFormat;
 import com.amazonaws.services.lambda.runtime.logging.LogLevel;
+import static java.nio.charset.StandardCharsets.UTF_8;
 
 /**
  * Provides default implementation of the convenience logger functions.
@@ -15,9 +17,9 @@
  * void logMessage(byte[] message, LogLevel logLevel);
  */
 public abstract class AbstractLambdaLogger implements LambdaLogger {
+    protected final LogFormat logFormat;
     private final LogFiltering logFiltering;
     private final LogFormatter logFormatter;
-    protected final LogFormat logFormat;
 
     public AbstractLambdaLogger(LogLevel logLevel, LogFormat logFormat) {
         this.logFiltering = new LogFiltering(logLevel);
diff --git a/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/runtime/api/client/logging/FrameType.java b/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/runtime/api/client/logging/FrameType.java
index 6663cc1d..f3891ce2 100644
--- a/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/runtime/api/client/logging/FrameType.java
+++ b/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/runtime/api/client/logging/FrameType.java
@@ -1,9 +1,12 @@
-/* Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. */
+/*
+Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+SPDX-License-Identifier: Apache-2.0
+*/
 
 package com.amazonaws.services.lambda.runtime.api.client.logging;
 
-import com.amazonaws.services.lambda.runtime.logging.LogLevel;
 import com.amazonaws.services.lambda.runtime.logging.LogFormat;
+import com.amazonaws.services.lambda.runtime.logging.LogLevel;
 
 /**
  * The first 4 bytes of the framing protocol is the Frame Type, that's made of a magic number (3 bytes) and 1 byte of flags.
@@ -29,17 +32,17 @@ public class FrameType {
 
     private final int val;
 
-    public static int getValue(LogLevel logLevel, LogFormat logFormat) {
-        return LOG_MAGIC |
-                (logLevel.ordinal() << OFFSET_LOG_LEVEL) |
-                (1 << OFFSET_TIMESTAMP_PRESENT) |
-                (logFormat.ordinal() << OFFSET_LOG_FORMAT);
-    }
-
     FrameType(int val) {
         this.val = val;
     }
 
+    public static int getValue(LogLevel logLevel, LogFormat logFormat) {
+        return LOG_MAGIC 
+            | (logLevel.ordinal() << OFFSET_LOG_LEVEL) 
+            | (1 << OFFSET_TIMESTAMP_PRESENT)
+            | (logFormat.ordinal() << OFFSET_LOG_FORMAT);
+    }
+
     public int getValue() {
         return this.val;
     }
diff --git a/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/runtime/api/client/logging/FramedTelemetryLogSink.java b/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/runtime/api/client/logging/FramedTelemetryLogSink.java
index f20e7722..e297d190 100644
--- a/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/runtime/api/client/logging/FramedTelemetryLogSink.java
+++ b/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/runtime/api/client/logging/FramedTelemetryLogSink.java
@@ -1,7 +1,12 @@
-/* Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. */
+/*
+Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+SPDX-License-Identifier: Apache-2.0
+*/
 
 package com.amazonaws.services.lambda.runtime.api.client.logging;
 
+import com.amazonaws.services.lambda.runtime.logging.LogFormat;
+import com.amazonaws.services.lambda.runtime.logging.LogLevel;
 import java.io.FileDescriptor;
 import java.io.FileOutputStream;
 import java.io.IOException;
@@ -9,8 +14,6 @@
 import java.nio.ByteOrder;
 import java.time.Instant;
 
-import com.amazonaws.services.lambda.runtime.logging.LogLevel;
-import com.amazonaws.services.lambda.runtime.logging.LogFormat;
 
 /**
  * FramedTelemetryLogSink implements the logging contract between runtimes and the platform. It implements a simple
@@ -62,7 +65,8 @@ private void writeFrame(LogLevel logLevel, LogFormat logFormat, byte[] message)
 
     private long timestamp() {
         Instant instant = Instant.now();
-        return instant.getEpochSecond() * 1_000_000 + instant.getNano() / 1000; // microsecond precision
+        // microsecond precision
+        return instant.getEpochSecond() * 1_000_000 + instant.getNano() / 1000;
     }
 
     /**
diff --git a/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/runtime/api/client/logging/JsonLogFormatter.java b/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/runtime/api/client/logging/JsonLogFormatter.java
index ef9e1c41..b98721eb 100644
--- a/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/runtime/api/client/logging/JsonLogFormatter.java
+++ b/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/runtime/api/client/logging/JsonLogFormatter.java
@@ -1,4 +1,7 @@
-/* Copyright 2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. */
+/*
+Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+SPDX-License-Identifier: Apache-2.0
+*/
 
 package com.amazonaws.services.lambda.runtime.api.client.logging;
 
@@ -6,7 +9,6 @@
 import com.amazonaws.services.lambda.runtime.logging.LogLevel;
 import com.amazonaws.services.lambda.runtime.serialization.PojoSerializer;
 import com.amazonaws.services.lambda.runtime.serialization.factories.GsonFactory;
-
 import java.io.ByteArrayOutputStream;
 import java.nio.charset.StandardCharsets;
 import java.time.LocalDateTime;
@@ -14,13 +16,13 @@
 import java.time.format.DateTimeFormatter;
 
 public class JsonLogFormatter implements LogFormatter {
+    private static final DateTimeFormatter dateFormatter =
+            DateTimeFormatter.
+                ofPattern("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'").
+                withZone(ZoneId.of("UTC"));
     private final PojoSerializer<StructuredLogMessage> serializer = GsonFactory.getInstance().getSerializer(StructuredLogMessage.class);
-    private LambdaContext lambdaContext;
 
-    private static final DateTimeFormatter dateFormatter =
-            DateTimeFormatter
-                    .ofPattern("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'")
-                    .withZone(ZoneId.of("UTC"));
+    private LambdaContext lambdaContext;
 
     @Override
     public String format(String message, LogLevel logLevel) {
diff --git a/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/runtime/api/client/logging/LambdaContextLogger.java b/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/runtime/api/client/logging/LambdaContextLogger.java
index 4800b356..693eb015 100644
--- a/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/runtime/api/client/logging/LambdaContextLogger.java
+++ b/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/runtime/api/client/logging/LambdaContextLogger.java
@@ -1,11 +1,12 @@
-/* Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. */
+/*
+Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+SPDX-License-Identifier: Apache-2.0
+*/
 
 package com.amazonaws.services.lambda.runtime.api.client.logging;
 
-import com.amazonaws.services.lambda.runtime.api.client.api.LambdaContext;
 import com.amazonaws.services.lambda.runtime.logging.LogFormat;
 import com.amazonaws.services.lambda.runtime.logging.LogLevel;
-
 import static java.nio.charset.StandardCharsets.UTF_8;
 
 public class LambdaContextLogger extends AbstractLambdaLogger {
@@ -23,8 +24,9 @@ public LambdaContextLogger(LogSink sink, LogLevel logLevel, LogFormat logFormat)
     @Override
     protected void logMessage(byte[] message, LogLevel logLevel) {
         if (message == null) {
-            message = NULL_BYTES_VALUE;
+            sink.log(logLevel, this.logFormat, NULL_BYTES_VALUE);
+        } else {
+            sink.log(logLevel, this.logFormat, message);
         }
-        sink.log(logLevel, this.logFormat, message);
     }
 }
diff --git a/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/runtime/api/client/logging/LogFiltering.java b/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/runtime/api/client/logging/LogFiltering.java
index 59038efa..a9bdec86 100644
--- a/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/runtime/api/client/logging/LogFiltering.java
+++ b/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/runtime/api/client/logging/LogFiltering.java
@@ -1,4 +1,7 @@
-/* Copyright 2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. */
+/*
+Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+SPDX-License-Identifier: Apache-2.0
+*/
 
 package com.amazonaws.services.lambda.runtime.api.client.logging;
 
diff --git a/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/runtime/api/client/logging/LogFormatter.java b/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/runtime/api/client/logging/LogFormatter.java
index debe5af4..283b5228 100644
--- a/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/runtime/api/client/logging/LogFormatter.java
+++ b/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/runtime/api/client/logging/LogFormatter.java
@@ -1,4 +1,7 @@
-/* Copyright 2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. */
+/*
+Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+SPDX-License-Identifier: Apache-2.0
+*/
 
 package com.amazonaws.services.lambda.runtime.api.client.logging;
 
@@ -9,5 +12,5 @@ public interface LogFormatter {
     String format(String message, LogLevel logLevel);
 
     default void setLambdaContext(LambdaContext context) {
-    };
+    }
 }
diff --git a/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/runtime/api/client/logging/LogSink.java b/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/runtime/api/client/logging/LogSink.java
index 77df08e2..769adb77 100644
--- a/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/runtime/api/client/logging/LogSink.java
+++ b/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/runtime/api/client/logging/LogSink.java
@@ -1,11 +1,13 @@
-/* Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. */
+/*
+Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+SPDX-License-Identifier: Apache-2.0
+*/
 
 package com.amazonaws.services.lambda.runtime.api.client.logging;
 
-import java.io.Closeable;
-
-import com.amazonaws.services.lambda.runtime.logging.LogLevel;
 import com.amazonaws.services.lambda.runtime.logging.LogFormat;
+import com.amazonaws.services.lambda.runtime.logging.LogLevel;
+import java.io.Closeable;
 
 public interface LogSink extends Closeable {
 
diff --git a/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/runtime/api/client/logging/StdOutLogSink.java b/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/runtime/api/client/logging/StdOutLogSink.java
index 6fd6b87c..873e6fde 100644
--- a/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/runtime/api/client/logging/StdOutLogSink.java
+++ b/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/runtime/api/client/logging/StdOutLogSink.java
@@ -1,11 +1,13 @@
-/* Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. */
+/*
+Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+SPDX-License-Identifier: Apache-2.0
+*/
 
 package com.amazonaws.services.lambda.runtime.api.client.logging;
 
-import java.io.IOException;
-
-import com.amazonaws.services.lambda.runtime.logging.LogLevel;
 import com.amazonaws.services.lambda.runtime.logging.LogFormat;
+import com.amazonaws.services.lambda.runtime.logging.LogLevel;
+import java.io.IOException;
 
 public class StdOutLogSink implements LogSink {
     @Override
diff --git a/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/runtime/api/client/logging/StructuredLogMessage.java b/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/runtime/api/client/logging/StructuredLogMessage.java
index 9c271adf..5299bffa 100644
--- a/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/runtime/api/client/logging/StructuredLogMessage.java
+++ b/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/runtime/api/client/logging/StructuredLogMessage.java
@@ -1,4 +1,7 @@
-/* Copyright 2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. */
+/*
+Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+SPDX-License-Identifier: Apache-2.0
+*/
 
 package com.amazonaws.services.lambda.runtime.api.client.logging;
 
diff --git a/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/runtime/api/client/logging/TextLogFormatter.java b/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/runtime/api/client/logging/TextLogFormatter.java
index 7c345401..5424bd4b 100644
--- a/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/runtime/api/client/logging/TextLogFormatter.java
+++ b/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/runtime/api/client/logging/TextLogFormatter.java
@@ -1,18 +1,22 @@
-/* Copyright 2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. */
+/*
+Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+SPDX-License-Identifier: Apache-2.0
+*/
 
 package com.amazonaws.services.lambda.runtime.api.client.logging;
 
-import com.amazonaws.services.lambda.runtime.api.client.api.LambdaContext;
 import com.amazonaws.services.lambda.runtime.logging.LogLevel;
-
 import java.util.HashMap;
+import java.util.Map;
 
 public class TextLogFormatter implements LogFormatter {
-    private static final HashMap<LogLevel, String> logLevelMapper = new HashMap<LogLevel, String>() {{
-        for (LogLevel logLevel: LogLevel.values()) {
-            put(logLevel, "[" + logLevel.toString() + "] ");
+    private static final Map<LogLevel, String> logLevelMapper = new HashMap<LogLevel, String>() {
+        {
+            for (LogLevel logLevel: LogLevel.values()) {
+                put(logLevel, "[" + logLevel.toString() + "] ");
+            }
         }
-    }};
+    };
 
     @Override
     public String format(String message, LogLevel logLevel) {
@@ -20,9 +24,9 @@ public String format(String message, LogLevel logLevel) {
             return message;
         }
 
-        return new StringBuilder()
-            .append(logLevelMapper.get(logLevel))
-            .append(message)
-            .toString();
+        return new StringBuilder().
+            append(logLevelMapper.
+            get(logLevel)).append(message).
+            toString();
     }
 }
diff --git a/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/runtime/api/client/runtimeapi/DtoSerializers.java b/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/runtime/api/client/runtimeapi/DtoSerializers.java
index 3fdcb76b..cda811d7 100644
--- a/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/runtime/api/client/runtimeapi/DtoSerializers.java
+++ b/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/runtime/api/client/runtimeapi/DtoSerializers.java
@@ -8,21 +8,10 @@
 import com.amazonaws.services.lambda.runtime.api.client.runtimeapi.dto.XRayErrorCause;
 import com.amazonaws.services.lambda.runtime.serialization.PojoSerializer;
 import com.amazonaws.services.lambda.runtime.serialization.factories.GsonFactory;
-import com.amazonaws.services.lambda.runtime.serialization.factories.JacksonFactory;
-
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 
 public class DtoSerializers {
-    /**
-     * Implementation of
-     * <a href="https://en.wikipedia.org/wiki/Initialization-on-demand_holder_idiom">Initialization-on-demand holder idiom</a>
-     * This way the serializers will be loaded lazily
-     */
-    private static class SingletonHelper {
-        private static final PojoSerializer<LambdaError> LAMBDA_ERROR_SERIALIZER = GsonFactory.getInstance().getSerializer(LambdaError.class);
-        private static final PojoSerializer<XRayErrorCause> X_RAY_ERROR_CAUSE_SERIALIZER = GsonFactory.getInstance().getSerializer(XRayErrorCause.class);
-    }
 
     public static byte[] serialize(LambdaError error) {
         return serialize(error, SingletonHelper.LAMBDA_ERROR_SERIALIZER);
@@ -40,4 +29,14 @@ private static <T> byte[] serialize(T pojo, PojoSerializer<T> serializer) {
             return null;
         }
     }
+
+    /**
+     * Implementation of
+     * <a href="https://en.wikipedia.org/wiki/Initialization-on-demand_holder_idiom">Initialization-on-demand holder idiom</a>
+     * This way the serializers will be loaded lazily
+     */
+    private static class SingletonHelper {
+        private static final PojoSerializer<LambdaError> LAMBDA_ERROR_SERIALIZER = GsonFactory.getInstance().getSerializer(LambdaError.class);
+        private static final PojoSerializer<XRayErrorCause> X_RAY_ERROR_CAUSE_SERIALIZER = GsonFactory.getInstance().getSerializer(XRayErrorCause.class);
+    }
 }
diff --git a/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/runtime/api/client/runtimeapi/JniHelper.java b/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/runtime/api/client/runtimeapi/JniHelper.java
index 82586d27..349b4ab0 100644
--- a/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/runtime/api/client/runtimeapi/JniHelper.java
+++ b/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/runtime/api/client/runtimeapi/JniHelper.java
@@ -30,10 +30,10 @@ public static void load() {
             System.load(jniLib);
         } else {
             String[] libsToTry = new String[]{
-                    "libaws-lambda-jni.linux-x86_64.so",
-                    "libaws-lambda-jni.linux-aarch_64.so",
-                    "libaws-lambda-jni.linux_musl-x86_64.so",
-                    "libaws-lambda-jni.linux_musl-aarch_64.so"
+                "libaws-lambda-jni.linux-x86_64.so",
+                "libaws-lambda-jni.linux-aarch_64.so",
+                "libaws-lambda-jni.linux_musl-x86_64.so",
+                "libaws-lambda-jni.linux_musl-aarch_64.so"
             };
             unpackAndLoad(libsToTry, NativeClient.class);
         }
@@ -56,8 +56,10 @@ private static void unpackAndLoad(String[] libsToTry, Class clazz) {
         }
 
         for (int i = 0; i < libsToTry.length; ++i) {
-            System.err.println("Failed to load the native runtime interface client library " + libsToTry[i] +
-                    ". Exception: " + errorMessages.get(i));
+            System.err.println("Failed to load the native runtime interface client library " 
+                + libsToTry[i]
+                + ". Exception: " 
+                + errorMessages.get(i));
         }
         System.exit(-1);
     } 
diff --git a/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/runtime/api/client/runtimeapi/LambdaRuntimeApiClient.java b/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/runtime/api/client/runtimeapi/LambdaRuntimeApiClient.java
index 4f476426..7715b994 100644
--- a/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/runtime/api/client/runtimeapi/LambdaRuntimeApiClient.java
+++ b/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/runtime/api/client/runtimeapi/LambdaRuntimeApiClient.java
@@ -7,7 +7,6 @@
 import com.amazonaws.services.lambda.runtime.api.client.runtimeapi.dto.InvocationRequest;
 import com.amazonaws.services.lambda.runtime.api.client.runtimeapi.dto.LambdaError;
 import com.amazonaws.services.lambda.runtime.api.client.runtimeapi.dto.XRayErrorCause;
-
 import java.io.IOException;
 
 /**
diff --git a/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/runtime/api/client/runtimeapi/LambdaRuntimeApiClientImpl.java b/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/runtime/api/client/runtimeapi/LambdaRuntimeApiClientImpl.java
index a62e0a69..21691cf4 100644
--- a/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/runtime/api/client/runtimeapi/LambdaRuntimeApiClientImpl.java
+++ b/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/runtime/api/client/runtimeapi/LambdaRuntimeApiClientImpl.java
@@ -7,7 +7,6 @@
 import com.amazonaws.services.lambda.runtime.api.client.runtimeapi.dto.InvocationRequest;
 import com.amazonaws.services.lambda.runtime.api.client.runtimeapi.dto.LambdaError;
 import com.amazonaws.services.lambda.runtime.api.client.runtimeapi.dto.XRayErrorCause;
-
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -17,22 +16,25 @@
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Objects;
-
 import static java.net.HttpURLConnection.HTTP_ACCEPTED;
 import static java.net.HttpURLConnection.HTTP_OK;
 import static java.nio.charset.StandardCharsets.UTF_8;
 
 public class LambdaRuntimeApiClientImpl implements LambdaRuntimeApiClient {
-    private final String baseUrl;
-    private final String invocationEndpoint;
+
     static final String USER_AGENT = String.format(
-            "aws-lambda-java/%s-%s",
-            System.getProperty("java.vendor.version"),
-            LambdaRuntimeApiClientImpl.class.getPackage().getImplementationVersion());
+        "aws-lambda-java/%s-%s",
+        System.getProperty("java.vendor.version"),
+        LambdaRuntimeApiClientImpl.class.getPackage().getImplementationVersion());
+
     private static final String DEFAULT_CONTENT_TYPE = "application/json";
     private static final String XRAY_ERROR_CAUSE_HEADER = "Lambda-Runtime-Function-XRay-Error-Cause";
     private static final String ERROR_TYPE_HEADER = "Lambda-Runtime-Function-Error-Type";
-    private static final int XRAY_ERROR_CAUSE_MAX_HEADER_SIZE = 1024 * 1024; // 1MiB
+    // 1MiB
+    private static final int XRAY_ERROR_CAUSE_MAX_HEADER_SIZE = 1024 * 1024;
+
+    private final String baseUrl;
+    private final String invocationEndpoint;
 
     public LambdaRuntimeApiClientImpl(String hostnameAndPort) {
         Objects.requireNonNull(hostnameAndPort, "hostnameAndPort cannot be null");
diff --git a/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/runtime/api/client/runtimeapi/NativeClient.java b/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/runtime/api/client/runtimeapi/NativeClient.java
index 3929e114..101aea4d 100644
--- a/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/runtime/api/client/runtimeapi/NativeClient.java
+++ b/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/runtime/api/client/runtimeapi/NativeClient.java
@@ -5,8 +5,6 @@
 package com.amazonaws.services.lambda.runtime.api.client.runtimeapi;
 
 import com.amazonaws.services.lambda.runtime.api.client.runtimeapi.dto.InvocationRequest;
-import com.amazonaws.services.lambda.runtime.api.client.runtimeapi.JniHelper;
-
 import static com.amazonaws.services.lambda.runtime.api.client.runtimeapi.LambdaRuntimeApiClientImpl.USER_AGENT;
 
 /**
diff --git a/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/runtime/api/client/runtimeapi/converters/LambdaErrorConverter.java b/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/runtime/api/client/runtimeapi/converters/LambdaErrorConverter.java
index 095b2cdc..decef446 100644
--- a/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/runtime/api/client/runtimeapi/converters/LambdaErrorConverter.java
+++ b/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/runtime/api/client/runtimeapi/converters/LambdaErrorConverter.java
@@ -17,8 +17,8 @@ public static LambdaError fromUserFault(UserFault userFault) {
     }
 
     public static LambdaError fromThrowable(Throwable throwable) {
-        String errorMessage = throwable.getLocalizedMessage() == null ?
-                throwable.getClass().getName() : throwable.getLocalizedMessage();
+        String errorMessage = throwable.getLocalizedMessage() == null 
+            ? throwable.getClass().getName() : throwable.getLocalizedMessage();
         String errorType = throwable.getClass().getName();
 
         StackTraceElement[] trace = throwable.getStackTrace();
diff --git a/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/runtime/api/client/runtimeapi/converters/XRayErrorCauseConverter.java b/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/runtime/api/client/runtimeapi/converters/XRayErrorCauseConverter.java
index f24c3a5d..7065bc76 100644
--- a/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/runtime/api/client/runtimeapi/converters/XRayErrorCauseConverter.java
+++ b/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/runtime/api/client/runtimeapi/converters/XRayErrorCauseConverter.java
@@ -7,7 +7,6 @@
 import com.amazonaws.services.lambda.runtime.api.client.runtimeapi.dto.StackElement;
 import com.amazonaws.services.lambda.runtime.api.client.runtimeapi.dto.XRayErrorCause;
 import com.amazonaws.services.lambda.runtime.api.client.runtimeapi.dto.XRayException;
-
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
@@ -22,9 +21,9 @@ public static XRayErrorCause fromThrowable(Throwable throwable) {
         String workingDirectory = System.getProperty("user.dir");
         XRayException xRayException = getXRayExceptionFromThrowable(throwable);
         Collection<XRayException> exceptions = Collections.singletonList(xRayException);
-        Collection<String> paths = Arrays.stream(throwable.getStackTrace())
-                .map(XRayErrorCauseConverter::determineFileName)
-                .collect(Collectors.toSet());
+        Collection<String> paths = Arrays.stream(throwable.getStackTrace()).
+            map(XRayErrorCauseConverter::determineFileName).
+            collect(Collectors.toSet());
 
         return new XRayErrorCause(workingDirectory, exceptions, paths);
     }
@@ -32,9 +31,9 @@ public static XRayErrorCause fromThrowable(Throwable throwable) {
     static XRayException getXRayExceptionFromThrowable(Throwable throwable) {
         String message = throwable.getMessage();
         String type = throwable.getClass().getName();
-        List<StackElement> stack = Arrays.stream(throwable.getStackTrace())
-                .map(XRayErrorCauseConverter::convertStackTraceElement)
-                .collect(Collectors.toList());
+        List<StackElement> stack = Arrays.stream(throwable.getStackTrace()).
+            map(XRayErrorCauseConverter::convertStackTraceElement).
+            collect(Collectors.toList());
         return new XRayException(message, type, stack);
     }
 
diff --git a/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/runtime/api/client/util/EnvReader.java b/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/runtime/api/client/util/EnvReader.java
index 968119ac..840bd440 100644
--- a/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/runtime/api/client/util/EnvReader.java
+++ b/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/runtime/api/client/util/EnvReader.java
@@ -1,4 +1,7 @@
-/* Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. */
+/*
+Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+SPDX-License-Identifier: Apache-2.0
+*/
 
 package com.amazonaws.services.lambda.runtime.api.client.util;
 
diff --git a/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/runtime/api/client/util/LambdaOutputStream.java b/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/runtime/api/client/util/LambdaOutputStream.java
index 556859a2..22d01b0a 100644
--- a/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/runtime/api/client/util/LambdaOutputStream.java
+++ b/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/runtime/api/client/util/LambdaOutputStream.java
@@ -1,9 +1,12 @@
-/* Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. */
+/*
+Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+SPDX-License-Identifier: Apache-2.0
+*/
 
 package com.amazonaws.services.lambda.runtime.api.client.util;
 
-import java.io.OutputStream;
 import java.io.IOException;
+import java.io.OutputStream;
 
 public class LambdaOutputStream extends OutputStream {
     private final OutputStream inner;
diff --git a/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/runtime/api/client/util/UnsafeUtil.java b/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/runtime/api/client/util/UnsafeUtil.java
index f9351c94..f11d4357 100644
--- a/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/runtime/api/client/util/UnsafeUtil.java
+++ b/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/runtime/api/client/util/UnsafeUtil.java
@@ -1,10 +1,12 @@
-/* Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. */
+/*
+Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+SPDX-License-Identifier: Apache-2.0
+*/
 
 package com.amazonaws.services.lambda.runtime.api.client.util;
 
-import sun.misc.Unsafe;
-
 import java.lang.reflect.Field;
+import sun.misc.Unsafe;
 
 /**
  * Utilities for easy access to sun.misc.Unsafe
diff --git a/aws-lambda-java-runtime-interface-client/src/test/java/com/amazonaws/services/lambda/crac/ContextImplTest.java b/aws-lambda-java-runtime-interface-client/src/test/java/com/amazonaws/services/lambda/crac/ContextImplTest.java
index bad72ea2..7a7653dc 100644
--- a/aws-lambda-java-runtime-interface-client/src/test/java/com/amazonaws/services/lambda/crac/ContextImplTest.java
+++ b/aws-lambda-java-runtime-interface-client/src/test/java/com/amazonaws/services/lambda/crac/ContextImplTest.java
@@ -2,6 +2,7 @@
 Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 SPDX-License-Identifier: Apache-2.0
 */
+
 package com.amazonaws.services.lambda.crac;
 
 import org.junit.jupiter.api.BeforeAll;