Reworked VFS