diff --git a/Rpc/BindingProtocols/TaskBuilders/PortMapper.vb b/Rpc/BindingProtocols/TaskBuilders/PortMapper.vb
index d96e34f..9af9ffc 100644
--- a/Rpc/BindingProtocols/TaskBuilders/PortMapper.vb
+++ b/Rpc/BindingProtocols/TaskBuilders/PortMapper.vb
@@ -1,6 +1,7 @@
 Imports System.Collections.Generic
 Imports System.Threading
 Imports System.Threading.Tasks
+Imports Microsoft.VisualBasic.Data.IO
 
 Namespace Rpc.BindingProtocols.TaskBuilders
     ''' <summary>
diff --git a/Rpc/BindingProtocols/call_args.vb b/Rpc/BindingProtocols/call_args.vb
index 1cdd93d..b375e2f 100644
--- a/Rpc/BindingProtocols/call_args.vb
+++ b/Rpc/BindingProtocols/call_args.vb
@@ -1,4 +1,4 @@
-Imports Xdr
+Imports Microsoft.VisualBasic.Data.IO.Xdr
 
 Namespace Rpc.BindingProtocols
     ''' <summary>
diff --git a/Rpc/BindingProtocols/call_result.vb b/Rpc/BindingProtocols/call_result.vb
index 0ae29fb..cafea30 100644
--- a/Rpc/BindingProtocols/call_result.vb
+++ b/Rpc/BindingProtocols/call_result.vb
@@ -1,4 +1,4 @@
-Imports Xdr
+Imports Microsoft.VisualBasic.Data.IO.Xdr
 
 Namespace Rpc.BindingProtocols
     ''' <summary>
diff --git a/Rpc/BindingProtocols/mapping.vb b/Rpc/BindingProtocols/mapping.vb
index 66cc274..27ee2b6 100644
--- a/Rpc/BindingProtocols/mapping.vb
+++ b/Rpc/BindingProtocols/mapping.vb
@@ -1,4 +1,4 @@
-Imports Xdr
+Imports Microsoft.VisualBasic.Data.IO.Xdr
 
 Namespace Rpc.BindingProtocols
     ''' <summary>
diff --git a/Rpc/BindingProtocols/netbuf.vb b/Rpc/BindingProtocols/netbuf.vb
index d7e1611..0844a54 100644
--- a/Rpc/BindingProtocols/netbuf.vb
+++ b/Rpc/BindingProtocols/netbuf.vb
@@ -1,4 +1,4 @@
-Imports Xdr
+Imports Microsoft.VisualBasic.Data.IO.Xdr
 
 Namespace Rpc.BindingProtocols
     ''' <summary>
diff --git a/Rpc/BindingProtocols/rpcb.vb b/Rpc/BindingProtocols/rpcb.vb
index 2b2d1af..a77acb4 100644
--- a/Rpc/BindingProtocols/rpcb.vb
+++ b/Rpc/BindingProtocols/rpcb.vb
@@ -1,4 +1,4 @@
-Imports Xdr
+Imports Microsoft.VisualBasic.Data.IO.Xdr
 
 Namespace Rpc.BindingProtocols
     ''' <summary>
diff --git a/Rpc/BindingProtocols/rpcb_entry.vb b/Rpc/BindingProtocols/rpcb_entry.vb
index 88e1c53..cb3354c 100644
--- a/Rpc/BindingProtocols/rpcb_entry.vb
+++ b/Rpc/BindingProtocols/rpcb_entry.vb
@@ -1,4 +1,4 @@
-Imports Xdr
+Imports Microsoft.VisualBasic.Data.IO.Xdr
 
 Namespace Rpc.BindingProtocols
     ''' <summary>
diff --git a/Rpc/BindingProtocols/rpcb_rmtcallargs.vb b/Rpc/BindingProtocols/rpcb_rmtcallargs.vb
index d653a60..ec17245 100644
--- a/Rpc/BindingProtocols/rpcb_rmtcallargs.vb
+++ b/Rpc/BindingProtocols/rpcb_rmtcallargs.vb
@@ -1,4 +1,4 @@
-Imports Xdr
+Imports Microsoft.VisualBasic.Data.IO.Xdr
 
 Namespace Rpc.BindingProtocols
     ''' <summary>
diff --git a/Rpc/BindingProtocols/rpcb_rmtcallres.vb b/Rpc/BindingProtocols/rpcb_rmtcallres.vb
index 8685327..c82510b 100644
--- a/Rpc/BindingProtocols/rpcb_rmtcallres.vb
+++ b/Rpc/BindingProtocols/rpcb_rmtcallres.vb
@@ -1,4 +1,4 @@
-Imports Xdr
+Imports Microsoft.VisualBasic.Data.IO.Xdr
 
 Namespace Rpc.BindingProtocols
     ''' <summary>
diff --git a/Rpc/BindingProtocols/rpcb_stat.vb b/Rpc/BindingProtocols/rpcb_stat.vb
index 654e316..9eb3a8e 100644
--- a/Rpc/BindingProtocols/rpcb_stat.vb
+++ b/Rpc/BindingProtocols/rpcb_stat.vb
@@ -1,5 +1,5 @@
-Imports Xdr
-Imports System.Collections.Generic
+Imports System.Collections.Generic
+Imports Microsoft.VisualBasic.Data.IO.Xdr
 
 Namespace Rpc.BindingProtocols
     ''' <summary>
