More work on VFS