refactoring for new VFS transport.