diff --git a/.gitignore b/.gitignore
index 469df8a..4dd3f51 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,9 +2,13 @@ Library
 Logs
 *.csproj
 *.slnx
+*.sln
 *DoNotShip
 Temp
 UserSettings
+/obj/
 .vscode
 .utmp
 .DS_Store
+.vs
+.vsconfig
\ No newline at end of file
diff --git a/Assets/Plugins/Android/mainTemplate.gradle b/Assets/Plugins/Android/mainTemplate.gradle
index cb7d2ff..55b0852 100644
--- a/Assets/Plugins/Android/mainTemplate.gradle
+++ b/Assets/Plugins/Android/mainTemplate.gradle
@@ -37,9 +37,16 @@ android {
         aidl true
     }
 
+    defaultConfig.externalNativeBuild{
+        cmake {
+            arguments += '-DUNITY_PROJECT_DIR="**DIR_UNITYPROJECT**"'
+            arguments += '-DANDROID_SDK="' + getSdkDir() + '"'
+        }
+    }
+
     sourceSets {
         main {
-            aidl.srcDirs += ['../../MosisVR/Packages/com.omarator.mosissdk/Plugins/Android/aidl']
+            aidl.srcDirs += ['**DIR_UNITYPROJECT**/Packages/com.omarator.mosissdk/Plugins/Android/aidl']
         }
     }
 
diff --git a/Assets/Resources.meta b/Assets/Resources.meta
new file mode 100644
index 0000000..1b1b300
--- /dev/null
+++ b/Assets/Resources.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: b0147093d89d3e44a9c394836ceac745
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Packages/com.omarator.mosissdk/Editor/AppendCmake.cs b/Packages/com.omarator.mosissdk/Editor/AppendCmake.cs
index a15adc7..ba34bb2 100644
--- a/Packages/com.omarator.mosissdk/Editor/AppendCmake.cs
+++ b/Packages/com.omarator.mosissdk/Editor/AppendCmake.cs
@@ -29,7 +29,8 @@ public class AndroidPostProcess : IPostGenerateGradleAndroidProject
 
         // 4. Prepare the command
         string commandName = "my_plugin_build";
-        string lineToAdd = $"\nadd_subdirectory(\"{relativePathToMyCpp}\" \"{commandName}\")\n";
+        string unityRoot = EditorApplication.applicationContentsPath;
+        string lineToAdd = $"\nset(UNITY_ROOT \"{unityRoot}\")\nadd_subdirectory(\"{relativePathToMyCpp}\" \"{commandName}\")\n";
 
         // 5. Prevent multiple additions
         string currentContent = File.ReadAllText(targetCmakeFile);
diff --git a/Packages/com.omarator.mosissdk/Plugins/Android/cpp/CMakeLists.txt b/Packages/com.omarator.mosissdk/Plugins/Android/cpp/CMakeLists.txt
index 99e9664..3372dd4 100644
--- a/Packages/com.omarator.mosissdk/Plugins/Android/cpp/CMakeLists.txt
+++ b/Packages/com.omarator.mosissdk/Plugins/Android/cpp/CMakeLists.txt
@@ -6,11 +6,14 @@ find_library(log-lib log)
 set(CMAKE_CXX_STANDARD 23)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
-set(PLUGIN_API "/Applications/Unity/Hub/Editor/6000.3.2f1/Unity.app/Contents/PluginAPI")
-set(ANDROID_SDK "/Users/omar/Library/Android/sdk")
+message(STATUS "AAA-${UNITY_ROOT}")
+message(STATUS "AAA-${UNITY_PROJECT_DIR}")
+message(STATUS "AAA-${ANDROID_SDK}")
+
+set(PLUGIN_API "${UNITY_ROOT}/PluginAPI")
 set(BINDER_DIR "${ANDROID_SDK}/platforms/android-36/optional/libbinder_ndk_cpp")
 
-set(SHARED_SRC_DIR "/Users/omar/Desktop/NativeService/src/main/cpp/")
+set(SHARED_SRC_DIR "${UNITY_PROJECT_DIR}/../MosisService/src/main/cpp/")
 add_library(my_native_lib SHARED
     my_native_code.cpp
     ${SHARED_SRC_DIR}/com/omixlab/mosis/IMosisService.cpp
diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset
index 63173ff..b1d2774 100644
--- a/ProjectSettings/ProjectSettings.asset
+++ b/ProjectSettings/ProjectSettings.asset
@@ -144,7 +144,10 @@ PlayerSettings:
   visionOSBundleVersion: 1.0
   tvOSBundleVersion: 1.0
   bundleVersion: 9.2.1
-  preloadedAssets: []
+  preloadedAssets:
+  - {fileID: 9030113687040111788, guid: 4b3de149e50ea0c4f8ad04c79b9f12ec, type: 2}
+  - {fileID: 4226981303226134123, guid: b716680a41c7a094fa3b7fb9a8024a67, type: 2}
+  - {fileID: 11400000, guid: 908d62378b8205449861e5838a18a596, type: 2}
   metroInputSource: 0
   wsaTransparentSwapchain: 0
   m_HolographicPauseOnTrackingLoss: 1