diff --git a/java/com/google/devtools/javatools/jade/pkgloader/BazelPackageLoaderFactory.java b/java/com/google/devtools/javatools/jade/pkgloader/BazelPackageLoaderFactory.java
index 817da08..79b6501 100644
--- a/java/com/google/devtools/javatools/jade/pkgloader/BazelPackageLoaderFactory.java
+++ b/java/com/google/devtools/javatools/jade/pkgloader/BazelPackageLoaderFactory.java
@@ -20,13 +20,14 @@
 import com.google.devtools.build.lib.skyframe.packages.BazelPackageLoader;
 import com.google.devtools.build.lib.skyframe.packages.PackageLoader;
 import com.google.devtools.build.lib.vfs.Path;
+import com.google.devtools.build.lib.vfs.Root;
 
 public class BazelPackageLoaderFactory implements PackageLoaderFactory {
   private static final Reporter REPORTER =
       new Reporter(new EventBus(), PrintingEventHandler.ERRORS_TO_STDERR);
 
   @Override
-  public PackageLoader create(Path workspaceDir, Path installBase, Path outputBase) {
+  public PackageLoader create(Root workspaceDir, Path installBase, Path outputBase) {
     return BazelPackageLoader.builder(workspaceDir, installBase, outputBase)
         .useDefaultSkylarkSemantics()
         .setReporter(REPORTER)
diff --git a/java/com/google/devtools/javatools/jade/pkgloader/Lib.java b/java/com/google/devtools/javatools/jade/pkgloader/Lib.java
index c59bf3d..7ed5601 100644
--- a/java/com/google/devtools/javatools/jade/pkgloader/Lib.java
+++ b/java/com/google/devtools/javatools/jade/pkgloader/Lib.java
@@ -22,6 +22,7 @@
 import com.google.devtools.build.lib.packages.NoSuchPackageException;
 import com.google.devtools.build.lib.skyframe.packages.PackageLoader;
 import com.google.devtools.build.lib.vfs.FileSystem;
+import com.google.devtools.build.lib.vfs.Root;
 import com.google.protos.java.com.google.devtools.javatools.jade.pkgloader.services.Services.LoaderRequest;
 import com.google.protos.java.com.google.devtools.javatools.jade.pkgloader.services.Services.LoaderResponse;
 import java.util.HashMap;
@@ -41,7 +42,7 @@ static LoaderResponse load(
     logger.info("Start of 'load'");
     PackageLoader loader =
         packageLoaderFactory.create(
-            fileSystem.getPath(request.getWorkspaceDir()),
+            Root.fromPath(fileSystem.getPath(request.getWorkspaceDir())),
             fileSystem.getPath(request.getInstallBase()),
             fileSystem.getPath(request.getOutputBase()));
 
diff --git a/java/com/google/devtools/javatools/jade/pkgloader/PackageLoaderFactory.java b/java/com/google/devtools/javatools/jade/pkgloader/PackageLoaderFactory.java
index 0139f4a..6bea5d7 100644
--- a/java/com/google/devtools/javatools/jade/pkgloader/PackageLoaderFactory.java
+++ b/java/com/google/devtools/javatools/jade/pkgloader/PackageLoaderFactory.java
@@ -16,7 +16,8 @@
 
 import com.google.devtools.build.lib.skyframe.packages.PackageLoader;
 import com.google.devtools.build.lib.vfs.Path;
+import com.google.devtools.build.lib.vfs.Root;
 
 public interface PackageLoaderFactory {
-  PackageLoader create(Path workspaceDir, Path installBase, Path outputBase);
+  PackageLoader create(Root workspaceDir, Path installBase, Path outputBase);
 }
diff --git a/javatests/com/google/devtools/javatools/jade/pkgloader/SerializerTest.java b/javatests/com/google/devtools/javatools/jade/pkgloader/SerializerTest.java
index a2dddfd..54b17c2 100644
--- a/javatests/com/google/devtools/javatools/jade/pkgloader/SerializerTest.java
+++ b/javatests/com/google/devtools/javatools/jade/pkgloader/SerializerTest.java
@@ -26,6 +26,7 @@
 import com.google.devtools.build.lib.vfs.FileSystem;
 import com.google.devtools.build.lib.vfs.FileSystemUtils;
 import com.google.devtools.build.lib.vfs.Path;
+import com.google.devtools.build.lib.vfs.Root;
 import com.google.devtools.build.lib.vfs.inmemoryfs.InMemoryFileSystem;
 import com.google.protos.java.com.google.devtools.javatools.jade.pkgloader.messages.Messages;
 import java.io.IOException;
@@ -52,7 +53,8 @@ public void setUp() throws IOException {
     Path outputBase = fs.getPath("/output_base/");
     MockWorkspace.create(workspaceRoot, installBase, outputBase);
 
-    packageLoader = PACKAGE_LOADER_FACTORY.create(workspaceRoot, installBase, outputBase);
+    packageLoader =
+        PACKAGE_LOADER_FACTORY.create(Root.fromPath(workspaceRoot), installBase, outputBase);
   }
 
   @Test