diff --git a/src/Ryujinx.Horizon/Sdk/Am/IApplicationProxy.cs b/src/Ryujinx.Horizon/Sdk/Am/IApplicationProxy.cs
index 33db045d3..232a4238a 100644
--- a/src/Ryujinx.Horizon/Sdk/Am/IApplicationProxy.cs
+++ b/src/Ryujinx.Horizon/Sdk/Am/IApplicationProxy.cs
@@ -4,7 +4,7 @@ namespace Ryujinx.Horizon.Sdk.Am
 {
     public interface IApplicationProxy
     {
-        Result GetCommonStateGetter();
+        Result GetCommonStateGetter(out ICommonStateGetter commonStateGetter, ulong pid);
         Result GetSelfController();
         Result GetWindowController();
         Result GetAudioController();
diff --git a/src/Ryujinx.Horizon/Sdk/Am/ICommonStateGetter.cs b/src/Ryujinx.Horizon/Sdk/Am/ICommonStateGetter.cs
new file mode 100644
index 000000000..914714f5f
--- /dev/null
+++ b/src/Ryujinx.Horizon/Sdk/Am/ICommonStateGetter.cs
@@ -0,0 +1,61 @@
+using Ryujinx.Horizon.Common;
+
+namespace Ryujinx.Horizon.Sdk.Am
+{
+    public interface ICommonStateGetter
+    {
+        Result GetEventHandle();
+        Result ReceiveMessage();
+        Result GetThisAppletKind();
+        Result AllowToEnterSleep();
+        Result DisallowToEnterSleep();
+        Result GetOperationMode();
+        Result GetPerformanceMode();
+        Result GetCradleStatus();
+        Result GetBootMode();
+        Result GetCurrentFocusState();
+        Result RequestToAcquireSleepLock();
+        Result ReleaseSleepLock();
+        Result ReleaseSleepLockTransiently();
+        Result GetAcquiredSleepLockEvent();
+        Result GetWakeupCount();
+        Result PushToGeneralChannel();
+        Result GetHomeButtonReaderLockAccessor();
+        Result GetReaderLockAccessorEx();
+        Result GetWriterLockAccessorEx();
+        Result GetCradleFwVersion();
+        Result IsVrModeEnabled();
+        Result SetVrModeEnabled();
+        Result SetLcdBacklightOffEnabled();
+        Result BeginVrModeEx();
+        Result EndVrModeEx();
+        Result IsInControllerFirmwareUpdateSection();
+        Result SetVrPositionForDebug();
+        Result GetDefaultDisplayResolution();
+        Result GetDefaultDisplayResolutionChangeEvent();
+        Result GetHdcpAuthenticationState();
+        Result GetHdcpAuthenticationStateChangeEvent();
+        Result SetTvPowerStateMatchingMode();
+        Result GetApplicationIdByContentActionName();
+        Result SetCpuBoostMode();
+        Result CancelCpuBoostMode();
+        Result GetBuiltInDisplayType();
+        Result PerformSystemButtonPressingIfInFocus();
+        Result SetPerformanceConfigurationChangedNotification();
+        Result GetCurrentPerformanceConfiguration();
+        Result SetHandlingHomeButtonShortPressedEnabled();
+        Result OpenMyGpuErrorHandler();
+        Result GetAppletLaunchedHistory();
+        Result GetOperationModeSystemInfo();
+        Result GetSettingsPlatformRegion();
+        Result ActivateMigrationService();
+        Result DeactivateMigrationService();
+        Result DisableSleepTillShutdown();
+        Result SuppressDisablingSleepTemporarily();
+        Result IsSleepEnabled();
+        Result IsDisablingSleepSuppressed();
+        Result OpenNamedChannelAsChild();
+        Result SetRequestExitToLibraryAppletAtExecuteNextProgramEnabled();
+        Result GetLaunchRequiredTick();
+    }
+}
diff --git a/src/Ryujinx.Horizon/Sdk/Am/ILibraryAppletProxy.cs b/src/Ryujinx.Horizon/Sdk/Am/ILibraryAppletProxy.cs
index f647a2093..593f30f42 100644
--- a/src/Ryujinx.Horizon/Sdk/Am/ILibraryAppletProxy.cs
+++ b/src/Ryujinx.Horizon/Sdk/Am/ILibraryAppletProxy.cs
@@ -4,7 +4,7 @@ namespace Ryujinx.Horizon.Sdk.Am
 {
     public interface ILibraryAppletProxy
     {
-        Result GetCommonStateGetter();
+        Result GetCommonStateGetter(out ICommonStateGetter commonStateGetter, ulong pid);
         Result GetSelfController();
         Result GetWindowController();
         Result GetAudioController();
diff --git a/src/Ryujinx.Horizon/Sdk/Am/IOverlayAppletProxy.cs b/src/Ryujinx.Horizon/Sdk/Am/IOverlayAppletProxy.cs
index 875bd7d3e..f18ae7839 100644
--- a/src/Ryujinx.Horizon/Sdk/Am/IOverlayAppletProxy.cs
+++ b/src/Ryujinx.Horizon/Sdk/Am/IOverlayAppletProxy.cs
@@ -4,7 +4,7 @@ namespace Ryujinx.Horizon.Sdk.Am
 {
     public interface IOverlayAppletProxy
     {
-        Result GetCommonStateGetter();
+        Result GetCommonStateGetter(out ICommonStateGetter commonStateGetter, ulong pid);
         Result GetSelfController();
         Result GetWindowController();
         Result GetAudioController();
diff --git a/src/Ryujinx.Horizon/Sdk/Am/ISystemAppletProxy.cs b/src/Ryujinx.Horizon/Sdk/Am/ISystemAppletProxy.cs
index ef0e0c9b2..0e9dd7937 100644
--- a/src/Ryujinx.Horizon/Sdk/Am/ISystemAppletProxy.cs
+++ b/src/Ryujinx.Horizon/Sdk/Am/ISystemAppletProxy.cs
@@ -4,7 +4,7 @@ namespace Ryujinx.Horizon.Sdk.Am
 {
     public interface ISystemAppletProxy
     {
-        Result GetCommonStateGetter();
+        Result GetCommonStateGetter(out ICommonStateGetter commonStateGetter, ulong pid);
         Result GetSelfController();
         Result GetWindowController();
         Result GetAudioController();