diff --git a/app/build.gradle b/app/build.gradle
index fb586e8..f9d20ed 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,6 +1,12 @@
 apply plugin: 'com.android.application'
 
 android {
+    flavorDimensions "api"
+    productFlavors {
+        Riru {
+            dimension 'api'
+        }
+    }
     compileSdkVersion rootProject.ext.androidCompileSdkVersion
     defaultConfig {
         applicationId "org.lsposed.lspatch"
diff --git a/app/src/main/java/org/lsposed/lspatch/loader/LSPApplication.java b/app/src/main/java/org/lsposed/lspatch/loader/LSPApplication.java
index 1c6fb8d..ef7e4b5 100644
--- a/app/src/main/java/org/lsposed/lspatch/loader/LSPApplication.java
+++ b/app/src/main/java/org/lsposed/lspatch/loader/LSPApplication.java
@@ -17,6 +17,7 @@ import android.os.Bundle;
 import android.os.Environment;
 import android.os.IBinder;
 import android.os.Parcel;
+import android.os.ParcelFileDescriptor;
 import android.os.RemoteException;
 import android.system.Os;
 import android.util.Log;
@@ -373,16 +374,6 @@ public class LSPApplication extends ApplicationServiceClient {
         return null;
     }
 
-    @Override
-    public boolean requestManagerBinder(String packageName, String path, List<IBinder> binder) {
-        return false;
-    }
-
-    @Override
-    public boolean isResourcesHookEnabled() {
-        return false;
-    }
-
     @Override
     public List getModulesList(String processName) {
         return getModulesList();
@@ -403,6 +394,11 @@ public class LSPApplication extends ApplicationServiceClient {
         return null;
     }
 
+    @Override
+    public ParcelFileDescriptor requestInjectedManagerBinder(List<IBinder> binder) throws RemoteException {
+        return null;
+    }
+
     @Override
     public IBinder asBinder() {
         return null;
diff --git a/build.gradle b/build.gradle
index 727e5ff..e758533 100644
--- a/build.gradle
+++ b/build.gradle
@@ -8,6 +8,7 @@ buildscript {
     dependencies {
         classpath 'com.android.tools.build:gradle:7.0.3'
         classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.31'
+        classpath("androidx.navigation:navigation-safe-args-gradle-plugin:2.4.0-beta02")
     }
 }
 
@@ -24,6 +25,8 @@ ext {
     defaultManagerPackageName = "org.lsposed.lspatch"
     androidSourceCompatibility = JavaVersion.VERSION_11
     androidTargetCompatibility = JavaVersion.VERSION_11
+    agpVersion = "7.0.3"
+    navVersion = "2.4.0-beta02"
 }
 
 allprojects {
diff --git a/core b/core
index d1098f0..a06ba93 160000
--- a/core
+++ b/core
@@ -1 +1 @@
-Subproject commit d1098f04abbcc2a91ef211055c60c1a992b899d1
+Subproject commit a06ba931a533198cd906825d436280db8247c869
diff --git a/imanager/build.gradle b/imanager/build.gradle
index db596da..6edcf49 100644
--- a/imanager/build.gradle
+++ b/imanager/build.gradle
@@ -3,6 +3,12 @@ plugins {
 }
 
 android {
+    flavorDimensions "api"
+    productFlavors {
+        Riru {
+            dimension 'api'
+        }
+    }
     compileSdk 31
 
     defaultConfig {
@@ -23,4 +29,4 @@ android {
 
 dependencies {
     implementation project(path: ':lspcore')
-}
\ No newline at end of file
+}
diff --git a/patch/build.gradle b/patch/build.gradle
index 91fed56..77807ab 100644
--- a/patch/build.gradle
+++ b/patch/build.gradle
@@ -46,7 +46,7 @@ jar {
 
 tasks.register("buildDebug") {
     jar.dependsOn(':appstub:copyDebug')
-    jar.dependsOn(':app:copyDebug')
+    jar.dependsOn(':app:copyRiruDebug')
     dependsOn(build)
 }
 
diff --git a/settings.gradle b/settings.gradle
index 02de81d..bf47e3e 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -2,6 +2,8 @@ include ':app'
 rootProject.name='LSPatch'
 include ':lspcore'
 project(':lspcore').projectDir = new File('core/core')
+include ':lspapp'
+project(':lspapp').projectDir = new File('core/app')
 include ':hiddenapi-stubs'
 project(':hiddenapi-stubs').projectDir = new File('core/hiddenapi-stubs')
 include ':interface'