diff --git a/Rpc/BindingProtocols/rpcb_stat_byvers.vb b/Rpc/BindingProtocols/rpcb_stat_byvers.vb
index 7943201..6c375d9 100644
--- a/Rpc/BindingProtocols/rpcb_stat_byvers.vb
+++ b/Rpc/BindingProtocols/rpcb_stat_byvers.vb
@@ -1,4 +1,4 @@
-Imports Xdr
+Imports Microsoft.VisualBasic.Data.IO.Xdr
 
 Namespace Rpc.BindingProtocols
     ''' <summary>
diff --git a/Rpc/BindingProtocols/rpcbs_addr.vb b/Rpc/BindingProtocols/rpcbs_addr.vb
index 6b24592..cfebe8f 100644
--- a/Rpc/BindingProtocols/rpcbs_addr.vb
+++ b/Rpc/BindingProtocols/rpcbs_addr.vb
@@ -1,4 +1,4 @@
-Imports Xdr
+Imports Microsoft.VisualBasic.Data.IO.Xdr
 
 Namespace Rpc.BindingProtocols
     ''' <summary>
diff --git a/Rpc/BindingProtocols/rpcbs_rmtcall.vb b/Rpc/BindingProtocols/rpcbs_rmtcall.vb
index 8c882c0..facbc75 100644
--- a/Rpc/BindingProtocols/rpcbs_rmtcall.vb
+++ b/Rpc/BindingProtocols/rpcbs_rmtcall.vb
@@ -1,4 +1,4 @@
-Imports Xdr
+Imports Microsoft.VisualBasic.Data.IO.Xdr
 
 Namespace Rpc.BindingProtocols
     ''' <summary>
diff --git a/Rpc/MessageProtocol/accepted_reply.vb b/Rpc/MessageProtocol/accepted_reply.vb
index 895f0b9..db50265 100644
--- a/Rpc/MessageProtocol/accepted_reply.vb
+++ b/Rpc/MessageProtocol/accepted_reply.vb
@@ -1,4 +1,4 @@
-Imports Xdr
+Imports Microsoft.VisualBasic.Data.IO.Xdr
 
 Namespace Rpc.MessageProtocol
     ''' <summary>
diff --git a/Rpc/MessageProtocol/body.vb b/Rpc/MessageProtocol/body.vb
index 91ad6d1..f33a898 100644
--- a/Rpc/MessageProtocol/body.vb
+++ b/Rpc/MessageProtocol/body.vb
@@ -1,4 +1,4 @@
-Imports Xdr
+Imports Microsoft.VisualBasic.Data.IO.Xdr
 
 Namespace Rpc.MessageProtocol
     ''' <summary>
diff --git a/Rpc/MessageProtocol/call_body.vb b/Rpc/MessageProtocol/call_body.vb
index d86eaac..49b05ae 100644
--- a/Rpc/MessageProtocol/call_body.vb
+++ b/Rpc/MessageProtocol/call_body.vb
@@ -1,4 +1,4 @@
-Imports Xdr
+Imports Microsoft.VisualBasic.Data.IO.Xdr
 
 Namespace Rpc.MessageProtocol
     ''' <summary>
diff --git a/Rpc/MessageProtocol/mismatch_info.vb b/Rpc/MessageProtocol/mismatch_info.vb
index 8900a72..a8ccc6f 100644
--- a/Rpc/MessageProtocol/mismatch_info.vb
+++ b/Rpc/MessageProtocol/mismatch_info.vb
@@ -1,4 +1,4 @@
-Imports Xdr
+Imports Microsoft.VisualBasic.Data.IO.Xdr
 
 Namespace Rpc.MessageProtocol
     ''' <summary>
diff --git a/Rpc/MessageProtocol/opaque_auth.vb b/Rpc/MessageProtocol/opaque_auth.vb
index 6b8865a..a2e34c4 100644
--- a/Rpc/MessageProtocol/opaque_auth.vb
+++ b/Rpc/MessageProtocol/opaque_auth.vb
@@ -1,4 +1,4 @@
-Imports Xdr
+Imports Microsoft.VisualBasic.Data.IO.Xdr
 
 Namespace Rpc.MessageProtocol
     ''' <summary>
diff --git a/Rpc/MessageProtocol/reply_body.vb b/Rpc/MessageProtocol/reply_body.vb
index 832c08d..8ea59ba 100644
--- a/Rpc/MessageProtocol/reply_body.vb
+++ b/Rpc/MessageProtocol/reply_body.vb
@@ -1,4 +1,4 @@
-Imports Xdr
+Imports Microsoft.VisualBasic.Data.IO.Xdr
 
 Namespace Rpc.MessageProtocol
     ''' <summary>
diff --git a/Rpc/Rpc.vbproj b/Rpc/Rpc.vbproj
index dc39854..8f72e85 100644
--- a/Rpc/Rpc.vbproj
+++ b/Rpc/Rpc.vbproj
@@ -127,4 +127,7 @@
       <Name>47-dotnet_Microsoft.VisualBasic</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <Import Include="Microsoft.VisualBasic.Data.IO.Xdr" />
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/Rpc/UdpDatagrams/UdpReader.vb b/Rpc/UdpDatagrams/UdpReader.vb
index 3bc19be..39d1920 100644
--- a/Rpc/UdpDatagrams/UdpReader.vb
+++ b/Rpc/UdpDatagrams/UdpReader.vb
@@ -1,5 +1,5 @@
 Imports System
-Imports Xdr
+Imports Microsoft.VisualBasic.Data.IO.Xdr
 
 Namespace Rpc.UdpDatagrams
     ''' <summary>