diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml
index ee9c559..533d731 100644
--- a/.github/workflows/build-windows.yml
+++ b/.github/workflows/build-windows.yml
@@ -64,6 +64,12 @@ jobs:
           version: ${{ env.QT_VERSION }}
           modules: "qtmultimedia qtlocation qtpositioning qtserialport"
 
+      - name: Install WinFsp
+        shell: pwsh
+        run: |
+          choco install winfsp -y
+          refreshenv
+
       - name: Setup .NET SDK
         uses: actions/setup-dotnet@v4
         with:
diff --git a/.gitmodules b/.gitmodules
index a7feee4..1e3396f 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,9 +1,3 @@
-[submodule "src/core/airplay"]
-	path = lib/airplay
-	url = https://github.com/uncor3/airplay
-[submodule "src/lib/ipatool-go"]
-	path = lib/ipatool-go
-	url = https://github.com/uncor3/libipatool-go.git
 [submodule "lib/airplay"]
 	path = lib/airplay
 	url = https://github.com/uncor3/airplay
@@ -13,3 +7,6 @@
 [submodule "lib/zupdater"]
 	path = lib/zupdater
 	url = https://github.com/uncor3/ZUpdater
+[submodule "lib/win-ifuse"]
+	path = lib/win-ifuse
+	url = https://github.com/uncor3/win-ifuse.git
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7a544bf..4e4810e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -189,6 +189,12 @@ add_subdirectory(lib/airplay)
 add_subdirectory(lib/ipatool-go)
 add_subdirectory(lib/zupdater)
 
+if (WIN32) 
+    add_subdirectory(lib/win-ifuse)
+endif()
+
+
+
 if (WIN32)
     set(app_icon_resource_windows "${CMAKE_CURRENT_SOURCE_DIR}/idescriptor.rc")
     qt_add_executable(iDescriptor
@@ -391,11 +397,10 @@ include(CPack)
 
 # FIXME: move to win-deploy.cmake
 if(WIN32)
-    # Ensure libZUpdater.dll is copied next to the main executable for deployment
     add_custom_command(TARGET iDescriptor POST_BUILD
-        COMMAND ${CMAKE_COMMAND} -E copy
-                $<TARGET_FILE:ZUpdater>
-                $<TARGET_FILE_DIR:iDescriptor>
-        COMMENT "Copying libZUpdater.dll to executable directory"
+    COMMAND ${CMAKE_COMMAND} -E copy
+            $<TARGET_FILE:win-ifuse>
+            $<TARGET_FILE_DIR:iDescriptor>
+    COMMENT "Copying win-ifuse executable to output directory"
     )
 endif()
diff --git a/cmake/win-deploy.cmake b/cmake/win-deploy.cmake
index efd2ce0..45bade9 100644
--- a/cmake/win-deploy.cmake
+++ b/cmake/win-deploy.cmake
@@ -236,4 +236,8 @@ message("Copying required scripts")
 file(COPY "${CMAKE_SOURCE_DIR}/install-apple-drivers.ps1" DESTINATION ${OUTPUT_DIR})
 file(COPY "${CMAKE_SOURCE_DIR}/install-win-fsp.silent.bat" DESTINATION ${OUTPUT_DIR})
 
+
+message("Copying winfsp-x64.dll")
+file(COPY "C:/Program Files (x86)/WinFsp/bin/winfsp-x64.dll" DESTINATION ${OUTPUT_DIR})
+
 message("=== Windows deployment completed ===")
diff --git a/lib/win-ifuse b/lib/win-ifuse
new file mode 160000
index 0000000..0fb1e94
--- /dev/null
+++ b/lib/win-ifuse
@@ -0,0 +1 @@
+Subproject commit 0fb1e94efe821f44153feafb4f460adf4b7c5c57
diff --git a/lib/zupdater b/lib/zupdater
index 31ccc0b..9f2e185 160000
--- a/lib/zupdater
+++ b/lib/zupdater
@@ -1 +1 @@
-Subproject commit 31ccc0bcaebecc482c735e46b00cf4def75718cb
+Subproject commit 9f2e18531d6fba6b3e4f3d902842cdaf3a7fb9f4