diff --git a/libraries/src/AWS.Lambda.Powertools.EventHandler.Resolvers.BedrockAgentFunction/AWS.Lambda.Powertools.EventHandler.Resolvers.BedrockAgentFunction.csproj b/libraries/src/AWS.Lambda.Powertools.EventHandler.Resolvers.BedrockAgentFunction/AWS.Lambda.Powertools.EventHandler.Resolvers.BedrockAgentFunction.csproj
index e6cbf62a..b0a7db73 100644
--- a/libraries/src/AWS.Lambda.Powertools.EventHandler.Resolvers.BedrockAgentFunction/AWS.Lambda.Powertools.EventHandler.Resolvers.BedrockAgentFunction.csproj
+++ b/libraries/src/AWS.Lambda.Powertools.EventHandler.Resolvers.BedrockAgentFunction/AWS.Lambda.Powertools.EventHandler.Resolvers.BedrockAgentFunction.csproj
@@ -9,11 +9,13 @@
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
         <RunAOTCompilation>true</RunAOTCompilation>
+        <IncludeCommonFiles>true</IncludeCommonFiles>
     </PropertyGroup>
 
     <ItemGroup>
         <PackageReference Include="Amazon.Lambda.Core"/>
         <PackageReference Include="Microsoft.Extensions.DependencyInjection" />
+        <ProjectReference Include="..\AWS.Lambda.Powertools.Common\AWS.Lambda.Powertools.Common.csproj" Condition="'$(Configuration)'=='Debug'"/>
     </ItemGroup>
 
 </Project>
\ No newline at end of file
diff --git a/libraries/src/AWS.Lambda.Powertools.EventHandler.Resolvers.BedrockAgentFunction/BedrockAgentFunctionResolver.cs b/libraries/src/AWS.Lambda.Powertools.EventHandler.Resolvers.BedrockAgentFunction/BedrockAgentFunctionResolver.cs
index d0e15c09..7b1f654f 100644
--- a/libraries/src/AWS.Lambda.Powertools.EventHandler.Resolvers.BedrockAgentFunction/BedrockAgentFunctionResolver.cs
+++ b/libraries/src/AWS.Lambda.Powertools.EventHandler.Resolvers.BedrockAgentFunction/BedrockAgentFunctionResolver.cs
@@ -15,6 +15,7 @@
 
 using System.Text.Json.Serialization.Metadata;
 using Amazon.Lambda.Core;
+using AWS.Lambda.Powertools.Common;
 using AWS.Lambda.Powertools.EventHandler.Resolvers.BedrockAgentFunction.Models;
 using AWS.Lambda.Powertools.EventHandler.Resolvers.BedrockAgentFunction.Helpers;
 
@@ -54,6 +55,7 @@ private readonly
         public BedrockAgentFunctionResolver(IJsonTypeInfoResolver? typeResolver = null)
         {
             _parameterMapper = new ParameterMapper(typeResolver);
+            SystemWrapper.Instance.SetExecutionEnvironment(this);
         }
         
         /// <summary>
diff --git a/libraries/src/AWS.Lambda.Powertools.EventHandler/AWS.Lambda.Powertools.EventHandler.csproj b/libraries/src/AWS.Lambda.Powertools.EventHandler/AWS.Lambda.Powertools.EventHandler.csproj
index 7c281eff..04f632fe 100644
--- a/libraries/src/AWS.Lambda.Powertools.EventHandler/AWS.Lambda.Powertools.EventHandler.csproj
+++ b/libraries/src/AWS.Lambda.Powertools.EventHandler/AWS.Lambda.Powertools.EventHandler.csproj
@@ -10,10 +10,12 @@
         <TargetMultiFramework>false</TargetMultiFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
+        <IncludeCommonFiles>true</IncludeCommonFiles>
     </PropertyGroup>
     
     <ItemGroup>
         <PackageReference Include="Amazon.Lambda.Core" />
+        <ProjectReference Include="..\AWS.Lambda.Powertools.Common\AWS.Lambda.Powertools.Common.csproj" Condition="'$(Configuration)'=='Debug'"/>
     </ItemGroup>
 
 </Project>
diff --git a/libraries/src/AWS.Lambda.Powertools.EventHandler/AppSyncEvents/AppSyncEventsResolver.cs b/libraries/src/AWS.Lambda.Powertools.EventHandler/AppSyncEvents/AppSyncEventsResolver.cs
index 5213f66f..afbf077d 100644
--- a/libraries/src/AWS.Lambda.Powertools.EventHandler/AppSyncEvents/AppSyncEventsResolver.cs
+++ b/libraries/src/AWS.Lambda.Powertools.EventHandler/AppSyncEvents/AppSyncEventsResolver.cs
@@ -1,4 +1,5 @@
 using Amazon.Lambda.Core;
+using AWS.Lambda.Powertools.Common;
 using AWS.Lambda.Powertools.EventHandler.Internal;
 
 namespace AWS.Lambda.Powertools.EventHandler.AppSyncEvents;
@@ -20,6 +21,7 @@ public AppSyncEventsResolver()
     {
         _publishRoutes = new RouteHandlerRegistry<AppSyncEventsRequest, object>();
         _subscribeRoutes = new RouteHandlerRegistry<AppSyncEventsRequest, bool>();
+        SystemWrapper.Instance.SetExecutionEnvironment(this);
     }
 
     #region OnPublish Methods
diff --git a/version.json b/version.json
index 7f02f255..b64a3537 100644
--- a/version.json
+++ b/version.json
@@ -9,8 +9,8 @@
 		"Parameters": "1.3.1",
 		"Idempotency": "1.3.0",
 		"BatchProcessing": "1.2.1",
-		"EventHandler": "1.0.0",
-		"EventHandler.Resolvers.BedrockAgentFunction": "1.0.0",
+		"EventHandler": "1.0.1",
+		"EventHandler.Resolvers.BedrockAgentFunction": "1.0.1",
 		"Kafka.Json" : "1.0.1",
 		"Kafka.Avro" : "1.0.1",
 		"Kafka.Protobuf" : "1.0.1"