diff --git a/Sources/AWSLambdaRuntimeCore/NewLambdaContext.swift b/Sources/AWSLambdaRuntimeCore/NewLambdaContext.swift
new file mode 100644
index 00000000..89414728
--- /dev/null
+++ b/Sources/AWSLambdaRuntimeCore/NewLambdaContext.swift
@@ -0,0 +1,140 @@
+//===----------------------------------------------------------------------===//
+//
+// This source file is part of the SwiftAWSLambdaRuntime open source project
+//
+// Copyright (c) 2017-2022 Apple Inc. and the SwiftAWSLambdaRuntime project authors
+// Licensed under Apache License v2.0
+//
+// See LICENSE.txt for license information
+// See CONTRIBUTORS.txt for the list of SwiftAWSLambdaRuntime project authors
+//
+// SPDX-License-Identifier: Apache-2.0
+//
+//===----------------------------------------------------------------------===//
+
+import Dispatch
+import Logging
+import NIOCore
+
+// MARK: - Context
+
+/// Lambda runtime context.
+/// The Lambda runtime generates and passes the `LambdaContext` to the Lambda handler as an argument.
+package struct NewLambdaContext: CustomDebugStringConvertible, Sendable {
+    final class _Storage: Sendable {
+        let requestID: String
+        let traceID: String
+        let invokedFunctionARN: String
+        let deadline: DispatchWallTime
+        let cognitoIdentity: String?
+        let clientContext: String?
+        let logger: Logger
+
+        init(
+            requestID: String,
+            traceID: String,
+            invokedFunctionARN: String,
+            deadline: DispatchWallTime,
+            cognitoIdentity: String?,
+            clientContext: String?,
+            logger: Logger
+        ) {
+            self.requestID = requestID
+            self.traceID = traceID
+            self.invokedFunctionARN = invokedFunctionARN
+            self.deadline = deadline
+            self.cognitoIdentity = cognitoIdentity
+            self.clientContext = clientContext
+            self.logger = logger
+        }
+    }
+
+    private var storage: _Storage
+
+    /// The request ID, which identifies the request that triggered the function invocation.
+    package var requestID: String {
+        self.storage.requestID
+    }
+
+    /// The AWS X-Ray tracing header.
+    package var traceID: String {
+        self.storage.traceID
+    }
+
+    /// The ARN of the Lambda function, version, or alias that's specified in the invocation.
+    package var invokedFunctionARN: String {
+        self.storage.invokedFunctionARN
+    }
+
+    /// The timestamp that the function times out.
+    package var deadline: DispatchWallTime {
+        self.storage.deadline
+    }
+
+    /// For invocations from the AWS Mobile SDK, data about the Amazon Cognito identity provider.
+    package var cognitoIdentity: String? {
+        self.storage.cognitoIdentity
+    }
+
+    /// For invocations from the AWS Mobile SDK, data about the client application and device.
+    package var clientContext: String? {
+        self.storage.clientContext
+    }
+
+    /// `Logger` to log with.
+    ///
+    /// - note: The `LogLevel` can be configured using the `LOG_LEVEL` environment variable.
+    package var logger: Logger {
+        self.storage.logger
+    }
+
+    init(
+        requestID: String,
+        traceID: String,
+        invokedFunctionARN: String,
+        deadline: DispatchWallTime,
+        cognitoIdentity: String? = nil,
+        clientContext: String? = nil,
+        logger: Logger
+    ) {
+        self.storage = _Storage(
+            requestID: requestID,
+            traceID: traceID,
+            invokedFunctionARN: invokedFunctionARN,
+            deadline: deadline,
+            cognitoIdentity: cognitoIdentity,
+            clientContext: clientContext,
+            logger: logger
+        )
+    }
+
+    package func getRemainingTime() -> TimeAmount {
+        let deadline = self.deadline.millisSinceEpoch
+        let now = DispatchWallTime.now().millisSinceEpoch
+
+        let remaining = deadline - now
+        return .milliseconds(remaining)
+    }
+
+    package var debugDescription: String {
+        "\(Self.self)(requestID: \(self.requestID), traceID: \(self.traceID), invokedFunctionARN: \(self.invokedFunctionARN), cognitoIdentity: \(self.cognitoIdentity ?? "nil"), clientContext: \(self.clientContext ?? "nil"), deadline: \(self.deadline))"
+    }
+
+    /// This interface is not part of the public API and must not be used by adopters. This API is not part of semver versioning.
+    package static func __forTestsOnly(
+        requestID: String,
+        traceID: String,
+        invokedFunctionARN: String,
+        timeout: DispatchTimeInterval,
+        logger: Logger,
+        eventLoop: EventLoop
+    ) -> NewLambdaContext {
+        NewLambdaContext(
+            requestID: requestID,
+            traceID: traceID,
+            invokedFunctionARN: invokedFunctionARN,
+            deadline: .now() + timeout,
+            logger: logger
+        )
+    }
+}