diff --git a/server/bundles/io.cloudbeaver.service.rm.nio/src/io/cloudbeaver/service/rm/fs/RMVirtualFileSystem.java b/server/bundles/io.cloudbeaver.service.rm.nio/src/io/cloudbeaver/service/rm/fs/RMVirtualFileSystem.java
index 42115fb577..4d275e9582 100644
--- a/server/bundles/io.cloudbeaver.service.rm.nio/src/io/cloudbeaver/service/rm/fs/RMVirtualFileSystem.java
+++ b/server/bundles/io.cloudbeaver.service.rm.nio/src/io/cloudbeaver/service/rm/fs/RMVirtualFileSystem.java
@@ -20,7 +20,7 @@ import io.cloudbeaver.service.rm.nio.RMNIOFileSystemProvider;
 import org.jkiss.code.NotNull;
 import org.jkiss.dbeaver.DBException;
 import org.jkiss.dbeaver.model.DBPImage;
-import org.jkiss.dbeaver.model.fs.DBFVirtualFileSystem;
+import org.jkiss.dbeaver.model.fs.AbstractVirtualFileSystem;
 import org.jkiss.dbeaver.model.fs.DBFVirtualFileSystemRoot;
 import org.jkiss.dbeaver.model.rm.RMController;
 import org.jkiss.dbeaver.model.rm.RMProject;
@@ -29,7 +29,7 @@ import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor;
 import java.net.URI;
 import java.nio.file.Path;
 
-public class RMVirtualFileSystem implements DBFVirtualFileSystem {
+public class RMVirtualFileSystem extends AbstractVirtualFileSystem {
     @NotNull
     private final RMNIOFileSystemProvider rmNioFileSystemProvider;
 
@@ -75,6 +75,7 @@ public class RMVirtualFileSystem implements DBFVirtualFileSystem {
         return "rm-nio";
     }
 
+    @NotNull
     @Override
     public Path getPathByURI(@NotNull DBRProgressMonitor monitor, @NotNull URI uri) {
         return rmNioFileSystemProvider.getPath(uri);
diff --git a/server/bundles/io.cloudbeaver.service.rm.nio/src/io/cloudbeaver/service/rm/fs/RMVirtualFileSystemProvider.java b/server/bundles/io.cloudbeaver.service.rm.nio/src/io/cloudbeaver/service/rm/fs/RMVirtualFileSystemProvider.java
index 33617f913a..baf22774cf 100644
--- a/server/bundles/io.cloudbeaver.service.rm.nio/src/io/cloudbeaver/service/rm/fs/RMVirtualFileSystemProvider.java
+++ b/server/bundles/io.cloudbeaver.service.rm.nio/src/io/cloudbeaver/service/rm/fs/RMVirtualFileSystemProvider.java
@@ -19,12 +19,12 @@ package io.cloudbeaver.service.rm.fs;
 import org.jkiss.code.NotNull;
 import org.jkiss.dbeaver.Log;
 import org.jkiss.dbeaver.model.app.DBPProject;
-import org.jkiss.dbeaver.model.fs.DBFFileSystemProvider;
+import org.jkiss.dbeaver.model.fs.AbstractFileSystemProvider;
 import org.jkiss.dbeaver.model.fs.DBFVirtualFileSystem;
 import org.jkiss.dbeaver.model.rm.RMControllerProvider;
 import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor;
 
-public class RMVirtualFileSystemProvider implements DBFFileSystemProvider {
+public class RMVirtualFileSystemProvider extends AbstractFileSystemProvider {
     private static final Log log = Log.getLog(RMVirtualFileSystemProvider.class);
 
     @Override