diff --git a/inc/winfsp/winfsp.h b/inc/winfsp/winfsp.h
index b4ced623..80767c6d 100644
--- a/inc/winfsp/winfsp.h
+++ b/inc/winfsp/winfsp.h
@@ -22,18 +22,21 @@
 #include <winfsp/fsctl.h>
 
 typedef struct _FSP_FILE_SYSTEM FSP_FILE_SYSTEM;
-typedef NTSTATUS FSP_FILE_SYSTEM_PR(FSP_FILE_SYSTEM *, FSP_FSCTL_TRANSACT_REQ *);
-typedef VOID FSP_FILE_SYSTEM_OP(FSP_FILE_SYSTEM *, FSP_FSCTL_TRANSACT_REQ *);
+typedef NTSTATUS FSP_FILE_SYSTEM_PROCESSREQ(FSP_FILE_SYSTEM *, FSP_FSCTL_TRANSACT_REQ *);
+typedef VOID FSP_FILE_SYSTEM_OPERATION(FSP_FILE_SYSTEM *, FSP_FSCTL_TRANSACT_REQ *);
 typedef struct _FSP_FILE_SYSTEM
 {
+    /* private */
     UINT16 Version;
-    PVOID UserContext;
     HANDLE VolumeHandle;
-    FSP_FILE_SYSTEM_PR *ProcessRequest;
-    FSP_FILE_SYSTEM_OP *Operations[FspFsctlTransactKindCount];
+    FSP_FILE_SYSTEM_PROCESSREQ *ProcessRequest;
+    /* public */
+    PVOID UserContext;
+    FSP_FILE_SYSTEM_OPERATION *Operations[FspFsctlTransactKindCount];
 } FSP_FILE_SYSTEM;
 
-FSP_API NTSTATUS FspFileSystemCreate(FSP_FILE_SYSTEM_PR *ProcessRequest,
+FSP_API NTSTATUS FspFileSystemCreate(PWSTR DevicePath,
+    const FSP_FSCTL_VOLUME_PARAMS *Params, FSP_FILE_SYSTEM_PROCESSREQ *ProcessRequest,
     FSP_FILE_SYSTEM **PFileSystem);
 FSP_API VOID FspFileSystemDelete(FSP_FILE_SYSTEM *FileSystem);
 FSP_API NTSTATUS FspFileSystemLoop(FSP_FILE_SYSTEM *FileSystem);
diff --git a/src/dll/loop.c b/src/dll/loop.c
index d61b1ed0..fe2a6fdc 100644
--- a/src/dll/loop.c
+++ b/src/dll/loop.c
@@ -12,30 +12,57 @@ typedef struct _FSP_WORK_ITEM
     __declspec(align(MEMORY_ALLOCATION_ALIGNMENT)) UINT8 RequestBuf[];
 } FSP_WORK_ITEM;
 
-FSP_API NTSTATUS FspFileSystemCreate(FSP_FILE_SYSTEM_PR *ProcessRequest,
+FSP_API NTSTATUS FspFileSystemCreate(PWSTR DevicePath,
+    const FSP_FSCTL_VOLUME_PARAMS *Params, FSP_FILE_SYSTEM_PROCESSREQ *ProcessRequest,
     FSP_FILE_SYSTEM **PFileSystem)
 {
-    FSP_FILE_SYSTEM *FileSystem;
+    NTSTATUS Result;
+    WCHAR VolumePathBuf[MAX_PATH];
+    HANDLE VolumeHandle = INVALID_HANDLE_VALUE;
+    FSP_FILE_SYSTEM *FileSystem = 0;
 
     *PFileSystem = 0;
 
     if (0 == ProcessRequest)
-        return STATUS_INVALID_PARAMETER;
+        ProcessRequest = FspProcessRequestDirect;
 
     FileSystem = malloc(sizeof *FileSystem);
     if (0 == FileSystem)
-        return STATUS_INSUFFICIENT_RESOURCES;
+    {
+        Result = STATUS_INSUFFICIENT_RESOURCES;
+        goto exit;
+    }
+
+    Result = FspFsctlCreateVolume(DevicePath, Params, 0, VolumePathBuf, sizeof VolumePathBuf);
+    if (!NT_SUCCESS(Result))
+        goto exit;
+
+    Result = FspFsctlOpenVolume(VolumePathBuf, &VolumeHandle);
+    if (!NT_SUCCESS(Result))
+        goto exit;
 
     memset(FileSystem, 0, sizeof *FileSystem);
+    FileSystem->VolumeHandle = VolumeHandle;
     FileSystem->ProcessRequest = ProcessRequest;
-
     *PFileSystem = FileSystem;
 
-    return STATUS_SUCCESS;
+    Result = STATUS_SUCCESS;
+
+exit:
+    if (!NT_SUCCESS(Result))
+    {
+        if (INVALID_HANDLE_VALUE != VolumeHandle)
+            CloseHandle(VolumeHandle);
+        free(FileSystem);
+    }
+
+    return Result;
 }
 
 FSP_API VOID FspFileSystemDelete(FSP_FILE_SYSTEM *FileSystem)
 {
+    if (INVALID_HANDLE_VALUE != FileSystem->VolumeHandle)
+        CloseHandle(FileSystem->VolumeHandle);
     free(FileSystem);
 }