Updated for new VFS