Patch to add vfs support