diff --git a/EDMIAPI/Client.vb b/EDMIAPI/Client.vb
index 0f0f5f5d..9fa4dddc 100644
--- a/EDMIAPI/Client.vb
+++ b/EDMIAPI/Client.vb
@@ -1,4 +1,5 @@
-Imports System.IO
+Imports System.Data
+Imports System.IO
 Imports System.ServiceModel
 Imports DigitalData.Modules.Base
 Imports DigitalData.Modules.EDMI.API.Constants
diff --git a/EDMIAPI/DatabaseWithFallback.vb b/EDMIAPI/DatabaseWithFallback.vb
index 552b8da8..a5166532 100644
--- a/EDMIAPI/DatabaseWithFallback.vb
+++ b/EDMIAPI/DatabaseWithFallback.vb
@@ -1,4 +1,5 @@
-Imports DigitalData.Modules.Database
+Imports System.Data
+Imports DigitalData.Modules.Database
 Imports DigitalData.Modules.EDMI.API
 Imports DigitalData.Modules.EDMI.API.Constants
 Imports DigitalData.Modules.EDMI.API.EDMIServiceReference
diff --git a/EDMIAPI/EDMI.API.vbproj b/EDMIAPI/EDMI.API.vbproj
index 4dc1bc28..c8fb42b7 100644
--- a/EDMIAPI/EDMI.API.vbproj
+++ b/EDMIAPI/EDMI.API.vbproj
@@ -5,6 +5,7 @@
     <RootNamespace>DigitalData.Modules.EDMI.API</RootNamespace>
     <AssemblyName>DigitalData.Modules.EDMI.API</AssemblyName>
     <MyType>Windows</MyType>
+    <UseWindowsForms>true</UseWindowsForms>
     <PostBuildEvent>powershell.exe -command "&amp; { &amp;'$(SolutionDir)copy-binary.ps1' '$(TargetPath)' '$(TargetFileName)' '$(ConfigurationName)' '$(ProjectName)' }"</PostBuildEvent>
     <AssemblyTitle>EDMIAPI</AssemblyTitle>
     <Company>Digital Data</Company>
@@ -23,9 +24,13 @@
     <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="System.ServiceModel" />
     <PackageReference Include="NLog" Version="5.0.5" />
     <PackageReference Include="System.Configuration.ConfigurationManager" Version="10.0.1" />
+    <PackageReference Include="System.ServiceModel.Primitives" Version="8.0.0" />
+    <PackageReference Include="System.ServiceModel.Http" Version="8.0.0" />
+    <PackageReference Include="System.ServiceModel.NetTcp" Version="8.0.0" />
+    <PackageReference Include="System.ServiceModel.Security" Version="8.0.0" />
+    <PackageReference Include="System.ServiceModel.Duplex" Version="8.0.0" />
   </ItemGroup>
   <ItemGroup>
     <Compile Update="Connected Services\EDMIServiceReference\Reference.vb">