diff --git a/BlueWest.Data/BlueWest.Data.csproj b/BlueWest.Data/BlueWest.Data.csproj
index 6f097b3..ec929a7 100644
--- a/BlueWest.Data/BlueWest.Data.csproj
+++ b/BlueWest.Data/BlueWest.Data.csproj
@@ -4,10 +4,11 @@
         <TargetFramework>netstandard2.0</TargetFramework>
         <EnableUnsafeBinaryFormatterSerialization>true</EnableUnsafeBinaryFormatterSerialization>
         <RootNamespace>BlueWest.Data</RootNamespace>
+        <AnalysisLevel>preview</AnalysisLevel>
     </PropertyGroup>
 
     <ItemGroup>
-      <PackageReference Include="MapTo" Version="0.8.4" />
+      <PackageReference Include="MapTo" Version="0.8.7" />
       <PackageReference Include="MessagePack" Version="2.3.85" />
       <PackageReference Include="Newtonsoft.Json" Version="6.0.4" />
     </ItemGroup>
diff --git a/BlueWest.Data/Data/User.cs b/BlueWest.Data/Data/User.cs
index f3eb6e2..3b2c27e 100644
--- a/BlueWest.Data/Data/User.cs
+++ b/BlueWest.Data/Data/User.cs
@@ -9,19 +9,19 @@ namespace BlueWest.Data
 {
     [MessagePackObject]
     [MapFrom(typeof(UserUpdateDto))]
-    public partial class User : DataObject
+    public partial struct User 
     {
-        [Key(1)]public int Id { get;  } = -1;
-        [Key(2)]public string Name { get; set; } = "";
-        [Key(3)]public string Address { get; set; } = "";
+        [Key(1)]public int Id { get;  }
+        [Key(2)]public string Name { get; set; }
+        [Key(3)]public string Address { get; set; }
             
-        [Key(4)]public string BTCAddress { get; set; } = "";
-        [Key(5)]public string LTCAddress { get; set; } = "";
+        [Key(4)]public string BTCAddress { get; set; } 
+        [Key(5)]public string LTCAddress { get; set; } 
 
-        [Key(6)]public double BTCAmount { get; set; } = 0;
-        [Key(7)]public double LTCAmount { get; set; } = 0;
+        [Key(6)]public double BTCAmount { get; set; }
+        [Key(7)]public double LTCAmount { get; set; }
 
-        [IgnoreProperty] [Key(8)] public List<FinanceTransaction> FinanceTransactions { get; set; }
+        [Key(8)] public List<FinanceTransaction> FinanceTransactions { get; set; }
 
         public User(int id, string name, string address, string btcAddress, string ltcAddress, double btcAmount, double ltcAmount, List<FinanceTransaction> financeTransactions)
         {
diff --git a/BlueWest.Data/Data/UserUpdateDto.cs b/BlueWest.Data/Data/UserUpdateDto.cs
index 4f6f3fe..48844fd 100644
--- a/BlueWest.Data/Data/UserUpdateDto.cs
+++ b/BlueWest.Data/Data/UserUpdateDto.cs
@@ -4,7 +4,7 @@ namespace BlueWest.Data
 {
     [MapFrom(typeof(User))]
 
-    public partial class UserUpdateDto
+    public partial struct UserUpdateDto
     {
         public string Name { get; set; } 
         public string Address { get; set; }