diff --git a/Fennix Kernel.code-workspace b/Fennix Kernel.code-workspace
index 0adc5225..01b8e941 100644
--- a/Fennix Kernel.code-workspace	
+++ b/Fennix Kernel.code-workspace	
@@ -37,7 +37,9 @@
 			"kernel/drivers",
 			"kernel/elf",
 			"kernel/scheduler",
-			"kernel/tty"
+			"kernel/tty",
+			"kernel/std",
+			"kernel/vfs"
 		]
 	}
 }
diff --git a/Kernel/include/filesystem.hpp b/Kernel/include/filesystem.hpp
index f41c50d2..7003cde3 100644
--- a/Kernel/include/filesystem.hpp
+++ b/Kernel/include/filesystem.hpp
@@ -161,7 +161,11 @@ namespace vfs
 		int UnregisterFileSystem(dev_t Device);
 
 		void AddRoot(Inode *Root);
+		void AddRootAt(Inode *Root, size_t Index);
+		bool SetRootAt(Inode *Root, size_t Index);
+		void RemoveRoot(Inode *Root);
 		FileNode *GetRoot(size_t Index);
+		bool RootExists(size_t Index);
 
 		FileNode *Create(FileNode *Parent, const char *Name, mode_t Mode);
 		FileNode *ForceCreate(FileNode *Parent, const char *Name, mode_t Mode);
diff --git a/Kernel/storage/filesystem.cpp b/Kernel/storage/filesystem.cpp
index 2ca81220..aa273d1a 100644
--- a/Kernel/storage/filesystem.cpp
+++ b/Kernel/storage/filesystem.cpp
@@ -37,6 +37,43 @@ namespace vfs
 		FileSystemRoots->Children.push_back(Root);
 	}
 
+	void Virtual::AddRootAt(Inode *Root, size_t Index)
+	{
+		SmartLock(VirtualLock);
+		if (Index >= FileSystemRoots->Children.size())
+			FileSystemRoots->Children.resize(Index + 1);
+
+		FileSystemRoots->Children[Index] = Root;
+		if (FileSystemRoots->Children[Index] == nullptr)
+			FileSystemRoots->Children[Index] = Root;
+		else
+			debug("Root %ld already exists", Index);
+	}
+
+	bool Virtual::SetRootAt(Inode *Root, size_t Index)
+	{
+		SmartLock(VirtualLock);
+		assert(Index < FileSystemRoots->Children.size());
+
+		if (FileSystemRoots->Children[Index] != nullptr)
+			return false;
+		FileSystemRoots->Children[Index] = Root;
+		return true;
+	}
+
+	void Virtual::RemoveRoot(Inode *Root)
+	{
+		SmartLock(VirtualLock);
+		for (size_t i = 0; i < FileSystemRoots->Children.size(); i++)
+		{
+			if (FileSystemRoots->Children[i] != Root)
+				continue;
+			FileSystemRoots->Children[i] = nullptr;
+			break;
+		}
+		debug("removed root %p", Root);
+	}
+
 	FileNode *Virtual::GetRoot(size_t Index)
 	{
 		assert(Index < FileSystemRoots->Children.size());
@@ -46,6 +83,7 @@ namespace vfs
 			return it->second;
 
 		Inode *rootNode = FileSystemRoots->Children[Index];
+		assert(rootNode != nullptr);
 		char rootName[128]{};
 		snprintf(rootName, sizeof(rootName), "\x06root-%ld\x06", Index);
 		FileNode *ret = this->CreateCacheNode(nullptr, rootNode, rootName, 0);
@@ -53,6 +91,13 @@ namespace vfs
 		return ret;
 	}
 
+	bool Virtual::RootExists(size_t Index)
+	{
+		if (Index >= FileSystemRoots->Children.size())
+			return false;
+		return FileSystemRoots->Children[Index] != nullptr;
+	}
+
 	FileNode *Virtual::Create(FileNode *Parent, const char *Name, mode_t Mode)
 	{
 		FileNode *existingNode = this->GetByPath(Name, Parent);